tighten up lab dependencies for now

bollwyvl · bollwyvl · commit d55b556aa2af · 2024-02-07T21:15:49.000-06:00
diff --git a/.github/workflows/job.test.yml b/.github/workflows/job.test.yml
@@ -124,7 +124,7 @@ jobs:
       matrix:
         os: [ubuntu]
         nodejs: ['>=20,<21']
-        lab: ['>=4.0.0,<5.0.0a0']
+        lab: ['>=4.0.12,<4.1.0a0']
         r: ['>=4']
     steps:
       - uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Changelog
 
+### `@jupyter-lsp/jupyterlab-lsp 5.1.0`
+
+> TBD
+
+### `jupyter-lsp 2.2.2`
+
+> TBD
+
+Requires JupyterLab `>=4.0.12,<4.1.0`
+
 ### `@jupyter-lsp/jupyterlab-lsp 5.0.3`
 
 - bug fixes:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ Thank you for all your contributions :heart:
 A development environment requires, at a minimum:
 
 - `python >=3.8,<3.13.0a0`
-- `jupyterlab >=4.0.10,<4.1.0a0`
+- `jupyterlab >=4.0.12,<4.1.0a0`
 - `nodejs >=18,!=19,!=21,<23`
 
 It is recommended to use a virtual environment (e.g. `virtualenv` or `conda env`)
diff --git a/README.md b/README.md
@@ -113,9 +113,9 @@ Use of a python `virtualenv` or a conda env is also recommended.
 1. install JupyterLab and the extensions
 
    ```bash
-   conda install -c conda-forge 'jupyterlab>=4.0.0,<5.0.0a0' jupyterlab-lsp
+   conda install -c conda-forge 'jupyterlab>=4.0.12,<4.1.0a0' jupyterlab-lsp
    # or
-   pip install 'jupyterlab>=4.0.0,<5.0.0a0' jupyterlab-lsp
+   pip install 'jupyterlab>=4.0.12,<4.1.0a0' jupyterlab-lsp
    ```
 
    > Note: `jupyterlab-lsp` provides both the server extension and the lab extension.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -7,7 +7,7 @@ channels:
 dependencies:
   # runtime dependencies
   - python >=3.8,<3.13.0a0
-  - jupyterlab >=4.0.10,<4.1.0a0
+  - jupyterlab >=4.0.12,<4.1.0a0
   - jupyter_server >=1.1.2
   - notebook >=7
   # build dependencies
diff --git a/docs/rtd.yml b/docs/rtd.yml
@@ -7,7 +7,7 @@ channels:
 
 dependencies:
   - importlib_metadata
-  - jupyterlab >=4.0.10,<4.1.0a0
+  - jupyterlab >=4.0.12,<4.1.0a0
   - myst-nb
   - nodejs >=18,!=19,!=21,<23
   - pandas
diff --git a/package.json b/package.json
@@ -19,14 +19,15 @@
     "pyright": "^1.1",
     "source-map-loader": "^4.0.1",
     "sql-language-server": "^1.2.1",
-    "typescript": "~4.9.4",
+    "typescript": "~5.0.3",
     "typescript-language-server": "^0.6.4",
     "unified-language-server": "^0.3.0",
     "vscode-css-languageserver-bin": "^1.4.0",
     "vscode-html-languageserver-bin": "^1.4.0",
     "vscode-json-languageserver-bin": "^1.0.1",
     "vscode-json-languageservice": "^4.1.8",
-    "yaml-language-server": "^1.0.0"
+    "yaml-language-server": "^1.0.0",
+    "yarn-berry-deduplicate": "^6.1.1"
   },
   "husky": {
     "hooks": {}
@@ -39,13 +40,23 @@
   "private": true,
   "resolutions": {
     "prettier": "^2.8.1",
-    "typescript": "~4.9.4",
+    "typescript": "~5.0.3",
     "decode-uri-component": "^0.2.1",
-    "jest": "^29.0.0"
+    "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"
   },
   "scripts": {
     "bootstrap": "jlpm & jlpm deduplicate && jlpm clean && jlpm build && jlpm lint",
-    "deduplicate": "jlpm dedupe --strategy highest",
+    "deduplicate": "yarn-berry-deduplicate --strategy fewer",
     "build": "jlpm build:schema && jlpm build:meta && jlpm build:labextension",
     "build:schema": "lerna run build:schema --stream",
     "build:meta": "lerna run build --stream --scope @jupyter-lsp/jupyterlab-lsp-metapackage",
@@ -59,7 +70,7 @@
     "bundle": "lerna run --parallel bundle",
     "clean": "lerna run --parallel clean",
     "lint:check": "jlpm prettier:check && jlpm eslint:check",
-    "lint": "jlpm prettier && jlpm eslint",
+    "lint": "jlpm deduplicate --fail && jlpm prettier && jlpm eslint",
     "prettier:check": "prettier --check \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md,.yml}\"",
     "prettier": "prettier --list-different --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md,.yml}\"",
     "eslint": "eslint --config packages/.eslintrc.js --ext .js,.jsx,.ts,.tsx --fix packages",
diff --git a/packages/_example-extractor/package.json b/packages/_example-extractor/package.json
@@ -14,11 +14,11 @@
     "@jupyter-lsp/jupyterlab-lsp": "^5.0.0-alpha.0"
   },
   "devDependencies": {
-    "@jupyterlab/application": "^4.0.6",
-    "@jupyterlab/testing": "^4.0.6",
+    "@jupyterlab/application": " ~4.0.12",
+    "@jupyterlab/testing": " ~4.0.12",
     "@types/jest": "^29.5.4",
     "jest": "^29.2.0",
-    "rimraf": "^3.0.0",
+    "rimraf": "^5.0.5",
     "typescript": "~5.0.4"
   },
   "jupyterlab": {
diff --git a/packages/_klingon-integration/package.json b/packages/_klingon-integration/package.json
@@ -11,11 +11,11 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@jupyterlab/application": "^4.0.6"
+    "@jupyterlab/application": " ~4.0.12"
   },
   "devDependencies": {
-    "@jupyterlab/application": "^4.0.6",
-    "@jupyterlab/builder": "^4.0.6",
+    "@jupyterlab/application": " ~4.0.12",
+    "@jupyterlab/builder": " ~4.0.12",
     "typescript": "~5.0.4"
   },
   "jupyterlab": {
diff --git a/packages/code-jumpers/package.json b/packages/code-jumpers/package.json
@@ -29,29 +29,18 @@
     "bundle": "npm pack .",
     "clean": "rimraf lib"
   },
-  "peerDependencies": {
-    "@jupyterlab/apputils": "^4.0.0",
-    "@jupyterlab/codeeditor": "^4.0.0",
-    "@jupyterlab/coreutils": "^6.0.0",
-    "@jupyterlab/docmanager": "^4.0.0",
-    "@jupyterlab/docregistry": "^4.0.0",
-    "@jupyterlab/fileeditor": "^4.0.0",
-    "@jupyterlab/notebook": "^4.0.0",
-    "@jupyterlab/observables": "^5.0.0",
-    "@jupyterlab/translation": "^4.0.0"
-  },
   "devDependencies": {
-    "@jupyterlab/apputils": "^4.1.6",
-    "@jupyterlab/codeeditor": "^4.0.6",
-    "@jupyterlab/coreutils": "^6.0.6",
-    "@jupyterlab/docmanager": "^4.0.6",
-    "@jupyterlab/docregistry": "^4.0.6",
-    "@jupyterlab/fileeditor": "^4.0.6",
-    "@jupyterlab/notebook": "^4.0.6",
-    "@jupyterlab/observables": "^5.0.6",
-    "@jupyterlab/testing": "^4.0.6",
-    "@jupyterlab/translation": "^4.0.6",
-    "rimraf": "^3.0.0",
+    "@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",
+    "rimraf": "^5.0.5",
     "typescript": "~5.0.4"
   },
   "jupyterlab": {
diff --git a/packages/completion-theme/package.json b/packages/completion-theme/package.json
@@ -33,10 +33,10 @@
     "clean": "rimraf lib"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.6",
-    "@jupyterlab/ui-components": "^4.0.6",
+    "@jupyterlab/builder": " ~4.0.12",
+    "@jupyterlab/ui-components": " ~4.0.12",
     "react": "^18.2.0",
-    "rimraf": "^3.0.0",
+    "rimraf": "^5.0.5",
     "typescript": "~5.0.4"
   },
   "jupyterlab": {
diff --git a/packages/jupyterlab-lsp/package.json b/packages/jupyterlab-lsp/package.json
@@ -64,32 +64,33 @@
     "@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.6",
+    "@jupyterlab/lsp": "~4.0.12",
+    "@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.0.6",
-    "@jupyterlab/apputils": "^4.1.6",
-    "@jupyterlab/builder": "^4.0.6",
-    "@jupyterlab/cells": "^4.0.6",
-    "@jupyterlab/codeeditor": "^4.0.6",
-    "@jupyterlab/codemirror": "^4.0.6",
-    "@jupyterlab/completer": "^4.0.6",
-    "@jupyterlab/coreutils": "^6.0.6",
-    "@jupyterlab/docmanager": "^4.0.6",
-    "@jupyterlab/docregistry": "^4.0.6",
-    "@jupyterlab/fileeditor": "^4.0.6",
-    "@jupyterlab/logconsole": "^4.0.6",
-    "@jupyterlab/notebook": "^4.0.6",
-    "@jupyterlab/rendermime": "^4.0.6",
-    "@jupyterlab/services": "^7.0.6",
-    "@jupyterlab/statusbar": "^4.0.6",
-    "@jupyterlab/testing": "^4.0.6",
-    "@jupyterlab/tooltip": "^4.0.6",
-    "@jupyterlab/ui-components": "^4.0.6",
+    "@jupyterlab/application": "~4.0.12",
+    "@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",
     "@lumino/algorithm": "*",
     "@lumino/widgets": "^2.3.0",
     "@types/jest": "^29.5.4",
@@ -100,33 +101,10 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "react": "^18.2.0",
-    "rimraf": "^3.0.0",
+    "rimraf": "^5.0.5",
     "typescript": "~5.0.4",
     "vscode-languageserver-protocol": "^3.17.0"
   },
-  "peerDependencies": {
-    "@codemirror/state": "*",
-    "@codemirror/view": "*",
-    "@jupyterlab/application": "^4.0.0",
-    "@jupyterlab/apputils": "^4.0.0",
-    "@jupyterlab/cells": "^4.0.0",
-    "@jupyterlab/codeeditor": "^4.0.0",
-    "@jupyterlab/codemirror": "^4.0.0",
-    "@jupyterlab/completer": "^3.3.0",
-    "@jupyterlab/coreutils": "^6.0.0",
-    "@jupyterlab/docmanager": "^4.0.0",
-    "@jupyterlab/docregistry": "^4.0.0",
-    "@jupyterlab/fileeditor": "^4.0.0",
-    "@jupyterlab/notebook": "^4.0.0",
-    "@jupyterlab/rendermime": "^4.0.0",
-    "@jupyterlab/services": "^7.0.0",
-    "@jupyterlab/statusbar": "^4.0.0",
-    "@jupyterlab/tooltip": "^4.0.0",
-    "@jupyterlab/ui-components": "^4.0.0",
-    "@lumino/algorithm": "*",
-    "@lumino/widgets": "^2.0.0",
-    "react": "*"
-  },
   "jupyterlab": {
     "extension": true,
     "webpackConfig": "./webpack.config.js",
diff --git a/packages/jupyterlab-lsp/src/virtual/document.ts b/packages/jupyterlab-lsp/src/virtual/document.ts
@@ -36,7 +36,9 @@ export class VirtualDocument extends VirtualDocumentBase {
     );
     // override private `chooseForeignDocument` as a workaround for
     // https://github.com/jupyter-lsp/jupyterlab-lsp/issues/959
-    this['chooseForeignDocument'] = this._chooseForeignDocument;
+    const anyThis = this as any;
+    anyThis._chooseForeignDocument = anyThis.chooseForeignDocument =
+      this.__chooseForeignDocument;
   }
 
   // TODO: this could be moved out
@@ -153,14 +155,13 @@ export class VirtualDocument extends VirtualDocumentBase {
     const usedDocuments = new Set<VirtualDocument>();
     for (const line of this.sourceLines.values()) {
       for (const block of line.foreignDocumentsMap.values()) {
-        usedDocuments.add(block.virtualDocument as VirtualDocument);
+        usedDocuments.add(block.virtualDocument as any as VirtualDocument);
       }
     }
 
     const documentIDs = new Map<VirtualDocument, string[]>();
-    for (const [id, document] of (
-      this.foreignDocuments as Map<string, VirtualDocument>
-    ).entries()) {
+    const vDocs: Map<string, VirtualDocument> = this.foreignDocuments as any;
+    for (const [id, document] of vDocs.entries()) {
       const ids = documentIDs.get(document);
       if (typeof ids !== 'undefined') {
         documentIDs.set(document, [...ids, id]);
@@ -210,7 +211,7 @@ export class VirtualDocument extends VirtualDocumentBase {
   /**
    * Get the foreign document that can be opened with the input extractor.
    */
-  private _chooseForeignDocument(
+  private __chooseForeignDocument(
     extractor: IForeignCodeExtractor
   ): VirtualDocumentBase {
     let foreignDocument: VirtualDocumentBase;
diff --git a/packages/jupyterlab-lsp/webpack.config.js b/packages/jupyterlab-lsp/webpack.config.js
@@ -10,5 +10,10 @@ module.exports = {
         use: ['source-map-loader']
       }
     ]
+  },
+  resolve: {
+    fallback: {
+      util: false
+    }
   }
 };
diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json
@@ -36,7 +36,7 @@
     "@jupyter-lsp/theme-vscode": "workspace:*"
   },
   "devDependencies": {
-    "rimraf": "^3.0.0",
+    "rimraf": "^5.0.5",
     "typescript": "~5.0.4"
   },
   "publishConfig": {
diff --git a/python_packages/jupyterlab_lsp/setup.cfg b/python_packages/jupyterlab_lsp/setup.cfg
@@ -37,4 +37,4 @@ python_requires = >=3.8
 
 install_requires =
     jupyter_lsp >=2.0.0
-    jupyterlab >=4.0.10,<4.1.0a0
+    jupyterlab >=4.0.12,<4.1.0a0
diff --git a/requirements/lab.txt b/requirements/lab.txt
@@ -1,3 +1,3 @@
 # the version of jupyterlab
 -r ./prod.txt
-jupyterlab >=4.0.10,<4.1.0a0
+jupyterlab >=4.0.12,<4.1.0a0
diff --git a/versions.py b/versions.py
@@ -19,7 +19,13 @@
     ['@jupyterlab/application']
     .lstrip('~^')
 )
-JUPYTERLAB_NEXT_MAJOR_VERSION = int(JUPYTERLAB_VERSION.split('.')[0]) + 1
-REQUIRED_JUPYTERLAB = f'>={JUPYTERLAB_VERSION},<{JUPYTERLAB_NEXT_MAJOR_VERSION}.0.0a0'
+JUPYTERLAB_MAJOR_VERSION = int(JUPYTERLAB_VERSION.split('.')[0])
+JUPYTERLAB_NEXT_MAJOR_VERSION = JUPYTERLAB_MAJOR_VERSION + 1
+JUPYTERLAB_MINOR_VERSION = int(JUPYTERLAB_VERSION.split('.')[1])
+JUPYTERLAB_NEXT_MINOR_VERSION = JUPYTERLAB_MINOR_VERSION + 1
+REQUIRED_JUPYTERLAB = (
+    f'>={JUPYTERLAB_VERSION},'
+    f'<{JUPYTERLAB_MAJOR_VERSION}.{JUPYTERLAB_NEXT_MINOR_VERSION}.0a0'
+)
 REQUIRED_JUPYTER_SERVER = '>=1.1.2'
-REQUIRED_PYTHON = '>=3.8,<3.11.0a0'
+REQUIRED_PYTHON = '>=3.8,<3.13.0a0'
diff --git a/yarn.lock b/yarn.lock
