Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/buildutils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.5.1,<4.6" hatch
python -m pip install -U "jupyterlab>=4.6.0a0,<4.7" hatch
jlpm
jlpm run build

Expand Down Expand Up @@ -79,6 +79,6 @@ jobs:

- name: Install dependencies
run: |
python -m pip install -U "jupyterlab>=4.5.1,<4.6" pip
python -m pip install -U "jupyterlab>=4.6.0a0,<4.7" pip
jlpm
jlpm run build
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ repos:
files: "^notebook"
stages: [manual]
args: ["--install-types", "--non-interactive"]
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.5.1,<4.6"]
additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.6.0a0,<4.7"]

- repo: https://github.com/pre-commit/pygrep-hooks
rev: 'v1.10.0'
Expand Down
122 changes: 58 additions & 64 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"version": "7.5.1",
"private": true,
"scripts": {
"build": "webpack",
"build:prod": "webpack --config ./webpack.prod.config.js",
"build": "rspack",
"build:prod": "rspack --config ./rspack.prod.config.js",
"clean": "rimraf build && jlpm run clean:static",
"clean:static": "rimraf -g \"../notebook/static/!(favicons)\"",
"watch": "webpack --config ./webpack.config.watch.js"
"watch": "rspack --watch --config rspack.config.js"
},
"resolutions": {
"@codemirror/state": "~6.5.2",
Expand Down Expand Up @@ -138,79 +138,73 @@
"@jupyter-notebook/tree": "^7.5.1",
"@jupyter-notebook/tree-extension": "^7.5.1",
"@jupyter-notebook/ui-components": "^7.5.1",
"@jupyterlab/application-extension": "~4.5.1",
"@jupyterlab/apputils-extension": "~4.5.1",
"@jupyterlab/attachments": "~4.5.1",
"@jupyterlab/audio-extension": "~4.5.1",
"@jupyterlab/cell-toolbar-extension": "~4.5.1",
"@jupyterlab/celltags-extension": "~4.5.1",
"@jupyterlab/codemirror": "~4.5.1",
"@jupyterlab/codemirror-extension": "~4.5.1",
"@jupyterlab/completer-extension": "~4.5.1",
"@jupyterlab/console-extension": "~4.5.1",
"@jupyterlab/coreutils": "~6.5.1",
"@jupyterlab/csvviewer-extension": "~4.5.1",
"@jupyterlab/debugger-extension": "~4.5.1",
"@jupyterlab/docmanager-extension": "~4.5.1",
"@jupyterlab/documentsearch-extension": "~4.5.1",
"@jupyterlab/extensionmanager-extension": "~4.5.1",
"@jupyterlab/filebrowser-extension": "~4.5.1",
"@jupyterlab/fileeditor-extension": "~4.5.1",
"@jupyterlab/help-extension": "~4.5.1",
"@jupyterlab/htmlviewer-extension": "~4.5.1",
"@jupyterlab/hub-extension": "~4.5.1",
"@jupyterlab/imageviewer-extension": "~4.5.1",
"@jupyterlab/javascript-extension": "~4.5.1",
"@jupyterlab/json-extension": "~4.5.1",
"@jupyterlab/logconsole-extension": "~4.5.1",
"@jupyterlab/lsp": "~4.5.1",
"@jupyterlab/lsp-extension": "~4.5.1",
"@jupyterlab/mainmenu-extension": "~4.5.1",
"@jupyterlab/markdownviewer-extension": "~4.5.1",
"@jupyterlab/markedparser-extension": "~4.5.1",
"@jupyterlab/mathjax-extension": "~4.5.1",
"@jupyterlab/mermaid-extension": "~4.5.1",
"@jupyterlab/metadataform-extension": "~4.5.1",
"@jupyterlab/notebook-extension": "~4.5.1",
"@jupyterlab/pdf-extension": "~4.5.1",
"@jupyterlab/pluginmanager-extension": "~4.5.1",
"@jupyterlab/running-extension": "~4.5.1",
"@jupyterlab/services-extension": "~4.5.1",
"@jupyterlab/settingeditor": "~4.5.1",
"@jupyterlab/settingeditor-extension": "~4.5.1",
"@jupyterlab/shortcuts-extension": "~5.3.1",
"@jupyterlab/terminal-extension": "~4.5.1",
"@jupyterlab/theme-dark-extension": "~4.5.1",
"@jupyterlab/theme-dark-high-contrast-extension": "~4.5.1",
"@jupyterlab/theme-light-extension": "~4.5.1",
"@jupyterlab/toc-extension": "~6.5.1",
"@jupyterlab/tooltip-extension": "~4.5.1",
"@jupyterlab/translation-extension": "~4.5.1",
"@jupyterlab/ui-components-extension": "~4.5.1",
"@jupyterlab/vega5-extension": "~4.5.1",
"@jupyterlab/video-extension": "~4.5.1",
"@jupyterlab/application-extension": "~4.6.0-alpha.0",
"@jupyterlab/apputils-extension": "~4.6.0-alpha.0",
"@jupyterlab/attachments": "~4.6.0-alpha.0",
"@jupyterlab/audio-extension": "~4.6.0-alpha.0",
"@jupyterlab/cell-toolbar-extension": "~4.6.0-alpha.0",
"@jupyterlab/celltags-extension": "~4.6.0-alpha.0",
"@jupyterlab/codemirror": "~4.6.0-alpha.0",
"@jupyterlab/codemirror-extension": "~4.6.0-alpha.0",
"@jupyterlab/completer-extension": "~4.6.0-alpha.0",
"@jupyterlab/console-extension": "~4.6.0-alpha.0",
"@jupyterlab/coreutils": "~6.6.0-alpha.0",
"@jupyterlab/csvviewer-extension": "~4.6.0-alpha.0",
"@jupyterlab/debugger-extension": "~4.6.0-alpha.0",
"@jupyterlab/docmanager-extension": "~4.6.0-alpha.0",
"@jupyterlab/documentsearch-extension": "~4.6.0-alpha.0",
"@jupyterlab/extensionmanager-extension": "~4.6.0-alpha.0",
"@jupyterlab/filebrowser-extension": "~4.6.0-alpha.0",
"@jupyterlab/fileeditor-extension": "~4.6.0-alpha.0",
"@jupyterlab/help-extension": "~4.6.0-alpha.0",
"@jupyterlab/htmlviewer-extension": "~4.6.0-alpha.0",
"@jupyterlab/hub-extension": "~4.6.0-alpha.0",
"@jupyterlab/imageviewer-extension": "~4.6.0-alpha.0",
"@jupyterlab/javascript-extension": "~4.6.0-alpha.0",
"@jupyterlab/json-extension": "~4.6.0-alpha.0",
"@jupyterlab/logconsole-extension": "~4.6.0-alpha.0",
"@jupyterlab/lsp": "~4.6.0-alpha.0",
"@jupyterlab/lsp-extension": "~4.6.0-alpha.0",
"@jupyterlab/mainmenu-extension": "~4.6.0-alpha.0",
"@jupyterlab/markdownviewer-extension": "~4.6.0-alpha.0",
"@jupyterlab/markedparser-extension": "~4.6.0-alpha.0",
"@jupyterlab/mathjax-extension": "~4.6.0-alpha.0",
"@jupyterlab/mermaid-extension": "~4.6.0-alpha.0",
"@jupyterlab/metadataform-extension": "~4.6.0-alpha.0",
"@jupyterlab/notebook-extension": "~4.6.0-alpha.0",
"@jupyterlab/pdf-extension": "~4.6.0-alpha.0",
"@jupyterlab/pluginmanager-extension": "~4.6.0-alpha.0",
"@jupyterlab/running-extension": "~4.6.0-alpha.0",
"@jupyterlab/services-extension": "~4.6.0-alpha.0",
"@jupyterlab/settingeditor": "~4.6.0-alpha.0",
"@jupyterlab/settingeditor-extension": "~4.6.0-alpha.0",
"@jupyterlab/shortcuts-extension": "~5.4.0-alpha.0",
"@jupyterlab/terminal-extension": "~4.6.0-alpha.0",
"@jupyterlab/theme-dark-extension": "~4.6.0-alpha.0",
"@jupyterlab/theme-dark-high-contrast-extension": "~4.6.0-alpha.0",
"@jupyterlab/theme-light-extension": "~4.6.0-alpha.0",
"@jupyterlab/toc-extension": "~6.6.0-alpha.0",
"@jupyterlab/tooltip-extension": "~4.6.0-alpha.0",
"@jupyterlab/translation-extension": "~4.6.0-alpha.0",
"@jupyterlab/ui-components-extension": "~4.6.0-alpha.0",
"@jupyterlab/vega5-extension": "~4.6.0-alpha.0",
"@jupyterlab/video-extension": "~4.6.0-alpha.0",
"@lumino/coreutils": "~2.2.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/builder": "~4.5.1",
"@jupyterlab/buildutils": "~4.5.1",
"@jupyterlab/builder": "~4.6.0-alpha.0",
"@jupyterlab/buildutils": "~4.6.0-alpha.0",
"@rspack/cli": "^1.1.8",
"@rspack/core": "^1.1.8",
"@types/rimraf": "^3.0.2",
"css-loader": "~5.0.1",
"extra-watch-webpack-plugin": "^1.0.3",
"fs-extra": "^8.1.0",
"glob": "~7.1.6",
"handlebars": "^4.7.7",
"mini-css-extract-plugin": "~0.9.0",
"rimraf": "^3.0.2",
"style-loader": "~1.0.1",
"svg-url-loader": "~6.0.0",
"watch": "~1.0.2",
"webpack": "^5.76.1",
"webpack-bundle-analyzer": "^4.8.0",
"webpack-cli": "^5.0.1",
"webpack-merge": "^5.8.0",
"whatwg-fetch": "^3.0.0"
},
Expand Down
8 changes: 4 additions & 4 deletions app/webpack.config.js → app/rspack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// Distributed under the terms of the Modified BSD License.

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

const fs = require('fs-extra');
const path = require('path');
const webpack = require('webpack');
const rspack = require('@rspack/core');
const merge = require('webpack-merge').default;
const Handlebars = require('handlebars');
const { ModuleFederationPlugin } = webpack.container;
const { ModuleFederationPlugin } = rspack.container;
const BundleAnalyzerPlugin =
require('webpack-bundle-analyzer').BundleAnalyzerPlugin;

Expand Down Expand Up @@ -94,7 +94,7 @@ const extras = Build.ensureAssets({
});

/**
* Create the webpack ``shared`` configuration
* Create the rspack ``shared`` configuration
*/
function createShared(packageData) {
// Set up module federation sharing config
Expand Down
15 changes: 15 additions & 0 deletions app/rspack.config.watch.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright (c) Jupyter Development Team.
* Distributed under the terms of the Modified BSD License.
*/

const base = require('./rspack.config');

module.exports = [
{
...base[0],
bail: false,
watch: true,
},
...base.slice(1),
];
2 changes: 1 addition & 1 deletion app/webpack.prod.config.js → app/rspack.prod.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

const merge = require('webpack-merge').default;
const config = require('./webpack.config');
const config = require('./rspack.config');
const WPPlugin = require('@jupyterlab/builder').WPPlugin;

config[0] = merge(config[0], {
Expand Down
17 changes: 0 additions & 17 deletions app/webpack.config.watch.js

This file was deleted.

2 changes: 1 addition & 1 deletion buildutils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"watch": "tsc -w --listEmittedFiles"
},
"dependencies": {
"@jupyterlab/buildutils": "~4.5.1",
"@jupyterlab/buildutils": "~4.6.0-alpha.0",
"commander": "^6.2.0",
"fs-extra": "^9.1.0",
"semver": "^7.6.3",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/buildutils": "~4.5.1",
"@jupyterlab/buildutils": "~4.6.0-alpha.0",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.55.0",
"eslint": "^8.36.0",
Expand Down
22 changes: 11 additions & 11 deletions packages/application-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"dependencies": {
"@jupyter-notebook/application": "^7.5.1",
"@jupyter-notebook/ui-components": "^7.5.1",
"@jupyterlab/application": "~4.5.1",
"@jupyterlab/apputils": "~4.6.1",
"@jupyterlab/codeeditor": "~4.5.1",
"@jupyterlab/console": "~4.5.1",
"@jupyterlab/coreutils": "~6.5.1",
"@jupyterlab/docmanager": "~4.5.1",
"@jupyterlab/docregistry": "~4.5.1",
"@jupyterlab/mainmenu": "~4.5.1",
"@jupyterlab/rendermime": "~4.5.1",
"@jupyterlab/settingregistry": "~4.5.1",
"@jupyterlab/translation": "~4.5.1",
"@jupyterlab/application": "~4.6.0-alpha.0",
"@jupyterlab/apputils": "~4.7.0-alpha.0",
"@jupyterlab/codeeditor": "~4.6.0-alpha.0",
"@jupyterlab/console": "~4.6.0-alpha.0",
"@jupyterlab/coreutils": "~6.6.0-alpha.0",
"@jupyterlab/docmanager": "~4.6.0-alpha.0",
"@jupyterlab/docregistry": "~4.6.0-alpha.0",
"@jupyterlab/mainmenu": "~4.6.0-alpha.0",
"@jupyterlab/rendermime": "~4.6.0-alpha.0",
"@jupyterlab/settingregistry": "~4.6.0-alpha.0",
"@jupyterlab/translation": "~4.6.0-alpha.0",
"@lumino/coreutils": "^2.2.2",
"@lumino/disposable": "^2.1.5",
"@lumino/widgets": "^2.7.2"
Expand Down
12 changes: 6 additions & 6 deletions packages/application/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/application": "~4.5.1",
"@jupyterlab/coreutils": "~6.5.1",
"@jupyterlab/docregistry": "~4.5.1",
"@jupyterlab/rendermime-interfaces": "~3.13.1",
"@jupyterlab/ui-components": "~4.5.1",
"@jupyterlab/application": "~4.6.0-alpha.0",
"@jupyterlab/coreutils": "~6.6.0-alpha.0",
"@jupyterlab/docregistry": "~4.6.0-alpha.0",
"@jupyterlab/rendermime-interfaces": "~3.14.0-alpha.0",
"@jupyterlab/ui-components": "~4.6.0-alpha.0",
"@lumino/algorithm": "^2.0.4",
"@lumino/coreutils": "^2.2.2",
"@lumino/messaging": "^2.0.4",
Expand All @@ -57,7 +57,7 @@
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.12.1",
"@jupyterlab/testutils": "~4.3.2",
"@jupyterlab/testutils": "~4.6.0-alpha.0",
"@types/jest": "^29.2.5",
"jest": "^29.3.1",
"rimraf": "^3.0.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/console-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.5.1",
"@jupyterlab/application": "~4.5.1",
"@jupyterlab/console": "~4.5.1",
"@jupyterlab/coreutils": "~6.5.1",
"@jupyterlab/application": "~4.6.0-alpha.0",
"@jupyterlab/console": "~4.6.0-alpha.0",
"@jupyterlab/coreutils": "~6.6.0-alpha.0",
"@lumino/algorithm": "^2.0.4"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/docmanager-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.5.1",
"@jupyterlab/application": "~4.5.1",
"@jupyterlab/coreutils": "~6.5.1",
"@jupyterlab/docmanager": "~4.5.1",
"@jupyterlab/docregistry": "~4.5.1",
"@jupyterlab/services": "~7.5.1",
"@jupyterlab/application": "~4.6.0-alpha.0",
"@jupyterlab/coreutils": "~6.6.0-alpha.0",
"@jupyterlab/docmanager": "~4.6.0-alpha.0",
"@jupyterlab/docregistry": "~4.6.0-alpha.0",
"@jupyterlab/services": "~7.6.0-alpha.0",
"@lumino/algorithm": "^2.0.4",
"@lumino/signaling": "^2.1.5"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/documentsearch-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
},
"dependencies": {
"@jupyter-notebook/application": "^7.5.1",
"@jupyterlab/application": "~4.5.1",
"@jupyterlab/documentsearch": "~4.5.1",
"@jupyterlab/application": "~4.6.0-alpha.0",
"@jupyterlab/documentsearch": "~4.6.0-alpha.0",
"@lumino/widgets": "^2.7.2"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/help-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
},
"dependencies": {
"@jupyter-notebook/ui-components": "^7.5.1",
"@jupyterlab/application": "~4.5.1",
"@jupyterlab/apputils": "~4.6.1",
"@jupyterlab/mainmenu": "~4.5.1",
"@jupyterlab/translation": "~4.5.1",
"@jupyterlab/application": "~4.6.0-alpha.0",
"@jupyterlab/apputils": "~4.7.0-alpha.0",
"@jupyterlab/mainmenu": "~4.6.0-alpha.0",
"@jupyterlab/translation": "~4.6.0-alpha.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
Loading
Loading