Update file paths for jupyterlab repo

examples/lab/index.js

@@ -7,30 +7,30 @@ var phosphide = require('phosphide/lib/core/application');
 // ES6 Promise polyfill
 require('es6-promise').polyfill();
 
-require('jupyter-js-plugins/lib/default-theme/index.css');
+require('jupyterlab/lib/default-theme/index.css');
 
 var app = new phosphide.Application({
   extensions: [
     require('phosphide/lib/extensions/commandpalette').commandPaletteExtension,
-    require('jupyter-js-plugins/lib/terminal/plugin').terminalExtension,
-    require('jupyter-js-plugins/lib/editorhandler/plugin').editorHandlerExtension,
-    require('jupyter-js-plugins/lib/filebrowser/plugin').fileBrowserExtension,
-    require('jupyter-js-plugins/lib/imagehandler/plugin').imageHandlerExtension,
-    require('jupyter-js-plugins/lib/help/plugin').helpHandlerExtension,
-    require('jupyter-js-plugins/lib/notebook/plugin').notebookHandlerExtension,
-    require('jupyter-js-plugins/lib/shortcuts/plugin').shortcutsExtension,
-    require('jupyter-js-plugins/lib/about/plugin').aboutExtension,
-    require('jupyter-js-plugins/lib/landing/plugin').landingExtension,
-    require('jupyter-js-plugins/lib/console/plugin').consoleExtension,
-    require('jupyter-js-plugins/lib/main/plugin').mainExtension,
-    require('jupyter-js-plugins/lib/widgets/plugin').widgetManagerExtension,
+    require('jupyterlab/lib/terminal/plugin').terminalExtension,
+    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/landing/plugin').landingExtension,
+    require('jupyterlab/lib/console/plugin').consoleExtension,
+    require('jupyterlab/lib/main/plugin').mainExtension,
+    require('jupyterlab/lib/widgets/plugin').widgetManagerExtension,
   ],
   providers: [
-    require('jupyter-js-plugins/lib/clipboard/plugin').clipboardProvider,
-    require('jupyter-js-plugins/lib/docregistry/plugin').docRegistryProvider,
-    require('jupyter-js-plugins/lib/services/plugin').servicesProvider,
-    require('jupyter-js-plugins/lib/rendermime/plugin').renderMimeProvider,
-    require('jupyter-js-plugins/lib/notebook/plugin').activeNotebookProvider
+    require('jupyterlab/lib/clipboard/plugin').clipboardProvider,
+    require('jupyterlab/lib/docregistry/plugin').docRegistryProvider,
+    require('jupyterlab/lib/services/plugin').servicesProvider,
+    require('jupyterlab/lib/rendermime/plugin').renderMimeProvider,
+    require('jupyterlab/lib/notebook/plugin').activeNotebookProvider
   ]
 });
 

examples/lab/package.json

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

examples/package.json

@@ -1,9 +1,8 @@
 {
   "private": true,
-  "name": "jupyter-js-notebook-examples",
+  "name": "jupyterlab-examples",
   "dependencies": {
-    "jupyter-js-notebook": "file:..",
-    "jupyter-js-ui": "^0.11.0",
+    "jupyterlab": "file:..",
     "jupyter-js-utils": "^0.4.0",
     "phosphor-commandpalette": "^0.2.0",
     "phosphor-keymap": "^0.8.0",
@@ -14,7 +13,7 @@
     "build": "cd .. && npm run build:examples",
     "clean": "rimraf node_modules",
     "postinstall": "npm dedupe",
-    "update": "rimraf node_modules/jupyter-js-notebook && npm install"
+    "update": "rimraf node_modules/jupyterlab && npm install"
   },
   "devDependencies": {
     "rimraf": "^2.5.2"

package.json

@@ -1,42 +1,40 @@
 {
-  "name": "jupyter-js-plugins",
-  "version": "0.13.0",
-  "description": "Plugins for JupyterLab",
+  "name": "jupyterlab",
+  "version": "0.0.1",
+  "description": "A computational environment for Jupyter.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
+    "ansi_up": "^1.3.0",
     "backbone": "^1.2.0",
     "codemirror": "^5.12.0",
-    "codemirror": "^5.11.0",
     "diff-match-patch": "^1.0.0",
     "file-loader": "^0.8.5",
     "jquery": "^2.2.0",
     "jquery-ui": "^1.10.5",
-    "jupyter-js-notebook": "^0.21.2",
     "jupyter-js-services": "^0.10.4",
     "jupyter-js-utils": "^0.4.0",
-    "phosphide": "^0.9.4",
-    "phosphor-codemirror": "^0.0.1",
-    "phosphor-di": "^0.9.0",
-    "phosphor-disposable": "^1.0.5",
-    "phosphor-keymap": "^0.8.0",
     "jupyter-js-widgets": "2.0.0-dev.0",
     "marked": "^0.3.5",
     "moment": "^2.11.2",
+    "phosphide": "^0.9.4",
     "phosphor-arrays": "^1.0.6",
+    "phosphor-codemirror": "^0.0.1",
+    "phosphor-di": "^0.9.0",
+    "phosphor-disposable": "^1.0.5",
     "phosphor-domutil": "^1.2.0",
     "phosphor-dragdrop": "^0.9.0",
+    "phosphor-keymap": "^0.8.0",
     "phosphor-menus": "^1.0.0-rc.1",
     "phosphor-messaging": "^1.0.6",
-    "phosphor-disposable": "^1.0.5",
     "phosphor-observablelist": "^1.0.0-beta",
     "phosphor-panel": "^1.0.0-rc.1",
     "phosphor-properties": "^2.0.0",
     "phosphor-signaling": "^1.2.0",
     "phosphor-tabs": "^1.0.0-rc.2", 
     "phosphor-widget": "^1.0.0-rc.1",
+    "sanitizer": "^0.1.3",
     "xterm": "^0.33.0"
-    "sanitizer": "^0.1.3"
   },
   "devDependencies": {
     "concurrently": "^2.0.0",
@@ -56,10 +54,6 @@
     "mocha": "^2.3.4",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.0",
-    "karma-mocha": "^0.2.0",
-    "karma-mocha-reporter": "^1.1.1",
-    "mocha": "^2.2.5",
-    "rimraf": "^2.4.2",
     "style-loader": "^0.13.0",
     "typedoc": "https://github.com/SierraSoftworks/typedoc.git#cb5aea2b218b4f773451e2818a48629ee9c5066e",
     "typescript": "^1.8.0",
@@ -68,39 +62,31 @@
     "webpack": "^1.12.11"
   },
   "scripts": {
-    "clean": "rimraf docs && rimraf lib && rimraf test/build",
-    "clean:example": "rimraf example/build",
-    "build:example": "cd example && npm run update && npm run build",
+    "build": "npm run build:src",
+    "build:examples": "node scripts/buildexamples.js",
     "build:src": "tsc --project src && node scripts/copyfiles.js",
+    "build:test": "tsc --project test/src && webpack --config test/webpack.conf.js",
     "clean": "rimraf docs && rimraf lib && rimraf test/build && rimraf test/coverage",
     "clean:examples": "node scripts/cleanexamples.js",
-    "build:examples": "node scripts/buildexamples.js",
-    "build:src": "tsc --project src && node scripts/copycss.js",
-    "build:test": "tsc --project test/src && webpack --config test/webpack.conf.js",
-    "build": "npm run build:src",
     "docs": "typedoc --mode file --module commonjs --excludeNotExported --target es5 --moduleResolution node --out docs/ src",
     "postinstall": "npm dedupe",
-    "docs": "typedoc --mode modules --module commonjs --excludeNotExported --target es5 --moduleResolution node --out docs/ src",
     "prepublish": "npm run build",
-    "postinstall": "npm dedupe",
+    "test": "npm run build:test && npm run test:firefox",
     "test:chrome": "karma start --browsers=Chrome test/karma.conf.js",
     "test:coverage": "npm run build:test && webpack --config test/webpack-cov.conf.js && karma start test/karma-cov.conf.js",
+    "test:debug": "karma start --browsers=Chrome --singleRun=false --debug=true test/karma.conf.js",
     "test:firefox": "karma start --browsers=Firefox test/karma.conf.js",
     "test:ie": "karma start --browsers=IE test/karma.conf.js",
-    "test:debug": "karma start --browsers=Chrome --singleRun=false --debug=true test/karma.conf.js",
-    "test": "npm run build:test && npm run test:firefox",
     "watch": "watch 'npm run build' src --wait 10",
-    "watch:test": "watch 'npm run build && npm test' src src/test --wait 10"
-  },
+    "watch:test": "watch 'npm run build && npm test' src src/test --wait 10"  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/jupyter/jupyter-js-plugins"
+    "url": "https://github.com/jupyter/jupyterlab"
   },
   "keywords": [
     "jupyter",
     "jupyterlab",
-    "plugins",
-    "lab"
+    "plugins"
   ],
   "files": [
     "lib/*.css",
@@ -114,7 +100,7 @@
   "author": "Project Jupyter",
   "license": "BSD-3-Clause",
   "bugs": {
-    "url": "https://github.com/jupyter/jupyter-js-plugins/issues"
+    "url": "https://github.com/jupyter/jupyterlab/issues"
   },
-  "homepage": "https://github.com/jupyter/jupyter-js-plugins"
+  "homepage": "https://github.com/jupyter/jupyterlab"
 }

scripts/copycss.js

@@ -1,2 +0,0 @@
-var fs = require('fs-extra');
-fs.copySync('src/', 'lib/', { filter: /\.css$/ });

src/console/plugin.ts

@@ -4,15 +4,15 @@
 
 import {
   ConsolePanel
-} from 'jupyter-js-notebook/lib/console';
+} from '../notebook/console';
 
 import {
   RenderMime
-} from 'jupyter-js-ui/lib/rendermime';
+} from '../rendermime';
 
 import {
   selectKernel
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../docmanager';
 
 import {
   Application

src/default-theme/index.css

@@ -2,10 +2,10 @@
 | Copyright (c) Jupyter Development Team.
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
-@import url('~jupyter-js-notebook/lib/index.css');
-@import url('~jupyter-js-notebook/lib/theme.css');
-@import url('~jupyter-js-ui/lib/index.css');
-@import url('~jupyter-js-ui/lib/theme.css');
+@import url('~jupyterlab/lib/notebook/index.css');
+@import url('~jupyterlab/lib/notebook/theme.css');
+@import url('~jupyterlab/lib/index.css');
+@import url('~jupyterlab/lib/theme.css');
 @import './commandpalette.css';
 @import './help.css';
 @import './about.css';

src/docregistry/plugin.ts

@@ -4,7 +4,7 @@
 
 import {
   DocumentRegistry, TextModelFactory, Base64ModelFactory
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../docmanager';
 
 
 /**

src/editorhandler/plugin.ts

@@ -4,7 +4,7 @@
 
 import {
   DocumentRegistry, EditorWidgetFactory
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../docmanager';
 
 import {
   Application

src/filebrowser/plugin.ts

@@ -3,12 +3,16 @@
 'use strict';
 
 import {
-  FileBrowserWidget, FileBrowserModel
-} from 'jupyter-js-ui/lib/filebrowser';
+  FileBrowserWidget
+} from './browser';
+
+import {
+  FileBrowserModel
+} from './model';
 
 import {
   DocumentManager, DocumentRegistry, DocumentWidget
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../docmanager';
 
 import {
   Application

src/imagehandler/plugin.ts

@@ -4,7 +4,7 @@
 
 import {
   DocumentRegistry, ImageWidgetFactory
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../docmanager';
 
 import {
   Application

src/notebook/cells/editor.ts

@@ -7,7 +7,7 @@ import * as CodeMirror
 
 import {
   CodeMirrorWidget
-} from 'jupyter-js-ui/lib/codemirror/widget';
+} from '../../codemirror/widget';
 
 import {
   Message

src/notebook/cells/widget.ts

@@ -8,11 +8,11 @@ import {
 
 import {
   loadModeByMIME
-} from 'jupyter-js-ui/lib/codemirror';
+} from '../../codemirror';
 
 import {
   RenderMime
-} from 'jupyter-js-ui/lib/rendermime';
+} from '../../rendermime';
 
 import {
   Message

src/notebook/console/widget.ts

@@ -8,11 +8,11 @@ import {
 
 import {
   showDialog
-} from 'jupyter-js-ui/lib/dialog';
+} from '../../dialog';
 
 import {
   RenderMime
-} from 'jupyter-js-ui/lib/rendermime';
+} from '../../rendermime';
 
 import {
   Message

src/notebook/notebook/default-toolbar.ts

@@ -8,11 +8,11 @@ import {
 
 import {
   showDialog
-} from 'jupyter-js-ui/lib/dialog';
+} from '../../dialog';
 
 import {
   IDocumentContext
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../../docmanager';
 
 import {
   Widget

src/notebook/notebook/model.ts

@@ -7,7 +7,7 @@ import * as utils
 
 import {
   IDocumentModel
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../../docmanager';
 
 import {
   IObservableList, ListChangeType, IListChangedArgs

src/notebook/notebook/modelfactory.ts

@@ -8,7 +8,7 @@ import {
 
 import {
   IModelFactory
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../../docmanager';
 
 import {
   INotebookModel, NotebookModel

src/notebook/notebook/panel.ts

@@ -8,15 +8,15 @@ import {
 
 import {
   showDialog
-} from 'jupyter-js-ui/lib/dialog';
+} from '../../dialog';
 
 import {
   IDocumentContext
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../../docmanager';
 
 import {
   RenderMime
-} from 'jupyter-js-ui/lib/rendermime';
+} from '../../rendermime';
 
 import {
   MimeData as IClipboard

src/notebook/notebook/trust.ts

@@ -7,7 +7,7 @@
 
 import {
   showDialog
-} from 'jupyter-js-ui/lib/dialog';
+} from '../../dialog';
 
 import {
   INotebookModel

src/notebook/notebook/widget.ts

@@ -8,7 +8,7 @@ import {
 
 import {
   RenderMime
-} from 'jupyter-js-ui/lib/rendermime';
+} from '../../rendermime';
 
 import {
   Message

src/notebook/notebook/widgetfactory.ts

@@ -8,11 +8,11 @@ import {
 
 import {
   IWidgetFactory, IDocumentContext, findKernel
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../../docmanager';
 
 import {
   RenderMime
-} from 'jupyter-js-ui/lib/rendermime';
+} from '../../rendermime';
 
 import {
   MimeData as IClipboard

src/notebook/output-area/widget.ts

@@ -4,7 +4,7 @@
 
 import {
   RenderMime
-} from 'jupyter-js-ui/lib/rendermime';
+} from '../../rendermime';
 
 import {
   IListChangedArgs, ListChangeType, ObservableList

src/notebook/plugin.ts

@@ -5,7 +5,7 @@
 import {
   NotebookPanel, NotebookModelFactory, INotebookModel,
   NotebookWidgetFactory, NotebookActions
-} from 'jupyter-js-notebook';
+} from './index';
 
 import {
   IKernelId
@@ -13,11 +13,11 @@ import {
 
 import {
   IDocumentContext, DocumentRegistry, selectKernelForContext
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../docmanager';
 
 import {
   RenderMime
-} from 'jupyter-js-ui/lib/rendermime';
+} from '../rendermime';
 
 import {
   Application

src/notebook/typings.d.ts

@@ -1,5 +1,5 @@
-/// <reference path="../typings/es6-promise/es6-promise.d.ts"/>
-/// <reference path="../typings/sanitizer/sanitizer.d.ts"/>
-/// <reference path="../typings/codemirror/codemirror.d.ts"/>
-/// <reference path="../typings/diff-match-patch/diff-match-patch.d.ts"/>
-/// <reference path="../typings/mathjax/mathjax.d.ts"/>
+/// <reference path="../../typings/es6-promise/es6-promise.d.ts"/>
+/// <reference path="../../typings/sanitizer/sanitizer.d.ts"/>
+/// <reference path="../../typings/codemirror/codemirror.d.ts"/>
+/// <reference path="../../typings/diff-match-patch/diff-match-patch.d.ts"/>
+/// <reference path="../../typings/mathjax/mathjax.d.ts"/>

src/rendermime/plugin.ts

@@ -4,12 +4,12 @@
 
 import {
   RenderMime, MimeMap, IRenderer
-} from 'jupyter-js-ui/lib/rendermime';
+} from './index';
 
 import {
   HTMLRenderer, LatexRenderer, ImageRenderer, TextRenderer,
   JavascriptRenderer, SVGRenderer, MarkdownRenderer
-} from 'jupyter-js-ui/lib/renderers';
+} from '../renderers';
 
 import {
   Widget

src/terminal/plugin.ts

@@ -4,7 +4,7 @@
 
 import {
   TerminalWidget
-} from 'jupyter-js-ui/lib/terminal';
+} from './index';
 
 import {
   Application

src/widgets/plugin.ts

@@ -3,7 +3,7 @@
 
 import {
   IWidgetExtension, IDocumentContext, IDocumentModel, DocumentRegistry
-} from 'jupyter-js-ui/lib/docmanager';
+} from '../docmanager';
 
 import {
   IDisposable, DisposableDelegate
@@ -15,7 +15,7 @@ import {
 
 import {
   NotebookPanel
-} from 'jupyter-js-notebook/lib/notebook/panel';
+} from '../notebook/notebook/panel';
 
 import {
   Application
@@ -23,7 +23,7 @@ import {
 
 import {
   WidgetManager, WidgetRenderer
-} from 'jupyter-js-ui/lib/widgets';
+} from './index';
 
 import {
   IKernel

typings/es6-promise/es6-promise.d.ts

@@ -134,7 +134,7 @@ interface Iterator<T> {
 }
 
 interface Iterable<T> {
-    [Symbol.iterator](): Iterator<T>;
+    //[Symbol.iterator](): Iterator<T>;
 }
 
 
@@ -162,6 +162,17 @@ interface Promise<T> {
     //[Symbol.toStringTag]: "Promise";
 }
 
+interface PromiseLike<T> {
+    /**
+    * Attaches callbacks for the resolution and/or rejection of the Promise.
+    * @param onfulfilled The callback to execute when the Promise is resolved.
+    * @param onrejected The callback to execute when the Promise is rejected.
+    * @returns A Promise for the completion of which ever callback is executed.
+    */
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
+    then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>;
+}
+
 interface PromiseConstructor {
     /** 
       * A reference to the prototype.