Migrate to Jupyterlab 2.0.0 (jupyterlab#116)

Required updates to support JupyterLab 2.0.0 including
moving to Lumino JS library .

Fixes jupyterlab#121

Co-authored-by: Alex Bozarth <ajbozart@us.ibm.com>

.gitignore

@@ -4,3 +4,4 @@ node_modules/
 *.egg-info/
 .ipynb_checkpoints
 package-lock.json
+.idea/

README.md

@@ -10,7 +10,7 @@ Here is an animation showing the extension's use, with a notebook from the [Pyth
 
 ## Prerequisites
 
-- JupyterLab >=1.0
+- JupyterLab >=2.0
 
 ## Installation
 

package.json

@@ -38,20 +38,20 @@
     ]
   },
   "dependencies": {
-    "@jupyterlab/application": "^1.0.0",
-    "@jupyterlab/apputils": "^1.0.0",
-    "@jupyterlab/cells": "^1.0.0",
-    "@jupyterlab/coreutils": "^3.0.0",
-    "@jupyterlab/docmanager": "^1.0.0",
-    "@jupyterlab/docregistry": "^1.0.0",
-    "@jupyterlab/fileeditor": "^1.0.0",
-    "@jupyterlab/markdownviewer": "^1.0.0",
-    "@jupyterlab/notebook": "^1.0.0",
-    "@jupyterlab/rendermime": "^1.0.0",
-    "@phosphor/algorithm": "^1.1.3",
-    "@phosphor/coreutils": "^1.3.1",
-    "@phosphor/messaging": "^1.2.3",
-    "@phosphor/widgets": "^1.8.0",
+    "@jupyterlab/application": "^2.0.0",
+    "@jupyterlab/apputils": "^2.0.0",
+    "@jupyterlab/cells": "^2.0.0",
+    "@jupyterlab/coreutils": "^4.0.0",
+    "@jupyterlab/docmanager": "^2.0.0",
+    "@jupyterlab/docregistry": "^2.0.0",
+    "@jupyterlab/fileeditor": "^2.0.0",
+    "@jupyterlab/markdownviewer": "^2.0.0",
+    "@jupyterlab/notebook": "^2.0.0",
+    "@jupyterlab/rendermime": "^2.0.0",
+    "@lumino/algorithm": "^1.2.3",
+    "@lumino/coreutils": "^1.4.2",
+    "@lumino/messaging": "^1.3.3",
+    "@lumino/widgets": "^1.10.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
   },

src/generators/notebook/options_manager.ts

@@ -75,7 +75,7 @@ class OptionsManager extends Registry.IOptionsManager {
    */
   set notebookMetadata(value: [string, any]) {
     if (this._notebook.currentWidget != null) {
-      this._notebook.currentWidget.model.metadata.set(value[0], value[1]);
+      this._notebook.currentWidget.model!.metadata.set(value[0], value[1]);
     }
   }
 

src/generators/notebook/set_collapsed_state.ts

@@ -3,7 +3,7 @@
 
 import { Cell, CodeCell, CodeCellModel } from '@jupyterlab/cells';
 import { INotebookTracker } from '@jupyterlab/notebook';
-import { Panel } from '@phosphor/widgets';
+import { Panel } from '@lumino/widgets';
 import { parseHeading } from '../../utils/parse_heading';
 import { isMarkdown } from '../../utils/is_markdown';
 import { isDOM } from '../../utils/is_dom';

src/generators/notebook/toolbar_generator.tsx

@@ -3,7 +3,7 @@
 
 import * as React from 'react';
 import { INotebookTracker } from '@jupyterlab/notebook';
-import { JSONValue } from '@phosphor/coreutils';
+import { JSONValue } from '@lumino/coreutils';
 import { OptionsManager } from './options_manager';
 import { TagsToolComponent } from './tagstool';
 
@@ -73,16 +73,16 @@ function toolbar(options: OptionsManager, tracker: INotebookTracker) {
             tracker.currentWidget.content.activeCellChanged.connect(() => {
               options.updateWidget();
             });
-            const numbering = tracker.currentWidget.model.metadata.get(
+            const numbering = tracker.currentWidget.model!.metadata.get(
               'toc-autonumbering'
             ) as boolean;
-            const showCode = tracker.currentWidget.model.metadata.get(
+            const showCode = tracker.currentWidget.model!.metadata.get(
               'toc-showcode'
             ) as boolean;
-            const showMarkdown = tracker.currentWidget.model.metadata.get(
+            const showMarkdown = tracker.currentWidget.model!.metadata.get(
               'toc-showmarkdowntxt'
             ) as boolean;
-            const showTags = tracker.currentWidget.model.metadata.get(
+            const showTags = tracker.currentWidget.model!.metadata.get(
               'toc-showtags'
             ) as boolean;
             options.initializeOptions(
@@ -144,7 +144,7 @@ function toolbar(options: OptionsManager, tracker: INotebookTracker) {
     loadTags() {
       const notebook = tracker.currentWidget;
       if (notebook) {
-        const cells = notebook.model.cells;
+        const cells = notebook.model!.cells;
         const tags = new Set<string>();
         this.tags = [];
         for (let i = 0; i < cells.length; i++) {

src/registry.ts

@@ -2,8 +2,8 @@
 // Distributed under the terms of the Modified BSD License.
 
 import { IWidgetTracker } from '@jupyterlab/apputils';
-import { Token } from '@phosphor/coreutils';
-import { Widget } from '@phosphor/widgets';
+import { Token } from '@lumino/coreutils';
+import { Widget } from '@lumino/widgets';
 import { IHeading } from './utils/headings';
 
 /**

src/toc.tsx

@@ -6,8 +6,8 @@ import * as ReactDOM from 'react-dom';
 import { ActivityMonitor, PathExt } from '@jupyterlab/coreutils';
 import { IDocumentManager } from '@jupyterlab/docmanager';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
-import { Message } from '@phosphor/messaging';
-import { Widget } from '@phosphor/widgets';
+import { Message } from '@lumino/messaging';
+import { Widget } from '@lumino/widgets';
 import { IHeading } from './utils/headings';
 import { TableOfContentsRegistry as Registry } from './registry';
 import { TOCTree } from './toc_tree';

src/toc_tree.tsx

@@ -2,7 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 import * as React from 'react';
-import { Widget } from '@phosphor/widgets';
+import { Widget } from '@lumino/widgets';
 import { IHeading } from './utils/headings';
 import { TableOfContentsRegistry as Registry } from './registry';
 import { TOCItem } from './toc_item';