Move to JupyterLab 4.1, fix tests and eslint config

krassowski · krassowski · commit dfb3849dd302 · 2024-02-23T20:32:24.000Z
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,6 @@
 .eggs/
+.mypy_cache
+.pytest_cache
 .venv/
 **/_*.d.ts
 **/.ipynb_checkpoints
diff --git a/package.json b/package.json
@@ -40,19 +40,9 @@
   "private": true,
   "resolutions": {
     "prettier": "^2.8.1",
-    "typescript": "~5.0.3",
+    "typescript": "~5.1.6",
     "decode-uri-component": "^0.2.1",
-    "jest": "^29.0.0",
-    "@jupyterlab/docregistry": "~4.0.12",
-    "@jupyterlab/ui-components": "~4.0.12",
-    "@jupyterlab/translation": "~4.0.12",
-    "@jupyterlab/docmanager": "~4.0.12",
-    "@jupyterlab/apputils": "~4.1.12",
-    "@jupyterlab/rendermime": "~4.0.12",
-    "@jupyterlab/services": "~7.0.12",
-    "@jupyterlab/coreutils": "~6.0.12",
-    "@jupyterlab/statusbar": "~4.0.12",
-    "@jupyterlab/observables": "~5.0.12"
+    "jest": "^29.0.0"
   },
   "scripts": {
     "bootstrap": "jlpm & jlpm deduplicate && jlpm clean && jlpm build && jlpm lint",
diff --git a/packages/.eslintrc.js b/packages/.eslintrc.js
@@ -92,10 +92,10 @@ module.exports = {
           'unknown'
         ],
         pathGroups: [
-          { pattern: 'react/**', group: 'builtin', order: 'after' },
-          { pattern: 'codemirror/**', group: 'external', order: 'before' },
-          { pattern: '@lumino/**', group: 'external', order: 'before' },
-          { pattern: '@jupyterlab/**', group: 'external', order: 'after' }
+          { pattern: 'react/**', group: 'builtin', position: 'after' },
+          { pattern: 'codemirror/**', group: 'external', position: 'before' },
+          { pattern: '@lumino/**', group: 'external', position: 'before' },
+          { pattern: '@jupyterlab/**', group: 'external', position: 'after' }
         ],
         'newlines-between': 'always',
         alphabetize: { order: 'asc' }
diff --git a/packages/_example-extractor/jest.config.js b/packages/_example-extractor/jest.config.js
@@ -11,6 +11,10 @@ const reuseFromUpstream = [
 ];
 
 const esModules = [
+  '@microsoft',
+  '@jupyter/react-components',
+  '@jupyter/web-components',
+  'exenv-es6',
   '@jupyterlab/',
   '@jupyter-notebook/',
   'lib0',
diff --git a/packages/_example-extractor/package.json b/packages/_example-extractor/package.json
@@ -11,15 +11,15 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@jupyter-lsp/jupyterlab-lsp": "^5.0.0-alpha.0"
+    "@jupyter-lsp/jupyterlab-lsp": "^5.0.0"
   },
   "devDependencies": {
-    "@jupyterlab/application": " ~4.0.12",
-    "@jupyterlab/testing": " ~4.0.12",
+    "@jupyterlab/application": "^4.1.0",
+    "@jupyterlab/testing": "^4.1.0",
     "@types/jest": "^29.5.4",
     "jest": "^29.2.0",
     "rimraf": "^5.0.5",
-    "typescript": "~5.0.4"
+    "typescript": "~5.1.6"
   },
   "jupyterlab": {
     "extension": true
diff --git a/packages/_klingon-integration/package.json b/packages/_klingon-integration/package.json
@@ -11,12 +11,12 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@jupyterlab/application": " ~4.0.12"
+    "@jupyterlab/application": "^4.1.0"
   },
   "devDependencies": {
-    "@jupyterlab/application": " ~4.0.12",
-    "@jupyterlab/builder": " ~4.0.12",
-    "typescript": "~5.0.4"
+    "@jupyterlab/application": "^4.1.0",
+    "@jupyterlab/builder": "^4.1.0",
+    "typescript": "~5.1.6"
   },
   "jupyterlab": {
     "extension": true,
diff --git a/packages/code-jumpers/jest.config.js b/packages/code-jumpers/jest.config.js
@@ -10,6 +10,10 @@ const reuseFromUpstream = [
 ];
 
 const esModules = [
+  '@microsoft',
+  '@jupyter/react-components',
+  '@jupyter/web-components',
+  'exenv-es6',
   '@jupyterlab/',
   'lib0',
   'y\\-protocols',
diff --git a/packages/code-jumpers/package.json b/packages/code-jumpers/package.json
@@ -30,18 +30,18 @@
     "clean": "rimraf lib"
   },
   "devDependencies": {
-    "@jupyterlab/apputils": "~4.1.12",
-    "@jupyterlab/codeeditor": "~4.0.12",
-    "@jupyterlab/coreutils": "~6.0.12",
-    "@jupyterlab/docmanager": "~4.0.12",
-    "@jupyterlab/docregistry": "~4.0.12",
-    "@jupyterlab/fileeditor": "~4.0.12",
-    "@jupyterlab/notebook": "~4.0.12",
-    "@jupyterlab/observables": "~5.0.12",
-    "@jupyterlab/testing": "~4.0.12",
-    "@jupyterlab/translation": "~4.0.12",
+    "@jupyterlab/apputils": "^4.2.0",
+    "@jupyterlab/codeeditor": "^4.1.0",
+    "@jupyterlab/coreutils": "^6.1.0",
+    "@jupyterlab/docmanager": "^4.1.0",
+    "@jupyterlab/docregistry": "^4.1.0",
+    "@jupyterlab/fileeditor": "^4.1.0",
+    "@jupyterlab/notebook": "^4.1.0",
+    "@jupyterlab/observables": "^5.1.0",
+    "@jupyterlab/testing": "^4.1.0",
+    "@jupyterlab/translation": "^4.1.0",
     "rimraf": "^5.0.5",
-    "typescript": "~5.0.4"
+    "typescript": "~5.1.6"
   },
   "jupyterlab": {
     "extension": false,
diff --git a/packages/completion-theme/package.json b/packages/completion-theme/package.json
@@ -33,11 +33,11 @@
     "clean": "rimraf lib"
   },
   "devDependencies": {
-    "@jupyterlab/builder": " ~4.0.12",
-    "@jupyterlab/ui-components": " ~4.0.12",
+    "@jupyterlab/builder": "^4.1.0",
+    "@jupyterlab/ui-components": "^4.1.0",
     "react": "^18.2.0",
     "rimraf": "^5.0.5",
-    "typescript": "~5.0.4"
+    "typescript": "~5.1.6"
   },
   "jupyterlab": {
     "extension": true,
diff --git a/packages/jupyterlab-lsp/jest.config.js b/packages/jupyterlab-lsp/jest.config.js
@@ -11,6 +11,10 @@ const reuseFromUpstream = [
 ];
 
 const esModules = [
+  '@microsoft',
+  '@jupyter/react-components',
+  '@jupyter/web-components',
+  'exenv-es6',
   '@jupyterlab/',
   '@jupyter-notebook/',
   'lib0',
diff --git a/packages/jupyterlab-lsp/package.json b/packages/jupyterlab-lsp/package.json
@@ -64,45 +64,44 @@
     "@jupyter-lsp/completion-theme": "~4.0.1",
     "@jupyter-lsp/theme-material": "~3.0.0",
     "@jupyter-lsp/theme-vscode": "~3.0.0",
-    "@jupyterlab/lsp": "~4.0.12",
+    "@jupyterlab/lsp": "^4.1.0",
     "@rjsf/utils": "^5.1.0",
     "@rjsf/validator-ajv8": "^5.12.1",
     "lodash.mergewith": "^4.6.1"
   },
   "devDependencies": {
     "@codemirror/lint": "^6.4.0",
-    "@jupyter-notebook/application": "^7.0.3",
-    "@jupyterlab/application": "~4.1.0",
-    "@jupyterlab/apputils": "~4.1.12",
-    "@jupyterlab/builder": "~4.0.12",
-    "@jupyterlab/cells": "~4.0.12",
-    "@jupyterlab/codeeditor": "~4.0.12",
-    "@jupyterlab/codemirror": "~4.0.12",
-    "@jupyterlab/completer": "~4.0.12",
-    "@jupyterlab/coreutils": "~6.0.12",
-    "@jupyterlab/docmanager": "~4.0.12",
-    "@jupyterlab/docregistry": "~4.0.12",
-    "@jupyterlab/fileeditor": "~4.0.12",
-    "@jupyterlab/logconsole": "~4.0.12",
-    "@jupyterlab/notebook": "~4.0.12",
-    "@jupyterlab/rendermime": "~4.0.12",
-    "@jupyterlab/services": "~7.0.12",
-    "@jupyterlab/statusbar": "~4.0.12",
-    "@jupyterlab/testing": "~4.0.12",
-    "@jupyterlab/tooltip": "~4.0.12",
-    "@jupyterlab/ui-components": "~4.0.12",
+    "@jupyter-notebook/application": "^7.1.0",
+    "@jupyterlab/application": "^4.1.0",
+    "@jupyterlab/apputils": "^4.2.0",
+    "@jupyterlab/builder": "^4.1.0",
+    "@jupyterlab/cells": "^4.1.0",
+    "@jupyterlab/codeeditor": "^4.1.0",
+    "@jupyterlab/codemirror": "^4.1.0",
+    "@jupyterlab/completer": "^4.1.0",
+    "@jupyterlab/coreutils": "^6.1.0",
+    "@jupyterlab/docmanager": "^4.1.0",
+    "@jupyterlab/docregistry": "^4.1.0",
+    "@jupyterlab/fileeditor": "^4.1.0",
+    "@jupyterlab/logconsole": "^4.1.0",
+    "@jupyterlab/notebook": "^4.1.0",
+    "@jupyterlab/rendermime": "^4.1.0",
+    "@jupyterlab/services": "^7.1.0",
+    "@jupyterlab/statusbar": "^4.1.0",
+    "@jupyterlab/testing": "^4.1.0",
+    "@jupyterlab/tooltip": "^4.1.0",
+    "@jupyterlab/ui-components": "^4.1.0",
     "@lumino/algorithm": "*",
-    "@lumino/widgets": "^2.3.0",
+    "@lumino/widgets": "^2.3.1",
     "@types/jest": "^29.5.4",
     "@types/lodash.mergewith": "^4.6.1",
-    "codemirror": "*",
     "jest": "^29.2.0",
     "json-schema-to-typescript": "^8.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "react": "^18.2.0",
     "rimraf": "^5.0.5",
-    "typescript": "~5.0.4",
+    "typescript": "~5.1.6",
     "vscode-languageserver-protocol": "^3.17.0"
   },
   "jupyterlab": {
diff --git a/packages/jupyterlab-lsp/src/edits.spec.ts b/packages/jupyterlab-lsp/src/edits.spec.ts
@@ -218,7 +218,7 @@ describe('EditApplicator', () => {
       it('applies edit across cells', async () => {
         let testNotebook = {
           cells: [
-            codeCell(['def a_function():', '    pass']),
+            codeCell(['def a_function():\n', '    pass']),
             codeCell(['x = a_function()'])
           ],
           metadata: pythonNotebookMetadata
@@ -274,8 +274,8 @@ describe('EditApplicator', () => {
       it('handles IPython magics', async () => {
         let testNotebook = {
           cells: [
-            codeCell(['x = %ls', 'print(x)']),
-            codeCell(['%%python', 'y = x', 'print(x)'])
+            codeCell(['x = %ls\n', 'print(x)']),
+            codeCell(['%%python\n', 'y = x\n', 'print(x)'])
           ],
           metadata: pythonNotebookMetadata
         } as nbformat.INotebookContent;
diff --git a/packages/jupyterlab-lsp/src/features/completion/provider.ts b/packages/jupyterlab-lsp/src/features/completion/provider.ts
@@ -1,5 +1,5 @@
-import { ILSPCompletionThemeManager } from '@jupyter-lsp/completion-theme';
 import { SourceChange } from '@jupyter/ydoc';
+import { ILSPCompletionThemeManager } from '@jupyter-lsp/completion-theme';
 import { CodeEditor } from '@jupyterlab/codeeditor';
 import {
   ICompletionProvider,
diff --git a/packages/jupyterlab-lsp/src/features/diagnostics/diagnostics.spec.ts b/packages/jupyterlab-lsp/src/features/diagnostics/diagnostics.spec.ts
@@ -230,7 +230,7 @@ describe('Diagnostics', () => {
 
     it('renders inspections across cells', async () => {
       setNotebookContent(env.notebook, [
-        codeCell(['x =1', 'test']),
+        codeCell(['x =1\n', 'test']),
         codeCell(['    '])
       ]);
       showAllCells(env.notebook);
@@ -330,8 +330,8 @@ describe('Diagnostics', () => {
 
     it.skip('works in foreign documents', async () => {
       setNotebookContent(env.notebook, [
-        codeCell(['valid = 0', 'code = 1', '# here']),
-        codeCell(['%%python', 'y = 1', 'x'])
+        codeCell(['valid = 0\n', 'code = 1\n', '# here']),
+        codeCell(['%%python\n', 'y = 1\n', 'x'])
       ]);
       showAllCells(env.notebook);
       await env.adapter.updateDocuments();
diff --git a/packages/jupyterlab-lsp/src/testutils.ts b/packages/jupyterlab-lsp/src/testutils.ts
@@ -1,3 +1,4 @@
+import { LabShell } from '@jupyterlab/application';
 import { ICellModel } from '@jupyterlab/cells';
 import { IEditorServices } from '@jupyterlab/codeeditor';
 import {
@@ -17,6 +18,7 @@ import {
 import { FileEditor, FileEditorFactory } from '@jupyterlab/fileeditor';
 import {
   WidgetLSPAdapter,
+  WidgetLSPAdapterTracker,
   LanguageServerManager,
   CodeExtractorsManager,
   DocumentConnectionManager,
@@ -107,9 +109,6 @@ class MockConnection extends LSPConnection {
     super(options);
   }
 
-  //get isReady(): boolean {
-  //  return true;
-  //}
   connect(ws: any): void {
     this.connection = new MockMessageConnection() as MessageConnection;
     this.onServerInitialized({
@@ -211,6 +210,8 @@ export abstract class TestEnvironment implements ITestEnvironment {
           ybinding({ ytext: (model.sharedModel as any).ysource })
         )
     });
+    const shell = new LabShell({ waitForRestore: false });
+    const adapterTracker = new WidgetLSPAdapterTracker({ shell });
     const languages = new EditorLanguageRegistry();
     this.editorServices = {
       factoryService: new CodeMirrorEditorFactory({
@@ -222,7 +223,8 @@ export abstract class TestEnvironment implements ITestEnvironment {
     this._languageServerManager = new MockLanguageServerManager({});
     this.connectionManager = new MockDocumentConnectionManager({
       languageServerManager: this._languageServerManager,
-      connection: this.options?.connection
+      connection: this.options?.connection,
+      adapterTracker
     });
     this.documentOptions = {
       ...this.getDefaults(),
@@ -441,8 +443,9 @@ export function setNotebookContent(
     metadata: metadata
   } as nbformat.INotebookContent;
 
-  notebook.model = new NotebookModel();
-  notebook.model.fromJSON(testNotebook);
+  const model = new NotebookModel();
+  model.fromJSON(testNotebook);
+  notebook.model = model;
 }
 
 export const pythonNotebookMetadata = {
diff --git a/packages/theme-material/package.json b/packages/theme-material/package.json
@@ -34,7 +34,7 @@
     "clean": "rimraf lib"
   },
   "dependencies": {
-    "@jupyter-lsp/completion-theme": "^4.0.0-rc.0"
+    "@jupyter-lsp/completion-theme": "^4.0.0"
   },
   "jupyterlab": {
     "extension": true,
diff --git a/packages/theme-vscode/package.json b/packages/theme-vscode/package.json
@@ -34,7 +34,7 @@
     "clean": "rimraf lib"
   },
   "dependencies": {
-    "@jupyter-lsp/completion-theme": "^4.0.0-rc.0"
+    "@jupyter-lsp/completion-theme": "^4.0.0"
   },
   "jupyterlab": {
     "extension": true,
diff --git a/yarn.lock b/yarn.lock
