Update to JupyterLite 0.7.0rc0 (#240)

* Update to JupyterLite 0.7.0rc0

* update yarn.lock

* more bumps and import updates

* fix import

* import from lib

* try dynamic import only

* import from lib from other places

Author: jtpio

.github/workflows/test.yml

@@ -196,7 +196,7 @@ jobs:
       - name: Install the extension
         run: |
           set -eux
-          python -m pip install "jupyterlab>=4.5.0rc0,<4.6.0" dist/jupyterlite_pyodide_kernel*.whl
+          python -m pip install "jupyterlab>=4.5.0,<4.6.0" dist/jupyterlite_pyodide_kernel*.whl
 
       - name: Install dependencies
         working-directory: ui-tests

packages/pyodide-kernel-extension/package.json

@@ -47,16 +47,15 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.5.0-rc.0",
-    "@jupyterlab/coreutils": "^6.5.0-rc.0",
-    "@jupyterlab/logconsole": "^4.5.0-rc.0",
-    "@jupyterlite/contents": "^0.7.0-beta.1",
-    "@jupyterlite/kernel": "^0.7.0-beta.1",
+    "@jupyterlab/application": "^4.5.0",
+    "@jupyterlab/coreutils": "^6.5.0",
+    "@jupyterlab/logconsole": "^4.5.0",
+    "@jupyterlite/apputils": "^0.7.0-rc.0",
     "@jupyterlite/pyodide-kernel": "^0.7.0-beta.0",
-    "@jupyterlite/server": "^0.7.0-beta.1"
+    "@jupyterlite/services": "^0.7.0-rc.0"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.5.0-rc.0",
+    "@jupyterlab/builder": "^4.5.0",
     "rimraf": "^6.0.1",
     "typescript": "~5.2.2"
   },
@@ -68,15 +67,7 @@
     "outputDir": "../../jupyterlite_pyodide_kernel/labextension",
     "webpackConfig": "webpack.config.js",
     "sharedPackages": {
-      "@jupyterlite/kernel": {
-        "bundled": false,
-        "singleton": true
-      },
-      "@jupyterlite/server": {
-        "bundled": false,
-        "singleton": true
-      },
-      "@jupyterlite/contents": {
+      "@jupyterlite/services": {
         "bundled": false,
         "singleton": true
       }

packages/pyodide-kernel-extension/src/index.ts

@@ -7,9 +7,9 @@ import { PageConfig, URLExt } from '@jupyterlab/coreutils';
 
 import { ILoggerRegistry, ILogPayload } from '@jupyterlab/logconsole';
 
-import { IServiceWorkerManager } from '@jupyterlite/server';
+import { IServiceWorkerManager } from '@jupyterlite/apputils';
 
-import { IKernel, IKernelSpecs } from '@jupyterlite/kernel';
+import { IKernel, IKernelSpecs } from '@jupyterlite/services';
 
 import KERNEL_ICON_SVG_STR from '../style/img/pyodide.svg';
 

packages/pyodide-kernel/package.json

@@ -50,10 +50,9 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/coreutils": "^6.5.0-beta.1",
-    "@jupyterlab/logconsole": "^4.5.0-beta.1",
-    "@jupyterlite/contents": "^0.7.0-beta.1",
-    "@jupyterlite/kernel": "^0.7.0-beta.1",
+    "@jupyterlab/coreutils": "^6.5.0",
+    "@jupyterlab/logconsole": "^4.5.0",
+    "@jupyterlite/services": "^0.7.0-rc.0",
     "coincident": "^1.2.3",
     "comlink": "^4.4.2"
   },

packages/pyodide-kernel/src/coincident.worker.ts

@@ -12,7 +12,7 @@ import {
   TDriveMethod,
   TDriveRequest,
   TDriveResponse,
-} from '@jupyterlite/contents';
+} from '@jupyterlite/services/lib/contents/drivefs';
 
 import { ICoincidentPyodideWorkerKernel, IPyodideWorkerKernel } from './tokens';
 

packages/pyodide-kernel/src/comlink.worker.ts

@@ -11,7 +11,7 @@ import { URLExt } from '@jupyterlab/coreutils';
 
 import { KernelMessage } from '@jupyterlab/services';
 
-import { DriveFS } from '@jupyterlite/contents';
+import { DriveFS } from '@jupyterlite/services/lib/contents/drivefs';
 
 import { IPyodideWorkerKernel } from './tokens';
 

packages/pyodide-kernel/src/kernel.ts

@@ -10,7 +10,7 @@ import type { ILogPayload } from '@jupyterlab/logconsole';
 
 import { Contents, KernelMessage } from '@jupyterlab/services';
 
-import { BaseKernel, IKernel } from '@jupyterlite/kernel';
+import { BaseKernel, IKernel } from '@jupyterlite/services';
 
 import type {
   ICoincidentPyodideWorkerKernel,
@@ -25,7 +25,7 @@ import {
   DriveContentsProcessor,
   TDriveMethod,
   TDriveRequest,
-} from '@jupyterlite/contents';
+} from '@jupyterlite/services';
 
 /**
  * A kernel that executes Python code with Pyodide.

packages/pyodide-kernel/src/tokens.ts

@@ -5,8 +5,12 @@
  * Definitions for the Pyodide kernel.
  */
 
-import { TDriveMethod, TDriveRequest, TDriveResponse } from '@jupyterlite/contents';
-import { IWorkerKernel } from '@jupyterlite/kernel';
+import {
+  TDriveMethod,
+  TDriveRequest,
+  TDriveResponse,
+  IWorkerKernel,
+} from '@jupyterlite/services';
 
 /**
  * The schema for a Warehouse-like index, as used by piplite.

packages/pyodide-kernel/src/worker.ts

@@ -7,7 +7,7 @@ import type { ILogPayload } from '@jupyterlab/logconsole';
 
 import { KernelMessage } from '@jupyterlab/services';
 
-import type { DriveFS } from '@jupyterlite/contents';
+import type { DriveFS } from '@jupyterlite/services/lib/contents/drivefs';
 
 import type { IPyodideWorkerKernel } from './tokens';
 
@@ -169,7 +169,8 @@ ${e.stack}`;
       const mountpoint = '/drive';
       const { FS, PATH, ERRNO_CODES } = this._pyodide;
       const { baseUrl } = options;
-      const { DriveFS } = await import('@jupyterlite/contents');
+      // Use direct submodule import for tree-shaking
+      const { DriveFS } = await import('@jupyterlite/services/lib/contents/drivefs');
 
       const driveFS = new DriveFS({
         FS: FS as any,

pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
     "hatchling >=1.4.0",
-    "jupyterlab >=4.5.0rc0,<4.6.0",
+    "jupyterlab >=4.5.0,<4.6.0",
 ]
 build-backend = "hatchling.build"
 
@@ -37,7 +37,7 @@ classifiers = [
     "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-    "jupyterlite-core >=0.7.0b1,<0.8.0",
+    "jupyterlite-core >=0.7.0rc0,<0.8.0",
     "pkginfo"
 ]
 
@@ -59,7 +59,7 @@ jupyterlite-pyodide-kernel-pyodide = "jupyterlite_pyodide_kernel.addons.pyodide:
 dev = [
     "build",
     "hatch",
-    "jupyterlab >=4.5.0rc0,<4.6.0",
+    "jupyterlab >=4.5.0,<4.6.0",
 ]
 
 lint = [
@@ -118,11 +118,11 @@ version_cmd = "python scripts/bump-version.py"
 
 [tool.jupyter-releaser.hooks]
 before-bump-version = [
-    "python -m pip install 'jupyterlab~=4.5.0rc0'",
+    "python -m pip install 'jupyterlab~=4.5.0'",
     "jlpm"
 ]
 before-build-npm = [
-    "python -m pip install 'jupyterlab~=4.5.0rc0' hatch",
+    "python -m pip install 'jupyterlab~=4.5.0' hatch",
     "python -m pip install -e .[dev]",
     "jlpm",
     "jlpm build:prod",