update labextension to jlab 4

Author: minrk

.eslintrc.js

@@ -10,7 +10,7 @@ module.exports = {
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
+    "prettier",
     "plugin:react/recommended",
   ],
   parser: "@typescript-eslint/parser",

.gitignore

@@ -32,3 +32,5 @@ lib
 ipyparallel/labextension
 tsconfig.tsbuildinfo
 dask-worker-space
+.yarn
+.yarnrc.yml

lab/src/index.ts

@@ -78,8 +78,8 @@ async function activate(
   const isLab = !!labShell;
   const isRetroTree = PageConfig.getOption("retroPage") == "tree";
 
-  const clientCodeInjector = (model: IClusterModel) => {
-    const editor = Private.getCurrentEditor(
+  const clientCodeInjector = async (model: IClusterModel) => {
+    const editor = await Private.getCurrentEditor(
       app,
       notebookTracker,
       consoleTracker,
@@ -246,12 +246,12 @@ async function activate(
   // If either is not found, it bails.
   app.commands.addCommand(CommandIDs.injectClientCode, {
     label: "Inject IPython Client Connection Code",
-    execute: () => {
+    execute: async () => {
       const cluster = Private.clusterFromClick(app, sidebar.clusterManager);
       if (!cluster) {
         return;
       }
-      clientCodeInjector(cluster);
+      return await clientCodeInjector(cluster);
     },
   });
 
@@ -413,7 +413,7 @@ namespace Private {
     const cursor = editor.getCursorPosition();
     const offset = editor.getOffsetAt(cursor);
     const code = getClientCode(cluster);
-    editor.model.value.insert(offset, code);
+    editor.model.sharedModel.updateSource(offset, offset, code);
   }
 
   /**
@@ -460,30 +460,34 @@ rc`;
    * In the case of a notebook, it creates a new cell above the currently
    * active cell and then returns that.
    */
-  export function getCurrentEditor(
+  export async function getCurrentEditor(
     app: JupyterFrontEnd,
     notebookTracker: INotebookTracker,
     consoleTracker: IConsoleTracker,
-  ): CodeEditor.IEditor | null | undefined {
+  ): Promise<CodeEditor.IEditor | null | undefined> {
     // Get a handle on the most relevant kernel,
     // whether it is attached to a notebook or a console.
     let current = app.shell.currentWidget;
     let editor: CodeEditor.IEditor | null | undefined;
     if (current && notebookTracker.has(current)) {
       NotebookActions.insertAbove((current as NotebookPanel).content);
       const cell = (current as NotebookPanel).content.activeCell;
+      await cell.ready;
       editor = cell && cell.editor;
     } else if (current && consoleTracker.has(current)) {
       const cell = (current as ConsolePanel).console.promptCell;
+      await cell.ready;
       editor = cell && cell.editor;
     } else if (notebookTracker.currentWidget) {
       const current = notebookTracker.currentWidget;
       NotebookActions.insertAbove(current.content);
       const cell = current.content.activeCell;
+      await cell.ready;
       editor = cell && cell.editor;
     } else if (consoleTracker.currentWidget) {
       const current = consoleTracker.currentWidget;
       const cell = current.console.promptCell;
+      await cell.ready;
       editor = cell && cell.editor;
     }
     return editor;

package.json

@@ -48,44 +48,44 @@
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.0.0",
-    "@jupyterlab/apputils": "^3.0.0",
-    "@jupyterlab/codeeditor": "^3.0.0",
-    "@jupyterlab/console": "^3.0.0",
-    "@jupyterlab/coreutils": "^5.0.0",
-    "@jupyterlab/mainmenu": "^3.0.0",
-    "@jupyterlab/nbformat": "^3.0.0",
-    "@jupyterlab/notebook": "^3.6.3",
-    "@jupyterlab/services": "^6.0.0",
-    "@jupyterlab/settingregistry": "^3.6.3",
-    "@jupyterlab/statedb": "^3.0.0",
-    "@jupyterlab/ui-components": "^3.0.0",
-    "@lumino/algorithm": "^1.3.3",
-    "@lumino/coreutils": "^1.5.3",
-    "@lumino/domutils": "^1.2.3",
-    "@lumino/dragdrop": "^1.7.1",
-    "@lumino/messaging": "^1.4.3",
-    "@lumino/polling": "^1.0.4",
-    "@lumino/signaling": "^1.4.3",
-    "@lumino/widgets": "^1.17.0",
-    "react": "~17.0.0",
-    "react-dom": "~17.0.0"
+    "@jupyterlab/application": "^4.0.5",
+    "@jupyterlab/apputils": "^4.1.5",
+    "@jupyterlab/codeeditor": "^4.0.5",
+    "@jupyterlab/console": "^4.0.5",
+    "@jupyterlab/coreutils": "^6.0.5",
+    "@jupyterlab/mainmenu": "^4.0.5",
+    "@jupyterlab/nbformat": "^4.0.5",
+    "@jupyterlab/notebook": "^4.0.5",
+    "@jupyterlab/services": "^7.0.5",
+    "@jupyterlab/settingregistry": "^4.0.5",
+    "@jupyterlab/statedb": "^4.0.5",
+    "@jupyterlab/ui-components": "^4.0.5",
+    "@lumino/algorithm": "^2.0.1",
+    "@lumino/coreutils": "^2.1.2",
+    "@lumino/domutils": "^2.0.1",
+    "@lumino/dragdrop": "^2.1.3",
+    "@lumino/messaging": "^2.0.1",
+    "@lumino/polling": "^2.1.2",
+    "@lumino/signaling": "^2.1.2",
+    "@lumino/widgets": "^2.3.0",
+    "react": "~18.2.0",
+    "react-dom": "~18.2.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.1.10",
-    "@types/react": "~17.0.0",
-    "@types/react-dom": "~17.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.2",
-    "@typescript-eslint/parser": "^5.18.0",
-    "eslint": "^8.37.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.21.5",
+    "@jupyterlab/builder": "^4.0.5",
+    "@types/react": "~18.2.21",
+    "@types/react-dom": "~18.2.7",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
+    "eslint": "^8.48.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.1.1",
-    "rimraf": "^3.0.2",
-    "typescript": "~4.3.5",
-    "yarn": "^1.22.0"
+    "prettier": "^3.0.3",
+    "rimraf": "^5.0.1",
+    "typescript": "~5.2.2",
+    "yarn": "^1.22.19"
   },
   "resolutions": {
     "@types/react": "~17.0.0"

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
-  "jupyterlab>=3.0.0,==3.*",
-  "hatchling>=0.25"
+  "jupyterlab==4.*",
+  "hatchling>=0.25",
 ]
 build-backend = "hatchling.build"