Update imports for the new services

package.json

@@ -7,6 +7,7 @@
   },
   "typings": "lib/index.d.ts",
   "dependencies": {
+    "@jupyterlab/services": "^0.22.0",
     "ansi_up": "^1.3.0",
     "backbone": "^1.2.0",
     "codemirror": "5.17.0",
@@ -14,7 +15,6 @@
     "diff-match-patch": "^1.0.0",
     "es6-promise": "^3.2.1",
     "jquery": "^2.2.0",
-    "jupyter-js-services": "^0.21.0",
     "less": "^2.7.1",
     "marked": "^0.3.5",
     "moment": "^2.11.2",
@@ -31,6 +31,7 @@
     "@types/marked": "0.0.28",
     "@types/mathjax": "0.0.31",
     "@types/mocha": "^2.2.32",
+    "@types/requirejs": "^2.1.28",
     "@types/sanitize-html": "^1.13.31",
     "awesome-typescript-loader": "^2.2.4",
     "concurrently": "^2.0.0",

src/completer/handler.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   IDisposable

src/console/content.ts

@@ -3,7 +3,7 @@
 
 import {
   ISession, KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   clearSignalData, defineSignal, ISignal

src/console/history.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Vector

src/console/panel.ts

@@ -3,7 +3,7 @@
 
 import {
   ISession
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Message

src/console/plugin.ts

@@ -3,7 +3,7 @@
 
 import {
   ContentsManager, Kernel, ISession, Session, utils
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   JSONObject

src/csvwidget/widget.ts

@@ -3,7 +3,7 @@
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Message

src/docmanager/manager.ts

@@ -3,7 +3,7 @@
 
 import {
   ContentsManager, Kernel, IServiceManager, Session
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   each

src/docmanager/widgetmanager.ts

@@ -3,7 +3,7 @@
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   each

src/docregistry/context.ts

@@ -4,7 +4,7 @@
 import {
   ContentsManager, Contents, IKernel, IServiceManager, ISession, utils,
   Kernel, Session
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   findIndex

src/docregistry/default.ts

@@ -8,7 +8,7 @@ import 'codemirror/mode/meta';
 
 import {
   Contents, Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   defineSignal, ISignal

src/docregistry/kernelactions.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   showDialog

src/docregistry/kernelselector.ts

@@ -3,7 +3,7 @@
 
 import {
   Kernel, Session
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   showDialog

src/docregistry/registry.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, Contents, Kernel, Session
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   each

src/docregistry/savehandler.ts

@@ -3,7 +3,7 @@
 
 import {
   IServiceManager
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   IDisposable

src/editorwidget/widget.ts

@@ -8,7 +8,7 @@ import 'codemirror/mode/meta';
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Token

src/filebrowser/browser.ts

@@ -3,7 +3,7 @@
 
 import {
   Contents
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   each

src/filebrowser/buttons.ts

@@ -3,7 +3,7 @@
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   each

src/filebrowser/dialogs.ts

@@ -3,7 +3,7 @@
 
 import {
   Contents, Kernel, Session
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   each

src/filebrowser/listing.ts

@@ -3,7 +3,7 @@
 
 import {
   Contents
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   each

src/filebrowser/model.ts

@@ -3,7 +3,7 @@
 
 import {
   Contents, ContentsManager, Kernel, IServiceManager, Session
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   ISequence

src/help/plugin.ts

@@ -2,8 +2,8 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  getBaseUrl
-} from 'jupyter-js-services/lib/utils';
+  utils
+} from '@jupyterlab/services';
 
 import {
   Menu
@@ -148,7 +148,7 @@ function activateHelpHandler(app: JupyterLab, mainMenu: IMainMenu, palette: ICom
   app.commands.addCommand(openClassicNotebookId, {
     label: 'Open Classic Notebook',
     execute: () => {
-      window.open(getBaseUrl()+'tree');
+      window.open(utils.getBaseUrl() + 'tree');
     }
   });
   palette.addItem({ command: openClassicNotebookId, category: 'Help'});

src/imagewidget/widget.ts

@@ -3,7 +3,7 @@
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Message

src/inspector/handler.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   IDisposable

src/markdownwidget/widget.ts

@@ -3,7 +3,7 @@
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Message

src/notebook/cells/model.ts

@@ -3,7 +3,7 @@
 
 import {
   utils
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   deepEqual

src/notebook/cells/widget.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   defineSignal, ISignal

src/notebook/common/mimetype.ts

@@ -8,7 +8,7 @@ import 'codemirror/mode/meta';
 
 import {
   KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 
 /**

src/notebook/notebook/actions.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   MimeData as IClipboard

src/notebook/notebook/model.ts

@@ -3,7 +3,7 @@
 
 import {
   utils
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   deepEqual

src/notebook/notebook/modelfactory.ts

@@ -3,7 +3,7 @@
 
 import {
   Contents
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   DocumentRegistry

src/notebook/notebook/panel.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Message

src/notebook/notebook/widget.ts

@@ -3,7 +3,7 @@
 
 import {
   KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   find

src/notebook/notebook/widgetfactory.ts

@@ -3,7 +3,7 @@
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   MimeData as IClipboard

src/notebook/output-area/model.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, KernelMessage
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   JSONObject

src/notebook/output-area/widget.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   JSONObject

src/running/index.ts

@@ -3,7 +3,7 @@
 
 import {
   IServiceManager, Session, TerminalSession
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Message

src/services/index.ts

@@ -3,7 +3,7 @@
 
 import {
   IServiceManager as IBaseServiceManager
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Token

src/services/plugin.ts

@@ -3,7 +3,7 @@
 
 import {
   ServiceManager
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   JupyterLabPlugin

src/terminal/index.ts

@@ -3,7 +3,7 @@
 
 import {
   ITerminalSession, TerminalSession
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Message, sendMessage

src/toolbar/kernel.ts

@@ -3,7 +3,7 @@
 
 import {
   IKernel, Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   ISignal

src/tsconfig.json

@@ -4,7 +4,7 @@
     "noImplicitAny": true,
     "noEmitOnError": true,
     "lib": ["dom", "es5", "es2015.collection", "es2015.promise"],
-    "types": ["mathjax"],
+    "types": ["mathjax", "requirejs"],
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "ES5",

src/typings.d.ts

@@ -7,6 +7,7 @@
  * and the @types typing resolution.
  */
 /// <reference path="../node_modules/@types/mathjax/index.d.ts"/>
+/// <reference path="../node_modules/@types/requirejs/index.d.ts"/>
 /// <reference path="../node_modules/typescript/lib/lib.es2015.promise.d.ts"/>
 /// <reference path="../node_modules/typescript/lib/lib.dom.d.ts"/>
 /// <reference path="../node_modules/typescript/lib/lib.es5.d.ts"/>

test/src/completer/handler.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   KernelMessage, IKernel, Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   BaseCellWidget, CellModel

test/src/console/history.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   KernelMessage, IKernel, Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   ConsoleHistory

test/src/docregistry/default.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Widget

test/src/docregistry/registry.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   DisposableDelegate, IDisposable
@@ -16,7 +16,7 @@ import {
 } from 'phosphor/lib/ui/widget';
 
 import {
-  ABCWidgetFactory, Base64ModelFactory, DocumentRegistry, TextModelFactory
+  ABCWidgetFactory, DocumentRegistry, TextModelFactory
 } from '../../../lib/docregistry';
 
 

test/src/filebrowser/model.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   ServiceManager, IServiceManager, ISession
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   FileBrowserModel

test/src/notebook/cells/widget.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Message, sendMessage

test/src/notebook/notebook/actions.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   IKernel, Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   MimeData

test/src/notebook/notebook/default-toolbar.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   utils, Session
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   MimeData

test/src/notebook/output-area/model.spec.ts

@@ -5,7 +5,7 @@ import expect = require('expect.js');
 
 import {
   IKernel, Kernel
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   deepEqual

test/src/tsconfig.json

@@ -3,7 +3,7 @@
     "noImplicitAny": true,
     "noEmitOnError": true,
     "lib": ["dom", "es5", "es2015.promise"],
-    "types": ["mocha", "expect.js"],
+    "types": ["mocha", "expect.js", "requirejs"],
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "ES5",

test/src/utils.ts

@@ -9,7 +9,7 @@ import {
 
 import {
   ServiceManager, utils, IServiceManager
-} from 'jupyter-js-services';
+} from '@jupyterlab/services';
 
 import {
   Widget