Cleanup

lerna.json

@@ -7,6 +7,7 @@
     "packages/*",
     "packages/services/examples/node",
     "packages/services/examples/browser",
+    "packages/services/examples/typescript-browser-with-output",
     "test"
   ],
   "version": "independent"

packages/services/examples/typescript-browser-with-output/index.ts

@@ -1,5 +1,5 @@
 /*-----------------------------------------------------------------------------
-| Copyright (c) 2014-2015, Jupyter Development Team.
+| Copyright (c) 2014-2017, Jupyter Development Team.
 |
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
@@ -9,29 +9,20 @@ import 'es6-promise';
 
 import { OutputArea, OutputAreaModel } from '@jupyterlab/outputarea';
 
-import { 
+import {
   RenderMime, defaultRendererFactories
 } from '@jupyterlab/rendermime';
 
 import {
-  Kernel, ServerConnection, Session
+  Kernel
 } from '@jupyterlab/services';
 
 function main() {
-  let settings: ServerConnection.ISettings
-  let sessionOptions: Session.IOptions
-  let session: Session.ISession;
-  let kernel: Kernel.IKernel
-
-
-  let renderMimeOptions: RenderMime.IOptions
-  let renderMime: RenderMime
-  let model: OutputAreaModel
-  let outputAreaOptions: OutputArea.IOptions
-  let outputArea: OutputArea
-
-  let promise: Promise<Kernel.IFuture>
-  let future: Kernel.IFuture
+  let kernel: Kernel.IKernel;
+  let renderMime: RenderMime;
+  let model: OutputAreaModel;
+  let outputAreaOptions: OutputArea.IOptions;
+  let outputArea: OutputArea;
 
   let testcode = [
     'import numpy as np',
@@ -42,36 +33,24 @@ function main() {
     'print(x)',
     'print(y)',
     'plt.plot(x, y)'
-  ].join('\n')
+  ].join('\n');
 
-  settings = ServerConnection.makeSettings({})
-  sessionOptions = {
-    kernelName: 'python3',
-    serverSettings: settings
-  };
-
-  model = new OutputAreaModel()
-  renderMime = new RenderMime()
-    
-  for (let factory of defaultRendererFactories) {
-    renderMime.addFactory(factory)
-  }
+  model = new OutputAreaModel();
+  renderMime = new RenderMime({ initialFactories: defaultRendererFactories });
 
   outputAreaOptions = {
     model: model,
     rendermime: renderMime
-  }
+  };
 
-  outputArea = new OutputArea(outputAreaOptions)
-    
-  Kernel.startNew(this.options).then(newKernel => {
-    kernel = newKernel
-  }).then(() => {
-    future = kernel.requestExecute({ code: testcode })
+  outputArea = new OutputArea(outputAreaOptions);
+
+  Kernel.startNew().then(newKernel => {
+    kernel = newKernel;
   }).then(() => {
-    outputArea.future = future
-    document.getElementById("outputarea").appendChild(outputArea.node)
-  })
+    outputArea.future = kernel.requestExecute({ code: testcode });
+    document.getElementById("outputarea").appendChild(outputArea.node);
+  });
 }
 
 window.onload = main;

packages/services/examples/typescript-browser-with-output/package.json

@@ -12,12 +12,12 @@
     "clean": "rimraf build"
   },
   "devDependencies": {
-    "css-loader": "^0.28.4",
+    "css-loader": "^0.27.3",
     "rimraf": "^2.5.2",
-    "style-loader": "^0.18.2",
+    "style-loader": "^0.13.1",
     "tslint": "~4.5.0",
-    "typescript": "^2.4.1",
-    "webpack": "~2.2.0"
+    "typescript": "~2.4.1",
+    "webpack": "~2.2.1"
   },
   "version": "0.4.1"
 }