Merge pull request #419 from trungleduc/lab4

Add JupyterLab 4 support for the extension

Author: consideRatio

.github/workflows/test.yaml

@@ -31,13 +31,20 @@ jobs:
       matrix:
         python-version: ["3.8", "3.11"]
         jupyter_server-version: ["1", "2"]
-        jupyterlab-version: ["3"]
+        jupyterlab-version: ["3", "4"]
         os: [ubuntu-22.04]
         include:
           - python-version: "3.11"
             jupyter_server-version: "2"
             jupyterlab-version: "3"
             os: windows-2022
+          - python-version: "3.11"
+            jupyter_server-version: "2"
+            jupyterlab-version: "4"
+            os: windows-2022
+        exclude:
+          - jupyter_server-version: "1"
+            jupyterlab-version: "4"
 
     runs-on: ${{ matrix.os }}
     defaults:

.gitignore

@@ -148,3 +148,4 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+labextension/.yarn/

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Welcome! As a [Jupyter](https://jupyter.org) project, we follow the [Jupyter contributor guide](https://jupyter.readthedocs.io/en/latest/contributor/content-contributor.html).
 
-To setup a local development environment and ru tests, see the small section in
+To setup a local development environment and run tests, see the small section in
 the README.md file.
 
 ## Local development setup

labextension/.yarnrc

@@ -1,3 +1,8 @@
+# jlpm in JupyterLab 2 and 3 is yarn 1, and this is a yarn 1 compatible
+# configuration file.
+#
+# Config reference: https://classic.yarnpkg.com/lang/en/docs/yarnrc/
+#
 disable-self-update-check true
 ignore-optional true
 network-timeout "300000"

labextension/.yarnrc.yml

@@ -0,0 +1,8 @@
+# jlpm in JupyterLab 4 is yarn 3, and this is a yarn 2+ compatible configuration
+# file.
+#
+# Config reference: https://yarnpkg.com/configuration/yarnrc
+#
+nodeLinker: node-modules
+httpTimeout: 300000
+npmRegistryServer: "https://registry.npmjs.org/"

labextension/README.md

@@ -7,11 +7,11 @@ configured server processes managed by the python package `jupyter-server-proxy`
 
 ## Prerequisites
 
-- JupyterLab >=2,<4
+- JupyterLab >=2,<5
 
 ## Installation
 
-For JupyterLab 3, use your preferred Python package manager to install `jupyter-server-proxy`:
+For JupyterLab 3+, use your preferred Python package manager to install `jupyter-server-proxy`:
 
 ```bash
 pip install jupyter-server-proxy
@@ -40,4 +40,4 @@ jupyter labextension install @jupyterhub/jupyter-server-proxy
 > - a download of a great deal of build assets from `npmjs.org`
 > - a large `webpack` build that may exhaust memory and open files handles
 >
-> **Please** consider upgrading to JupyterLab 3 before reporting issues.
+> **Please** consider upgrading to JupyterLab 3+ before reporting issues.

labextension/package.json

@@ -43,18 +43,15 @@
     "deduplicate": "yarn-deduplicate -s fewer --fail"
   },
   "dependencies": {
-    "@jupyterlab/application": "^2.0 || ^3.0",
-    "@jupyterlab/launcher": "^2.0 || ^3.0"
-  },
-  "resolutions": {
-    "loader-utils": ">=2.0.3"
+    "@jupyterlab/application": "^2.0 || ^3.0 || ^4.0",
+    "@jupyterlab/launcher": "^2.0 || ^3.0 || ^4.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^3.2.4",
+    "@jupyterlab/builder": "^3.2.4 || ^4.0.0",
+    "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
     "typescript": "~4.8.4",
-    "yarn-deduplicate": "^6.0.0",
-    "npm-run-all": "^4.1.5"
+    "yarn-deduplicate": "^6.0.0"
   },
   "jupyterlab": {
     "extension": true,