Merge pull request #26 from kdunn926/fix_jupyterlab_1x_support

JupyterLab 1.x support

Author: mwcraig

CONTRIBUTORS.md

@@ -15,7 +15,7 @@
 The people below have contributed to the project by identifying and opening
 issues, offering improvements to the documentation or contributing code.
 
-We are certain the list is incomplete; please let one of us know by opening an [issue on GitHub](https://github.com/BruceSherwood/vpython-jupyter/issues) and we will be happy to add your name!
+We are certain the list is incomplete; please let one of us know by opening an [issue on GitHub](https://github.com/vpython/vpython-jupyter/issues) and we will be happy to add your name!
 
 + Wayne Decatur (@fomightez)
 + Tomokazu Higuchi (@higucheese)
@@ -27,6 +27,7 @@ We are certain the list is incomplete; please let one of us know by opening an [
 + @KHALAK
 + @qazwsxedcrfvtg14
 + @russkel
++ Kyle Dunn (@kdunn926)
 
 ## Full timeline of vpython development
 

labextension/vpython/README.md

@@ -20,8 +20,7 @@ For a development install (requires npm version 4 or later), do the following in
 
 ```bash
 npm install
-npm install --save @jupyterlab/notebook @jupyterlab/application @jupyterlab/apputils @jupyterlab/docregistry @phosphor/disposable script-loader
-npm run build
+cp -r ../../vpython/vpython_{libraries,data} lib/
 jupyter labextension install .
 ```
 

labextension/vpython/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vpython",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "VPython extension for Jupyterlab",
   "keywords": [
     "jupyter",
@@ -14,33 +14,32 @@
   "license": "BSD-3-Clause",
   "author": "John Coady",
   "files": [
-    "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
+    "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf,otf}",
     "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}"
   ],
   "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "repository": {
-    "type": "",
-    "url": ""
-  },
+  "typings": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "clean": "rimraf lib",
-    "watch": "tsc -w",
-    "prepare": "npm run build"
+    "build": "npm run build:src",
+    "build:src": "tsc",
+    "clean": "rimraf tsconfig.tsbuildinfo",
+    "prepublish": "npm run clean && npm run build",
+    "jpinstall": "jupyter labextension install ."
   },
   "dependencies": {
-    "@jupyterlab/application": "^0.19.1",
-    "@jupyterlab/apputils": "^0.19.1",
-    "@jupyterlab/docregistry": "^0.19.1",
-    "@jupyterlab/notebook": "^0.19.1",
-    "@phosphor/disposable": "^1.1.2",
+    "@jupyterlab/application": "^1.1.2",
+    "@jupyterlab/apputils": "^1.1.2",
+    "@jupyterlab/docregistry": "^1.1.2",
+    "@jupyterlab/notebook": "^1.1.2",
+    "@phosphor/disposable": "^1.3.0",
     "script-loader": "^0.7.2"
   },
   "devDependencies": {
+    "file-loader": "^4.2.0",
+    "webpack": "^4.0.0",
+    "@babel/types": "^7.6.1",
     "rimraf": "^2.6.1",
-    "script-loader": "^0.7.2",
-    "typescript": "~2.9.2"
+    "typescript": "^3.6.3"
   },
   "jupyterlab": {
     "extension": true

labextension/vpython/package.json

@@ -1,14 +1,14 @@
-//define(["nbextensions/vpython_libraries/plotly.min",
-//        "nbextensions/vpython_libraries/glow.min",
-//        "nbextensions/vpython_libraries/jquery-ui.custom.min"], function(Plotly) {
-
 import 'script-loader!./vpython_libraries/jquery.min.js';
 import 'script-loader!./vpython_libraries/jquery-ui.custom.min.js';
 import 'script-loader!./vpython_libraries/glow.min.js';
 import 'script-loader!./vpython_libraries/plotly.min.js';
 import '../style/jquery-ui.custom.css'
 import '../style/ide.css'
 
+// Ensure downstream JupyterLab webpack places the fonts in predictable locations
+import '!!file-loader?name=/vpython_data/[name].[ext]!./vpython_data/Roboto-Medium.ttf'
+import '!!file-loader?name=/vpython_data/[name].[ext]!./vpython_data/NimbusRomNo9L-Med.otf'
+
 export var comm
 var ws = null
 var isopen = false
@@ -60,8 +60,8 @@ export function setupWebsocket(msg) {
 	wscheckfontsloaded()
 }
 
-var datadir = window.location.href + '/static/vpython_data/'
-window.Jupyter_VPython = "/lab/static/vpython_data/" // prefix used by glow.min.js for textures
+var datadir = '/static/lab/vpython_data/'
+window.Jupyter_VPython = "/static/lab/vpython_data/" // prefix used by glow.min.js for textures
 
 function fontloading() {
     "use strict";
@@ -1016,4 +1016,4 @@ function handle_attrs(dattrs) {
 }
 console.log("END OF GLOWCOMM")
 
-//});
+//});

labextension/vpython/src/glowcommlab.js

@@ -3,7 +3,7 @@ import {
 } from '@phosphor/disposable';
 
 import {
-  JupyterLab, JupyterLabPlugin
+  JupyterFrontEnd, JupyterFrontEndPlugin
 } from '@jupyterlab/application';
 
 import {
@@ -19,7 +19,7 @@ import {
 /**
  * The plugin registration information.
  */
-const plugin: JupyterLabPlugin<void> = {
+const plugin: JupyterFrontEndPlugin<void> = {
   activate,
   id: 'vpython',
   autoStart: true
@@ -69,7 +69,7 @@ class VPythonExtension implements DocumentRegistry.IWidgetExtension<NotebookPane
 /**
  * Activate the extension.
  */
-function activate(app: JupyterLab) {
+function activate(app: JupyterFrontEnd) {
   app.docRegistry.addWidgetExtension('Notebook', new VPythonExtension());
 };
 
@@ -78,4 +78,4 @@ function activate(app: JupyterLab) {
 /**
  * Export the plugin as default.
  */
-export default plugin;
+export default plugin;

labextension/vpython/src/index.ts

@@ -1,14 +1,14 @@
 {
   "compilerOptions": {
     "allowJs": true,
-    "lib": ["ES5", "ES2015.Promise", "DOM"],
+    "lib": ["es6", "ES5", "ES2015.Promise", "DOM"],
     "module": "commonjs",
     "moduleResolution": "node",
 	"noImplicitAny": true,
     "noEmitOnError": true,
     "noUnusedLocals": true,
     "outDir": "./lib",
-    "target": "ES5",
+    "target": "es6",
     "strict": true,
     "strictNullChecks": false,
     "types": []