Merge pull request #300 from mcrutch/jupyterlab4

Support for JupyterLab 3.6/4+ and Notebook v7+
ryantam626 · May 5, 2023 · 5e935fc · 5e935fc
2 parents 3d29dd9 + 93c7520
commit 5e935fc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/docs_src/changelog.md b/docs_src/changelog.md
@@ -13,7 +13,7 @@ None
 
 **Jupyterlab extension**
 
-None
+Support for JupyterLab 3.6+/4+ and Notebook v7
 
 ## 1.6.1 2023-04-16
 

diff --git a/package.json b/package.json
@@ -43,16 +43,16 @@
     "prepare": "jlpm run clean && jlpm run build:prod"
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.0.0",
-    "@jupyterlab/apputils": "^3.0.0",
-    "@jupyterlab/builder": "^3.0.0",
-    "@jupyterlab/fileeditor": "^3.0.0",
-    "@jupyterlab/mainmenu": "^3.0.0",
-    "@jupyterlab/notebook": "^3.0.0",
+    "@jupyterlab/application": "^3.6.0 || ~4.0.0",
+    "@jupyterlab/apputils": "^3.6.0 || ~4.0.0",
+    "@jupyterlab/builder": "^3.6.0 || ~4.0.0",
+    "@jupyterlab/fileeditor": "^3.6.0 || ~4.0.0",
+    "@jupyterlab/mainmenu": "^3.6.0 || ~4.0.0",
+    "@jupyterlab/notebook": "^3.6.0 || ~4.0.0",
     "npm-run-all": "^4.1.5"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.0.0",
+    "@jupyterlab/builder": "^3.6.0 || ~4.0.0",
     "prettier": "^1.19.1",
     "rimraf": "^3.0.2",
     "tslint": "^5.15.0",

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
-requires = ["jupyter_packaging~=0.7.9", "jupyterlab~=3.0", "setuptools>=40.8.0", "wheel"]
+requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.6,<5", "setuptools>=40.8.0", "wheel"]
 build-backend = "setuptools.build_meta"
diff --git a/setup.py b/setup.py
@@ -77,7 +77,7 @@
     cmdclass=cmdclass,
     packages=setuptools.find_packages(),
     install_requires=[
-        "jupyterlab~=3.0",
+        "jupyterlab>=3.6,<5",
     ],
     zip_safe=False,
     include_package_data=True,

diff --git a/src/formatter.ts b/src/formatter.ts
@@ -86,7 +86,7 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
       return null;
     }
 
-    const metadata = this.notebookTracker.currentWidget.content.model.metadata.toJSON();
+    const metadata = this.notebookTracker.currentWidget.content.model.sharedModel.metadata;
 
     if (!metadata) {
       return null;
@@ -154,7 +154,7 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
         if (formatterToUse === 'noop' || formatterToUse === 'skip') {
           continue;
         }
-        const currentTexts = selectedCells.map(cell => cell.model.value.text);
+        const currentTexts = selectedCells.map(cell => cell.model.sharedModel.source);
         const formattedTexts = await this.formatCode(
           currentTexts,
           formatterToUse,
@@ -166,7 +166,7 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
           const cell = selectedCells[i];
           const currentText = currentTexts[i];
           const formattedText = formattedTexts.code[i];
-          if (cell.model.value.text === currentText) {
+          if (cell.model.sharedModel.source === currentText) {
             if (formattedText.error) {
               if (!(config.suppressFormatterErrors ?? false)) {
                 await showErrorMessage(
@@ -175,7 +175,7 @@ export class JupyterlabNotebookCodeFormatter extends JupyterlabCodeFormatter {
                 );
               }
             } else {
-              cell.model.value.text = formattedText.code;
+              cell.model.sharedModel.source = formattedText.code;
             }
           } else {
             if (!(config.suppressFormatterErrors ?? false)) {
@@ -218,7 +218,7 @@ export class JupyterlabFileEditorCodeFormatter extends JupyterlabCodeFormatter {
     const editorWidget = this.editorTracker.currentWidget;
     this.working = true;
     const editor = editorWidget.content.editor;
-    const code = editor.model.value.text;
+    const code = editor.model.sharedModel.source;
     this.formatCode(
       [code],
       formatter,
@@ -235,7 +235,7 @@ export class JupyterlabFileEditorCodeFormatter extends JupyterlabCodeFormatter {
           this.working = false;
           return;
         }
-        this.editorTracker.currentWidget.content.editor.model.value.text =
+        this.editorTracker.currentWidget.content.editor.model.sharedModel.source =
           data.code[0].code;
         this.working = false;
       })

diff --git a/tsconfig.json b/tsconfig.json
@@ -16,7 +16,7 @@
     "rootDir": "src",
     "strict": true,
     "strictNullChecks": false,
-    "target": "es2017",
+    "target": "es2018",
     "types": []
   },
   "include": ["src/*"]