Browse Source

Fix examples.

Jason Grout 9 years ago
parent
commit
8c6fd42e57

+ 10 - 11
examples/console/package.json

@@ -1,13 +1,21 @@
 {
   "private": true,
-  "name": "jupyter-js-notebook-example",
+  "name": "jupyterlab-example-console",
   "scripts": {
     "build": "tsc --project src && webpack --config webpack.conf.js",
     "clean": "rimraf build && rimraf node_modules",
     "postinstall": "npm dedupe",
-    "update": "rimraf node_modules/jupyter-js-notebook && npm install",
+    "update": "rimraf node_modules/jupyterlab && npm install",
     "watch": "watch 'npm run update && npm run build' ../../src src --wait 10"
   },
+  "dependencies": {
+    "jupyter-js-services": "^0.10.4",
+    "jupyterlab": "file:../..",
+    "phosphor-commandpalette": "^0.2.0",
+    "phosphor-keymap": "^0.8.0",
+    "phosphor-splitpanel": "^1.0.0-rc.1",
+    "phosphor-widget": "^1.0.0-rc.1"
+  },
   "devDependencies": {
     "concurrently": "^2.0.0",
     "css-loader": "^0.23.1",
@@ -16,14 +24,5 @@
     "typescript": "^1.8.10",
     "watch": "^0.18.0",
     "webpack": "^1.13.0"
-  },
-  "dependencies": {
-    "jupyter-js-notebook": "file:../..",
-    "jupyter-js-services": "^0.10.4",
-    "jupyter-js-ui": "^0.14.0",
-    "phosphor-commandpalette": "^0.2.0",
-    "phosphor-keymap": "^0.8.0",
-    "phosphor-splitpanel": "^1.0.0-rc.1",
-    "phosphor-widget": "^1.0.0-rc.1"
   }
 }

+ 7 - 7
examples/console/src/index.ts

@@ -7,7 +7,7 @@
 
 import {
   ConsolePanel
-} from 'jupyter-js-notebook';
+} from 'jupyterlab/lib/notebook';
 
 import {
   startNewSession, INotebookSession
@@ -15,12 +15,12 @@ import {
 
 import {
   RenderMime, IRenderer, MimeMap
-} from 'jupyter-js-ui/lib/rendermime';
+} from 'jupyterlab/lib/rendermime';
 
 import {
   HTMLRenderer, LatexRenderer, ImageRenderer, TextRenderer,
   JavascriptRenderer, SVGRenderer, MarkdownRenderer
-} from 'jupyter-js-ui/lib/renderers';
+} from 'jupyterlab/lib/renderers';
 
 import {
   CommandPalette, StandardPaletteModel, IStandardPaletteItemOptions
@@ -38,10 +38,10 @@ import {
   Widget
 } from 'phosphor-widget';
 
-import 'jupyter-js-notebook/lib/index.css';
-import 'jupyter-js-notebook/lib/theme.css';
-import 'jupyter-js-ui/lib/dialog/index.css';
-import 'jupyter-js-ui/lib/dialog/theme.css';
+import 'jupyterlab/lib/notebook/index.css';
+import 'jupyterlab/lib/notebook/theme.css';
+import 'jupyterlab/lib/dialog/index.css';
+import 'jupyterlab/lib/dialog/theme.css';
 
 let TITLE = 'Console';
 

+ 3 - 3
examples/filebrowser/package.json

@@ -1,16 +1,16 @@
 {
   "private": true,
-  "name": "example",
+  "name": "jupyterlab-example-filebrowser",
   "scripts": {
     "build": "tsc --project src && webpack --config webpack.conf.js",
     "clean": "rimraf build && rimraf node_modules",
     "postinstall": "npm dedupe",
-    "update": "rimraf node_modules/jupyter-js-ui && npm install",
+    "update": "rimraf node_modules/jupyterlab && npm install",
     "watch": "watch 'npm run update && npm run build' ../../src src --wait 10"
   },
   "dependencies": {
     "jupyter-js-services": "^0.10.4",
-    "jupyter-js-ui": "file:../..",
+    "jupyterlab": "file:../..",
     "phosphor-dockpanel": "^0.9.7",
     "phosphor-keymap": "^0.8.0",
     "phosphor-menus": "^1.0.0-rc.1",

+ 7 - 7
examples/filebrowser/src/index.ts

@@ -12,24 +12,24 @@ import {
 
 import {
   FileBrowserWidget, FileBrowserModel
-} from 'jupyter-js-ui/lib/filebrowser';
+} from 'jupyterlab/lib/filebrowser';
 
 import {
   DocumentManager, DocumentWidget, DocumentRegistry
-} from 'jupyter-js-ui/lib/docmanager';
+} from 'jupyterlab/lib/docmanager';
 
 import {
   TextModelFactory
-} from 'jupyter-js-ui/lib/docmanager/default';
+} from 'jupyterlab/lib/docmanager/default';
 
 import {
   EditorWidgetFactory
-} from 'jupyter-js-ui/lib/docmanager/editor';
+} from 'jupyterlab/lib/docmanager/editor';
 
 
 import {
   showDialog, okButton
-} from 'jupyter-js-ui/lib/dialog';
+} from 'jupyterlab/lib/dialog';
 
 import {
   DockPanel
@@ -47,8 +47,8 @@ import {
   SplitPanel
 } from 'phosphor-splitpanel';
 
-import 'jupyter-js-ui/lib/index.css';
-import 'jupyter-js-ui/lib/theme.css';
+import 'jupyterlab/lib/index.css';
+import 'jupyterlab/lib/theme.css';
 
 
 function main(): void {

+ 9 - 9
examples/lab/index.js

@@ -11,26 +11,26 @@ require('jupyterlab/lib/default-theme/index.css');
 
 var app = new phosphide.Application({
   extensions: [
-    require('phosphide/lib/extensions/commandpalette').commandPaletteExtension,
-    require('jupyterlab/lib/terminal/plugin').terminalExtension,
+    require('jupyterlab/lib/about/plugin').aboutExtension,
+    require('jupyterlab/lib/console/plugin').consoleExtension,
     require('jupyterlab/lib/editorhandler/plugin').editorHandlerExtension,
     require('jupyterlab/lib/filebrowser/plugin').fileBrowserExtension,
-    require('jupyterlab/lib/imagehandler/plugin').imageHandlerExtension,
     require('jupyterlab/lib/help/plugin').helpHandlerExtension,
-    require('jupyterlab/lib/notebook/plugin').notebookHandlerExtension,
-    require('jupyterlab/lib/shortcuts/plugin').shortcutsExtension,
-    require('jupyterlab/lib/about/plugin').aboutExtension,
+    require('jupyterlab/lib/imagehandler/plugin').imageHandlerExtension,
     require('jupyterlab/lib/landing/plugin').landingExtension,
-    require('jupyterlab/lib/console/plugin').consoleExtension,
     require('jupyterlab/lib/main/plugin').mainExtension,
+    require('jupyterlab/lib/notebook/plugin').notebookHandlerExtension,
+    require('jupyterlab/lib/shortcuts/plugin').shortcutsExtension,
+    require('jupyterlab/lib/terminal/plugin').terminalExtension,
     require('jupyterlab/lib/widgets/plugin').widgetManagerExtension,
+    require('phosphide/lib/extensions/commandpalette').commandPaletteExtension,
   ],
   providers: [
     require('jupyterlab/lib/clipboard/plugin').clipboardProvider,
     require('jupyterlab/lib/docregistry/plugin').docRegistryProvider,
-    require('jupyterlab/lib/services/plugin').servicesProvider,
+    require('jupyterlab/lib/notebook/plugin').activeNotebookProvider,
     require('jupyterlab/lib/rendermime/plugin').renderMimeProvider,
-    require('jupyterlab/lib/notebook/plugin').activeNotebookProvider
+    require('jupyterlab/lib/services/plugin').servicesProvider,
   ]
 });
 

+ 7 - 7
examples/lab/package.json

@@ -1,12 +1,6 @@
 {
   "private": true,
-  "name": "jupyterlab-lab-example",
-  "dependencies": {
-    "es6-promise": "^3.1.2",
-    "jupyterlab": "file:../..",
-    "jupyter-js-services": "^0.10.4",
-    "phosphide": "^0.9.4"
-  },
+  "name": "jupyterlab-example",
   "scripts": {
     "build": "webpack --config webpack.conf.js",
     "clean": "rimraf build && rimraf node_modules",
@@ -14,6 +8,12 @@
     "update": "rimraf node_modules/jupyterlab && npm install",
     "watch": "watch 'npm run update && npm run build' ../../src --wait 10"
   },
+  "dependencies": {
+    "es6-promise": "^3.1.2",
+    "jupyter-js-services": "^0.10.4",
+    "jupyterlab": "file:../../",
+    "phosphide": "^0.9.4"
+  },
   "devDependencies": {
     "rimraf": "^2.5.2",
     "watch": "^0.18.0",

+ 10 - 11
examples/notebook/package.json

@@ -1,13 +1,21 @@
 {
   "private": true,
-  "name": "jupyter-js-notebook-example",
+  "name": "jupyterlab-example-notebook",
   "scripts": {
     "build": "tsc --project src && webpack --config webpack.conf.js",
     "clean": "rimraf build && rimraf node_modules",
     "postinstall": "npm dedupe",
-    "update": "rimraf node_modules/jupyter-js-notebook && npm install",
+    "update": "rimraf node_modules/jupyterlab && npm install",
     "watch": "watch 'npm run update && npm run build' ../../src src --wait 10"
   },
+  "dependencies": {
+    "jupyter-js-services": "^0.10.4",
+    "jupyterlab": "file:../..",
+    "phosphor-commandpalette": "^0.2.0",
+    "phosphor-keymap": "^0.8.0",
+    "phosphor-splitpanel": "^1.0.0-rc.1",
+    "phosphor-widget": "^1.0.0-rc.1"
+  },
   "devDependencies": {
     "concurrently": "^2.0.0",
     "css-loader": "^0.23.1",
@@ -16,14 +24,5 @@
     "typescript": "^1.8.10",
     "watch": "^0.18.0",
     "webpack": "^1.13.0"
-  },
-  "dependencies": {
-    "jupyter-js-notebook": "file:../..",
-    "jupyter-js-services": "^0.10.4",
-    "jupyter-js-ui": "^0.14.0",
-    "phosphor-commandpalette": "^0.2.0",
-    "phosphor-keymap": "^0.8.0",
-    "phosphor-splitpanel": "^1.0.0-rc.1",
-    "phosphor-widget": "^1.0.0-rc.1"
   }
 }

+ 8 - 8
examples/notebook/src/index.ts

@@ -8,7 +8,7 @@
 import {
   NotebookPanel, trustNotebook, NotebookWidgetFactory,
   NotebookModelFactory, NotebookActions
-} from 'jupyter-js-notebook';
+} from 'jupyterlab/lib/notebook';
 
 import {
   ContentsManager, IKernelSpecIds, NotebookSessionManager
@@ -16,16 +16,16 @@ import {
 
 import {
   DocumentWidget, DocumentManager, DocumentRegistry, selectKernelForContext
-} from 'jupyter-js-ui/lib/docmanager';
+} from 'jupyterlab/lib/docmanager';
 
 import {
   RenderMime, IRenderer, MimeMap
-} from 'jupyter-js-ui/lib/rendermime';
+} from 'jupyterlab/lib/rendermime';
 
 import {
   HTMLRenderer, LatexRenderer, ImageRenderer, TextRenderer,
   JavascriptRenderer, SVGRenderer, MarkdownRenderer
-} from 'jupyter-js-ui/lib/renderers';
+} from 'jupyterlab/lib/renderers';
 
 import {
   CommandPalette, StandardPaletteModel, IStandardPaletteItemOptions
@@ -47,10 +47,10 @@ import {
   Widget
 } from 'phosphor-widget';
 
-import 'jupyter-js-notebook/lib/index.css';
-import 'jupyter-js-notebook/lib/theme.css';
-import 'jupyter-js-ui/lib/dialog/index.css';
-import 'jupyter-js-ui/lib/dialog/theme.css';
+import 'jupyterlab/lib/notebook/index.css';
+import 'jupyterlab/lib/notebook/theme.css';
+import 'jupyterlab/lib/dialog/index.css';
+import 'jupyterlab/lib/dialog/theme.css';
 
 
 let NOTEBOOK = 'test.ipynb';

+ 3 - 3
examples/terminal/package.json

@@ -1,15 +1,15 @@
 {
   "private": true,
-  "name": "example",
+  "name": "jupyterlab-example-terminal",
   "scripts": {
     "build": "tsc --project src && webpack --config webpack.conf.js",
     "clean": "rimraf build && rimraf node_modules",
     "postinstall": "npm dedupe",
-    "update": "rimraf node_modules/jupyter-js-ui && npm install",
+    "update": "rimraf node_modules/jupyterlab && npm install",
     "watch": "watch 'npm run update && npm run build' ../../src src --wait 10"
   },
   "dependencies": {
-    "jupyter-js-ui": "file:../..",
+    "jupyterlab": "file:../..",
     "phosphor-dockpanel": "^0.9.7"
   },
   "devDependencies": {

+ 3 - 3
examples/terminal/src/index.ts

@@ -11,10 +11,10 @@ import {
 
 import {
   TerminalWidget
-} from 'jupyter-js-ui/lib/terminal';
+} from 'jupyterlab/lib/terminal';
 
-import 'jupyter-js-ui/lib/index.css';
-import 'jupyter-js-ui/lib/theme.css';
+import 'jupyterlab/lib/index.css';
+import 'jupyterlab/lib/theme.css';
 
 
 function main(): void {