Skip to content

Commit f0e7469

Browse files
jtpiojtpio
authored
Update to JupyterLab 4.6.0a0 (#7787)
* Update to JupyterLab 4.6.0a0 * switch to rspack * update snapshots
1 parent 09f0f85 commit f0e7469

File tree

27 files changed

+3174
-2410
lines changed

27 files changed

+3174
-2410
lines changed

‎.github/workflows/buildutils.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- name: Install dependencies
3131
run: |
32-
python -m pip install -U "jupyterlab>=4.5.1,<4.6" hatch
32+
python -m pip install -U "jupyterlab>=4.6.0a0,<4.7" hatch
3333
jlpm
3434
jlpm run build
3535
@@ -79,6 +79,6 @@ jobs:
7979

8080
- name: Install dependencies
8181
run: |
82-
python -m pip install -U "jupyterlab>=4.5.1,<4.6" pip
82+
python -m pip install -U "jupyterlab>=4.6.0a0,<4.7" pip
8383
jlpm
8484
jlpm run build

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ repos:
4545
files: "^notebook"
4646
stages: [manual]
4747
args: ["--install-types", "--non-interactive"]
48-
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.5.1,<4.6"]
48+
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.6.0a0,<4.7"]
4949

5050
- repo: https://github.com/pre-commit/pygrep-hooks
5151
rev: 'v1.10.0'

‎app/package.json‎

Lines changed: 58 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"version": "7.5.1",
44
"private": true,
55
"scripts": {
6-
"build": "webpack",
7-
"build:prod": "webpack --config ./webpack.prod.config.js",
6+
"build": "rspack",
7+
"build:prod": "rspack --config ./rspack.prod.config.js",
88
"clean": "rimraf build && jlpm run clean:static",
99
"clean:static": "rimraf -g \"../notebook/static/!(favicons)\"",
10-
"watch": "webpack --config ./webpack.config.watch.js"
10+
"watch": "rspack --watch --config rspack.config.js"
1111
},
1212
"resolutions": {
1313
"@codemirror/state": "~6.5.2",
@@ -138,79 +138,73 @@
138138
"@jupyter-notebook/tree": "^7.5.1",
139139
"@jupyter-notebook/tree-extension": "^7.5.1",
140140
"@jupyter-notebook/ui-components": "^7.5.1",
141-
"@jupyterlab/application-extension": "~4.5.1",
142-
"@jupyterlab/apputils-extension": "~4.5.1",
143-
"@jupyterlab/attachments": "~4.5.1",
144-
"@jupyterlab/audio-extension": "~4.5.1",
145-
"@jupyterlab/cell-toolbar-extension": "~4.5.1",
146-
"@jupyterlab/celltags-extension": "~4.5.1",
147-
"@jupyterlab/codemirror": "~4.5.1",
148-
"@jupyterlab/codemirror-extension": "~4.5.1",
149-
"@jupyterlab/completer-extension": "~4.5.1",
150-
"@jupyterlab/console-extension": "~4.5.1",
151-
"@jupyterlab/coreutils": "~6.5.1",
152-
"@jupyterlab/csvviewer-extension": "~4.5.1",
153-
"@jupyterlab/debugger-extension": "~4.5.1",
154-
"@jupyterlab/docmanager-extension": "~4.5.1",
155-
"@jupyterlab/documentsearch-extension": "~4.5.1",
156-
"@jupyterlab/extensionmanager-extension": "~4.5.1",
157-
"@jupyterlab/filebrowser-extension": "~4.5.1",
158-
"@jupyterlab/fileeditor-extension": "~4.5.1",
159-
"@jupyterlab/help-extension": "~4.5.1",
160-
"@jupyterlab/htmlviewer-extension": "~4.5.1",
161-
"@jupyterlab/hub-extension": "~4.5.1",
162-
"@jupyterlab/imageviewer-extension": "~4.5.1",
163-
"@jupyterlab/javascript-extension": "~4.5.1",
164-
"@jupyterlab/json-extension": "~4.5.1",
165-
"@jupyterlab/logconsole-extension": "~4.5.1",
166-
"@jupyterlab/lsp": "~4.5.1",
167-
"@jupyterlab/lsp-extension": "~4.5.1",
168-
"@jupyterlab/mainmenu-extension": "~4.5.1",
169-
"@jupyterlab/markdownviewer-extension": "~4.5.1",
170-
"@jupyterlab/markedparser-extension": "~4.5.1",
171-
"@jupyterlab/mathjax-extension": "~4.5.1",
172-
"@jupyterlab/mermaid-extension": "~4.5.1",
173-
"@jupyterlab/metadataform-extension": "~4.5.1",
174-
"@jupyterlab/notebook-extension": "~4.5.1",
175-
"@jupyterlab/pdf-extension": "~4.5.1",
176-
"@jupyterlab/pluginmanager-extension": "~4.5.1",
177-
"@jupyterlab/running-extension": "~4.5.1",
178-
"@jupyterlab/services-extension": "~4.5.1",
179-
"@jupyterlab/settingeditor": "~4.5.1",
180-
"@jupyterlab/settingeditor-extension": "~4.5.1",
181-
"@jupyterlab/shortcuts-extension": "~5.3.1",
182-
"@jupyterlab/terminal-extension": "~4.5.1",
183-
"@jupyterlab/theme-dark-extension": "~4.5.1",
184-
"@jupyterlab/theme-dark-high-contrast-extension": "~4.5.1",
185-
"@jupyterlab/theme-light-extension": "~4.5.1",
186-
"@jupyterlab/toc-extension": "~6.5.1",
187-
"@jupyterlab/tooltip-extension": "~4.5.1",
188-
"@jupyterlab/translation-extension": "~4.5.1",
189-
"@jupyterlab/ui-components-extension": "~4.5.1",
190-
"@jupyterlab/vega5-extension": "~4.5.1",
191-
"@jupyterlab/video-extension": "~4.5.1",
141+
"@jupyterlab/application-extension": "~4.6.0-alpha.0",
142+
"@jupyterlab/apputils-extension": "~4.6.0-alpha.0",
143+
"@jupyterlab/attachments": "~4.6.0-alpha.0",
144+
"@jupyterlab/audio-extension": "~4.6.0-alpha.0",
145+
"@jupyterlab/cell-toolbar-extension": "~4.6.0-alpha.0",
146+
"@jupyterlab/celltags-extension": "~4.6.0-alpha.0",
147+
"@jupyterlab/codemirror": "~4.6.0-alpha.0",
148+
"@jupyterlab/codemirror-extension": "~4.6.0-alpha.0",
149+
"@jupyterlab/completer-extension": "~4.6.0-alpha.0",
150+
"@jupyterlab/console-extension": "~4.6.0-alpha.0",
151+
"@jupyterlab/coreutils": "~6.6.0-alpha.0",
152+
"@jupyterlab/csvviewer-extension": "~4.6.0-alpha.0",
153+
"@jupyterlab/debugger-extension": "~4.6.0-alpha.0",
154+
"@jupyterlab/docmanager-extension": "~4.6.0-alpha.0",
155+
"@jupyterlab/documentsearch-extension": "~4.6.0-alpha.0",
156+
"@jupyterlab/extensionmanager-extension": "~4.6.0-alpha.0",
157+
"@jupyterlab/filebrowser-extension": "~4.6.0-alpha.0",
158+
"@jupyterlab/fileeditor-extension": "~4.6.0-alpha.0",
159+
"@jupyterlab/help-extension": "~4.6.0-alpha.0",
160+
"@jupyterlab/htmlviewer-extension": "~4.6.0-alpha.0",
161+
"@jupyterlab/hub-extension": "~4.6.0-alpha.0",
162+
"@jupyterlab/imageviewer-extension": "~4.6.0-alpha.0",
163+
"@jupyterlab/javascript-extension": "~4.6.0-alpha.0",
164+
"@jupyterlab/json-extension": "~4.6.0-alpha.0",
165+
"@jupyterlab/logconsole-extension": "~4.6.0-alpha.0",
166+
"@jupyterlab/lsp": "~4.6.0-alpha.0",
167+
"@jupyterlab/lsp-extension": "~4.6.0-alpha.0",
168+
"@jupyterlab/mainmenu-extension": "~4.6.0-alpha.0",
169+
"@jupyterlab/markdownviewer-extension": "~4.6.0-alpha.0",
170+
"@jupyterlab/markedparser-extension": "~4.6.0-alpha.0",
171+
"@jupyterlab/mathjax-extension": "~4.6.0-alpha.0",
172+
"@jupyterlab/mermaid-extension": "~4.6.0-alpha.0",
173+
"@jupyterlab/metadataform-extension": "~4.6.0-alpha.0",
174+
"@jupyterlab/notebook-extension": "~4.6.0-alpha.0",
175+
"@jupyterlab/pdf-extension": "~4.6.0-alpha.0",
176+
"@jupyterlab/pluginmanager-extension": "~4.6.0-alpha.0",
177+
"@jupyterlab/running-extension": "~4.6.0-alpha.0",
178+
"@jupyterlab/services-extension": "~4.6.0-alpha.0",
179+
"@jupyterlab/settingeditor": "~4.6.0-alpha.0",
180+
"@jupyterlab/settingeditor-extension": "~4.6.0-alpha.0",
181+
"@jupyterlab/shortcuts-extension": "~5.4.0-alpha.0",
182+
"@jupyterlab/terminal-extension": "~4.6.0-alpha.0",
183+
"@jupyterlab/theme-dark-extension": "~4.6.0-alpha.0",
184+
"@jupyterlab/theme-dark-high-contrast-extension": "~4.6.0-alpha.0",
185+
"@jupyterlab/theme-light-extension": "~4.6.0-alpha.0",
186+
"@jupyterlab/toc-extension": "~6.6.0-alpha.0",
187+
"@jupyterlab/tooltip-extension": "~4.6.0-alpha.0",
188+
"@jupyterlab/translation-extension": "~4.6.0-alpha.0",
189+
"@jupyterlab/ui-components-extension": "~4.6.0-alpha.0",
190+
"@jupyterlab/vega5-extension": "~4.6.0-alpha.0",
191+
"@jupyterlab/video-extension": "~4.6.0-alpha.0",
192192
"@lumino/coreutils": "~2.2.2",
193193
"react": "^18.2.0",
194194
"react-dom": "^18.2.0",
195195
"yjs": "^13.5.40"
196196
},
197197
"devDependencies": {
198-
"@jupyterlab/builder": "~4.5.1",
199-
"@jupyterlab/buildutils": "~4.5.1",
198+
"@jupyterlab/builder": "~4.6.0-alpha.0",
199+
"@jupyterlab/buildutils": "~4.6.0-alpha.0",
200+
"@rspack/cli": "^1.1.8",
201+
"@rspack/core": "^1.1.8",
200202
"@types/rimraf": "^3.0.2",
201-
"css-loader": "~5.0.1",
202-
"extra-watch-webpack-plugin": "^1.0.3",
203203
"fs-extra": "^8.1.0",
204204
"glob": "~7.1.6",
205205
"handlebars": "^4.7.7",
206-
"mini-css-extract-plugin": "~0.9.0",
207206
"rimraf": "^3.0.2",
208-
"style-loader": "~1.0.1",
209-
"svg-url-loader": "~6.0.0",
210-
"watch": "~1.0.2",
211-
"webpack": "^5.76.1",
212207
"webpack-bundle-analyzer": "^4.8.0",
213-
"webpack-cli": "^5.0.1",
214208
"webpack-merge": "^5.8.0",
215209
"whatwg-fetch": "^3.0.0"
216210
},

app/webpack.config.js renamed to app/rspack.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// Distributed under the terms of the Modified BSD License.
33

44
// Heavily inspired (and slightly tweaked) from:
5-
// https://github.com/jupyterlab/jupyterlab/blob/master/examples/federated/core_package/webpack.config.js
5+
// https://github.com/jupyterlab/jupyterlab/blob/master/examples/federated/core_package/rspack.config.js
66

77
const fs = require('fs-extra');
88
const path = require('path');
9-
const webpack = require('webpack');
9+
const rspack = require('@rspack/core');
1010
const merge = require('webpack-merge').default;
1111
const Handlebars = require('handlebars');
12-
const { ModuleFederationPlugin } = webpack.container;
12+
const { ModuleFederationPlugin } = rspack.container;
1313
const BundleAnalyzerPlugin =
1414
require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
1515

@@ -94,7 +94,7 @@ const extras = Build.ensureAssets({
9494
});
9595

9696
/**
97-
* Create the webpack ``shared`` configuration
97+
* Create the rspack ``shared`` configuration
9898
*/
9999
function createShared(packageData) {
100100
// Set up module federation sharing config

‎app/rspack.config.watch.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* Copyright (c) Jupyter Development Team.
3+
* Distributed under the terms of the Modified BSD License.
4+
*/
5+
6+
const base = require('./rspack.config');
7+
8+
module.exports = [
9+
{
10+
...base[0],
11+
bail: false,
12+
watch: true,
13+
},
14+
...base.slice(1),
15+
];

app/webpack.prod.config.js renamed to app/rspack.prod.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
const merge = require('webpack-merge').default;
7-
const config = require('./webpack.config');
7+
const config = require('./rspack.config');
88
const WPPlugin = require('@jupyterlab/builder').WPPlugin;
99

1010
config[0] = merge(config[0], {

‎app/webpack.config.watch.js‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎buildutils/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"watch": "tsc -w --listEmittedFiles"
3030
},
3131
"dependencies": {
32-
"@jupyterlab/buildutils": "~4.5.1",
32+
"@jupyterlab/buildutils": "~4.6.0-alpha.0",
3333
"commander": "^6.2.0",
3434
"fs-extra": "^9.1.0",
3535
"semver": "^7.6.3",

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"yjs": "^13.5.40"
5252
},
5353
"devDependencies": {
54-
"@jupyterlab/buildutils": "~4.5.1",
54+
"@jupyterlab/buildutils": "~4.6.0-alpha.0",
5555
"@typescript-eslint/eslint-plugin": "^5.55.0",
5656
"@typescript-eslint/parser": "^5.55.0",
5757
"eslint": "^8.36.0",

‎packages/application-extension/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@
4040
"dependencies": {
4141
"@jupyter-notebook/application": "^7.5.1",
4242
"@jupyter-notebook/ui-components": "^7.5.1",
43-
"@jupyterlab/application": "~4.5.1",
44-
"@jupyterlab/apputils": "~4.6.1",
45-
"@jupyterlab/codeeditor": "~4.5.1",
46-
"@jupyterlab/console": "~4.5.1",
47-
"@jupyterlab/coreutils": "~6.5.1",
48-
"@jupyterlab/docmanager": "~4.5.1",
49-
"@jupyterlab/docregistry": "~4.5.1",
50-
"@jupyterlab/mainmenu": "~4.5.1",
51-
"@jupyterlab/rendermime": "~4.5.1",
52-
"@jupyterlab/settingregistry": "~4.5.1",
53-
"@jupyterlab/translation": "~4.5.1",
43+
"@jupyterlab/application": "~4.6.0-alpha.0",
44+
"@jupyterlab/apputils": "~4.7.0-alpha.0",
45+
"@jupyterlab/codeeditor": "~4.6.0-alpha.0",
46+
"@jupyterlab/console": "~4.6.0-alpha.0",
47+
"@jupyterlab/coreutils": "~6.6.0-alpha.0",
48+
"@jupyterlab/docmanager": "~4.6.0-alpha.0",
49+
"@jupyterlab/docregistry": "~4.6.0-alpha.0",
50+
"@jupyterlab/mainmenu": "~4.6.0-alpha.0",
51+
"@jupyterlab/rendermime": "~4.6.0-alpha.0",
52+
"@jupyterlab/settingregistry": "~4.6.0-alpha.0",
53+
"@jupyterlab/translation": "~4.6.0-alpha.0",
5454
"@lumino/coreutils": "^2.2.2",
5555
"@lumino/disposable": "^2.1.5",
5656
"@lumino/widgets": "^2.7.2"

0 commit comments

Comments
 (0)