Skip to content

Commit

Permalink
Update to use JupyterLab 3.3.0rc0 (elyra-ai#2495)
Browse files Browse the repository at this point in the history
  • Loading branch information
@akchinSTC
akchinSTC authored Feb 25, 2022
1 parent 6b1c4b5 commit 3283f85
Show file tree
Hide file tree
Showing 15 changed files with 2,980 additions and 2,993 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
/home/runner/.cache/Cypress
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- name: Install
run: yarn install --frozen-lockfile
run: yarn install --frozen-lockfile && tsc -v

lint-server:
name: Lint Server
Expand Down
9 changes: 3 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,9 @@
}
},
"resolutions": {
"@blueprintjs/core": "^3.36.0",
"@blueprintjs/select": "^3.15.0",
"@types/react": "^17.0.0",
"@types/react-dom": "~17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react-intl": "^3.0.0",
"@lumino/widgets": "1.17.0",
"cypress": "^6.2.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
Expand All @@ -44,13 +41,13 @@
"devDependencies": {
"@4tw/cypress-drag-drop": "^1.3.1",
"@cypress/webpack-preprocessor": "^5.5.0",
"@jupyterlab/testutils": "3.0.0",
"@jupyterlab/testutils": "3.3.0-rc.0",
"@testing-library/cypress": "^7.0.4",
"@types/jest": "^26.0.20",
"@types/lodash": "^4.14.170",
"@types/node": "^15.0.1",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react-dom": "~17.0.0",
"@types/react-intl": "^3.0.0",
"@typescript-eslint/eslint-plugin": "~2.23.0",
"@typescript-eslint/parser": "~2.23.0",
Expand Down
30 changes: 15 additions & 15 deletions packages/code-snippet/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@
"@elyra/metadata-common": "3.7.0-dev",
"@elyra/services": "3.7.0-dev",
"@elyra/ui-components": "3.7.0-dev",
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/cells": "^3.0.0",
"@jupyterlab/codeeditor": "^3.0.0",
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/docmanager": "^3.0.0",
"@jupyterlab/docregistry": "^3.0.0",
"@jupyterlab/fileeditor": "^3.0.0",
"@jupyterlab/mainmenu": "^3.0.0",
"@jupyterlab/markdownviewer": "^3.0.0",
"@jupyterlab/notebook": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@jupyterlab/application": "^3.3.0-rc.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/builder": "^3.3.0-rc.0",
"@jupyterlab/cells": "^3.3.0-rc.0",
"@jupyterlab/codeeditor": "^3.3.0-rc.0",
"@jupyterlab/coreutils": "^5.3.0-rc.0",
"@jupyterlab/docmanager": "^3.3.0-rc.0",
"@jupyterlab/docregistry": "^3.3.0-rc.0",
"@jupyterlab/fileeditor": "^3.3.0-rc.0",
"@jupyterlab/mainmenu": "^3.3.0-rc.0",
"@jupyterlab/markdownviewer": "^3.3.0-rc.0",
"@jupyterlab/notebook": "^3.3.0-rc.0",
"@jupyterlab/ui-components": "^3.3.0-rc.0",
"@lumino/algorithm": "^1.3.3",
"@lumino/coreutils": "^1.5.3",
"@lumino/coreutils": "^1.5.6",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.17.0",
"@lumino/widgets": "^1.19.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/metadata-common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"dependencies": {
"@elyra/services": "3.7.0-dev",
"@elyra/ui-components": "3.7.0-dev",
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/codeeditor": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@jupyterlab/application": "^3.3.0-rc.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/codeeditor": "^3.3.0-rc.0",
"@jupyterlab/ui-components": "^3.3.0-rc.0",
"@lumino/algorithm": "^1.3.3",
"@lumino/messaging": "^1.4.3",
"@lumino/widgets": "^1.17.0",
"@lumino/widgets": "^1.19.0",
"@material-ui/core": "^4.12.1",
"react": "^17.0.1",
"react-dom": "^17.0.1"
Expand Down
12 changes: 6 additions & 6 deletions packages/metadata/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
"dependencies": {
"@elyra/metadata-common": "3.7.0-dev",
"@elyra/services": "3.7.0-dev",
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/codeeditor": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@jupyterlab/application": "^3.3.0-rc.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/builder": "^3.3.0-rc.0",
"@jupyterlab/codeeditor": "^3.3.0-rc.0",
"@jupyterlab/ui-components": "^3.3.0-rc.0",
"@lumino/algorithm": "^1.3.3",
"@lumino/widgets": "^1.17.0"
"@lumino/widgets": "^1.19.0"
},
"devDependencies": {
"rimraf": "^3.0.2",
Expand Down
30 changes: 15 additions & 15 deletions packages/pipeline-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,26 @@
"@elyra/pipeline-services": "~1.6.0",
"@elyra/services": "3.7.0-dev",
"@elyra/ui-components": "3.7.0-dev",
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/docregistry": "^3.0.0",
"@jupyterlab/filebrowser": "^3.0.0",
"@jupyterlab/filebrowser-extension": "^3.0.0",
"@jupyterlab/fileeditor": "^3.0.0",
"@jupyterlab/launcher": "^3.0.0",
"@jupyterlab/mainmenu": "^3.0.0",
"@jupyterlab/notebook": "^3.0.0",
"@jupyterlab/outputarea": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@jupyterlab/application": "^3.3.0-rc.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/builder": "^3.3.0-rc.0",
"@jupyterlab/coreutils": "^5.3.0-rc.0",
"@jupyterlab/docregistry": "^3.3.0-rc.0",
"@jupyterlab/filebrowser": "^3.3.0-rc.0",
"@jupyterlab/filebrowser-extension": "^3.3.0-rc.0",
"@jupyterlab/fileeditor": "^3.3.0-rc.0",
"@jupyterlab/launcher": "^3.3.0-rc.0",
"@jupyterlab/mainmenu": "^3.3.0-rc.0",
"@jupyterlab/notebook": "^3.3.0-rc.0",
"@jupyterlab/outputarea": "^3.3.0-rc.0",
"@jupyterlab/ui-components": "^3.3.0-rc.0",
"@lumino/algorithm": "^1.3.3",
"@lumino/coreutils": "^1.5.3",
"@lumino/coreutils": "^1.5.6",
"@lumino/disposable": "^1.4.3",
"@lumino/dragdrop": "^1.7.1",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.17.0",
"@lumino/widgets": "^1.19.0",
"@material-ui/lab": "^4.0.0-alpha.18",
"autoprefixer": "^9.6.0",
"carbon-components": "~10.8.1",
Expand Down
24 changes: 12 additions & 12 deletions packages/python-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@
"dependencies": {
"@elyra/script-editor": "3.7.0-dev",
"@elyra/ui-components": "3.7.0-dev",
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/codeeditor": "^3.0.0",
"@jupyterlab/docregistry": "^3.0.0",
"@jupyterlab/filebrowser": "^3.0.0",
"@jupyterlab/fileeditor": "^3.0.0",
"@jupyterlab/launcher": "^3.0.0",
"@jupyterlab/mainmenu": "^3.0.0",
"@jupyterlab/settingregistry": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@lumino/coreutils": "^1.5.3"
"@jupyterlab/application": "^3.3.0-rc.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/builder": "^3.3.0-rc.0",
"@jupyterlab/codeeditor": "^3.3.0-rc.0",
"@jupyterlab/docregistry": "^3.3.0-rc.0",
"@jupyterlab/filebrowser": "^3.3.0-rc.0",
"@jupyterlab/fileeditor": "^3.3.0-rc.0",
"@jupyterlab/launcher": "^3.3.0-rc.0",
"@jupyterlab/mainmenu": "^3.3.0-rc.0",
"@jupyterlab/settingregistry": "^3.3.0-rc.0",
"@jupyterlab/ui-components": "^3.3.0-rc.0",
"@lumino/coreutils": "^1.5.6"
},
"devDependencies": {
"rimraf": "^3.0.2",
Expand Down
22 changes: 11 additions & 11 deletions packages/r-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@
"dependencies": {
"@elyra/script-editor": "3.7.0-dev",
"@elyra/ui-components": "3.7.0-dev",
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/codeeditor": "^3.0.0",
"@jupyterlab/docregistry": "^3.0.0",
"@jupyterlab/filebrowser": "^3.0.0",
"@jupyterlab/fileeditor": "^3.0.0",
"@jupyterlab/launcher": "^3.0.0",
"@jupyterlab/mainmenu": "^3.0.0",
"@jupyterlab/settingregistry": "^3.0.0",
"@lumino/coreutils": "^1.5.3"
"@jupyterlab/application": "^3.3.0-rc.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/builder": "^3.3.0-rc.0",
"@jupyterlab/codeeditor": "^3.3.0-rc.0",
"@jupyterlab/docregistry": "^3.3.0-rc.0",
"@jupyterlab/filebrowser": "^3.3.0-rc.0",
"@jupyterlab/fileeditor": "^3.3.0-rc.0",
"@jupyterlab/launcher": "^3.3.0-rc.0",
"@jupyterlab/mainmenu": "^3.3.0-rc.0",
"@jupyterlab/settingregistry": "^3.3.0-rc.0",
"@lumino/coreutils": "^1.5.6"
},
"devDependencies": {
"rimraf": "^3.0.2",
Expand Down
20 changes: 10 additions & 10 deletions packages/script-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
"lab:uninstall": "jupyter labextension unlink --no-build"
},
"dependencies": {
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/codeeditor": "^3.0.0",
"@jupyterlab/docregistry": "^3.0.0",
"@jupyterlab/fileeditor": "^3.0.0",
"@jupyterlab/logconsole": "^3.0.0",
"@jupyterlab/outputarea": "^3.0.0",
"@jupyterlab/rendermime": "^3.0.0",
"@jupyterlab/services": "^6.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@lumino/widgets": "^1.17.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/codeeditor": "^3.3.0-rc.0",
"@jupyterlab/docregistry": "^3.3.0-rc.0",
"@jupyterlab/fileeditor": "^3.3.0-rc.0",
"@jupyterlab/logconsole": "^3.3.0-rc.0",
"@jupyterlab/outputarea": "^3.3.0-rc.0",
"@jupyterlab/rendermime": "^3.3.0-rc.0",
"@jupyterlab/services": "^6.3.0-rc.0",
"@jupyterlab/ui-components": "^3.3.0-rc.0",
"@lumino/widgets": "^1.19.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/services/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
"lab:uninstall": "jupyter labextension unlink --no-build"
},
"dependencies": {
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/services": "^6.0.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/coreutils": "^5.3.0-rc.0",
"@jupyterlab/services": "^6.3.0-rc.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-intl": "^3.0.0"
},
"devDependencies": {
"@jupyterlab/testutils": "3.0.0",
"@jupyterlab/testutils": "3.3.0-rc.0",
"@types/jest": "^23.3.11",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/theme/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
},
"dependencies": {
"@elyra/ui-components": "3.7.0-dev",
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/launcher": "^3.0.0",
"@jupyterlab/mainmenu": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@jupyterlab/application": "^3.3.0-rc.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/builder": "^3.3.0-rc.0",
"@jupyterlab/launcher": "^3.3.0-rc.0",
"@jupyterlab/mainmenu": "^3.3.0-rc.0",
"@jupyterlab/ui-components": "^3.3.0-rc.0",
"@lumino/algorithm": "^1.3.3",
"react": "^17.0.1",
"react-dom": "^17.0.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"lab:uninstall": "jupyter labextension unlink --no-build"
},
"dependencies": {
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@jupyterlab/apputils": "^3.3.0-rc.0",
"@jupyterlab/ui-components": "^3.3.0-rc.0",
"@material-ui/core": "^4.12.1",
"@material-ui/icons": "^4.2.1",
"@material-ui/lab": "^4.0.0-alpha.18",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
'jupyter_client>=6.1.7',
'jupyter-packaging>=0.10',
'jupyter_server>=1.7.0',
'jupyterlab>=3.0.17',
'jupyterlab~=3.3.0rc0',
'jupyterlab-git~=0.32',
'jupyterlab-lsp>=3.8.0',
'jupyter-resource-usage>=0.5.1',
Expand Down
10 changes: 9 additions & 1 deletion testutils/jest.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ const reuseFromUpstream = [
'moduleFileExtensions'
];

const esModules = [
'lib0',
'y\\-protocols',
'y\\-websocket',
'yjs',
'(@jupyterlab/.*)/'
].join('|');

const local = {
globals: { 'ts-jest': { tsConfig: 'tsconfig.json' } },
// eslint-disable-next-line no-useless-escape
Expand All @@ -32,7 +40,7 @@ const local = {
'\\.(js|jsx)?$': '../../testutils/transform.js',
'\\.svg$': 'jest-raw-loader'
},
transformIgnorePatterns: ['/node_modules/(?!(@jupyterlab/.*)/)'],
transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`],
moduleNameMapper: {
'\\.(css|less|sass|scss)$': 'identity-obj-proxy',
'\\.(gif|ttf|eot)$': '@jupyterlab/testutils/lib/jest-file-mock.js'
Expand Down
Loading

0 comments on commit 3283f85

Please sign in to comment.