Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to JupyterLab v3.1 and support RTC #142

Merged
merged 11 commits into from
Aug 30, 2021
Merged

Update to JupyterLab v3.1 and support RTC #142

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4959f01
Upgrade dependencies
hbcarlos Aug 4, 2021
6867200
Use collaborative metadata
hbcarlos Aug 9, 2021
b0a6722
Simplify signals and add shared attribute executed to track whether t…
hbcarlos Aug 12, 2021
f9d99f3
Clean up
hbcarlos Aug 12, 2021
a997786
Adds undo/redo
hbcarlos Aug 12, 2021
977ef53
Compact dialog
hbcarlos Aug 12, 2021
f8386f2
Clean up dependencies
hbcarlos Aug 12, 2021
de7efea
Update dependencies
hbcarlos Aug 25, 2021
317435e
Tests issue
hbcarlos Aug 25, 2021
56d4c00
Update to 3.1.9
hbcarlos Aug 27, 2021
cb97d8c
Remove eslint ban-ts-comment
hbcarlos Aug 29, 2021
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
2 changes: 2 additions & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ module.exports = {
],
'@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
'@typescript-eslint/no-explicit-any': 'off',
// TODO: Remove ban-ts-comment
'@typescript-eslint/ban-ts-comment': 'off',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be removed now that it has been updated to 3.1.9?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following-up on the comment: #142 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, good catch!

'@typescript-eslint/no-namespace': 'off',
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-use-before-define': 'off',
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"watch": "lerna run watch"
},
"devDependencies": {
"@types/jest": "^26.0.24",
"@typescript-eslint/eslint-plugin": "^4.2.0",
"@typescript-eslint/parser": "^4.2.0",
"eslint": "^7.10.0",
Expand Down
1 change: 1 addition & 0 deletions packages/gridstack-editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ async function main() {
require('@jupyterlab/apputils-extension').default.filter(({ id }) =>
['@jupyterlab/apputils-extension:settings'].includes(id)
),
require('@jupyterlab/theme-light-extension'),
require('@jupyterlab/rendermime-extension'),
require('@jupyterlab/notebook-extension').default.filter(({ id }) =>
[
Expand Down
274 changes: 144 additions & 130 deletions packages/gridstack-editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"lib": "lib/"
},
"scripts": {
"build": "jlpm run build:lib && webpack",
"build": "jlpm run clean && jlpm run build:lib && webpack",
"build:lib": "tsc",
"build:prod": "jlpm run build:lib && webpack --mode=production",
"clean": "rimraf build lib tsconfig.tsbuildinfo",
Expand All @@ -26,158 +26,167 @@
"watch": "npm-run-all --parallel watch:ts watch:webpack"
},
"dependencies": {
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/apputils-extension": "^3.0.0",
"@jupyterlab/codeeditor": "^3.0.0",
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/docmanager": "^3.0.0",
"@jupyterlab/docregistry": "^3.0.0",
"@jupyterlab/documentsearch": "^3.0.0",
"@jupyterlab/mathjax2": "^3.0.0",
"@jupyterlab/notebook": "^3.0.0",
"@jupyterlab/notebook-extension": "^3.0.0",
"@jupyterlab/rendermime-extension": "^3.0.0",
"@jupyterlab/settingregistry": "^3.0.0",
"@jupyterlab/theme-light-extension": "^3.0.0",
"@jupyterlab/translation": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@lumino/widgets": "^1.17.0",
"@jupyterlab/application": "~3.1.8",
"@jupyterlab/apputils": "~3.1.8",
"@jupyterlab/apputils-extension": "~3.1.9",
"@jupyterlab/codeeditor": "~3.1.8",
"@jupyterlab/codemirror": "~3.1.8",
"@jupyterlab/coreutils": "~5.1.8",
"@jupyterlab/docmanager": "~3.1.8",
"@jupyterlab/docregistry": "~3.1.8",
"@jupyterlab/documentsearch": "~3.1.8",
"@jupyterlab/mainmenu": "~3.1.8",
"@jupyterlab/notebook": "~3.1.8",
"@jupyterlab/notebook-extension": "~3.1.8",
"@jupyterlab/rendermime-extension": "~3.1.8",
"@jupyterlab/theme-light-extension": "~3.1.8",
"@jupyterlab/translation": "~3.1.8",
"@jupyterlab/ui-components": "~3.1.8",
"@lumino/algorithm": "^1.3.3",
"@lumino/widgets": "^1.19.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0",
"css-loader": "~3.2.0",
"file-loader": "~5.0.2",
"fs-extra": "^8.1.0",
"@jupyterlab/builder": "^3.1.9",
"@jupyterlab/buildutils": "^3.1.9",
"css-loader": "^5.0.1",
"file-loader": "~6.0.0",
"fs-extra": "^9.0.1",
"glob": "~7.1.6",
"mini-css-extract-plugin": "~0.9.0",
"mini-css-extract-plugin": "~1.3.2",
"npm-run-all": "^4.1.5",
"raw-loader": "~4.0.0",
"rimraf": "~3.0.2",
"style-loader": "~1.0.1",
"rimraf": "~3.0.0",
"style-loader": "~2.0.0",
"svg-url-loader": "~6.0.0",
"url-loader": "~4.1.1",
"url-loader": "~4.1.0",
"watch": "~1.0.2",
"webpack": "^5.7.0",
"webpack-bundle-analyzer": "^4.1.0",
"webpack-cli": "^4.2.0",
"webpack": "^5.41.1",
"webpack-bundle-analyzer": "^3.6.0",
"webpack-cli": "^4.1.0",
"webpack-merge": "^5.1.2",
"whatwg-fetch": "^3.0.0"
},
"resolutions": {
"@jupyterlab/application": "~3.0.0",
"@jupyterlab/application-extension": "~3.0.0",
"@jupyterlab/apputils": "~3.0.0",
"@jupyterlab/apputils-extension": "~3.0.0",
"@jupyterlab/attachments": "~3.0.0",
"@jupyterlab/cells": "~3.0.0",
"@jupyterlab/celltags": "~3.0.0",
"@jupyterlab/celltags-extension": "~3.0.0",
"@jupyterlab/codeeditor": "~3.0.0",
"@jupyterlab/codemirror": "~3.0.0",
"@jupyterlab/codemirror-extension": "~3.0.0",
"@jupyterlab/completer": "~3.0.0",
"@jupyterlab/completer-extension": "~3.0.0",
"@jupyterlab/console": "~3.0.0",
"@jupyterlab/console-extension": "~3.0.0",
"@jupyterlab/coreutils": "~5.0.0",
"@jupyterlab/csvviewer": "~3.0.0",
"@jupyterlab/csvviewer-extension": "~3.0.0",
"@jupyterlab/debugger": "~3.0.0",
"@jupyterlab/debugger-extension": "~3.0.0",
"@jupyterlab/docmanager": "~3.0.0",
"@jupyterlab/docmanager-extension": "~3.0.0",
"@jupyterlab/docregistry": "~3.0.0",
"@jupyterlab/documentsearch": "~3.0.0",
"@jupyterlab/documentsearch-extension": "~3.0.0",
"@jupyterlab/extensionmanager": "^3.0.0",
"@jupyterlab/extensionmanager-extension": "~3.0.0",
"@jupyterlab/filebrowser": "~3.0.0",
"@jupyterlab/filebrowser-extension": "~3.0.0",
"@jupyterlab/fileeditor": "~3.0.0",
"@jupyterlab/fileeditor-extension": "~3.0.0",
"@jupyterlab/help-extension": "~3.0.0",
"@jupyterlab/htmlviewer": "~3.0.0",
"@jupyterlab/htmlviewer-extension": "~3.0.0",
"@jupyterlab/hub-extension": "~3.0.0",
"@jupyterlab/imageviewer": "~3.0.0",
"@jupyterlab/imageviewer-extension": "~3.0.0",
"@jupyterlab/inspector": "~3.0.0",
"@jupyterlab/inspector-extension": "~3.0.0",
"@jupyterlab/javascript-extension": "~3.0.0",
"@jupyterlab/json-extension": "~3.0.0",
"@jupyterlab/launcher": "~3.0.0",
"@jupyterlab/launcher-extension": "~3.0.0",
"@jupyterlab/logconsole": "~3.0.0",
"@jupyterlab/logconsole-extension": "~3.0.0",
"@jupyterlab/mainmenu": "~3.0.0",
"@jupyterlab/mainmenu-extension": "~3.0.0",
"@jupyterlab/markdownviewer-extension": "~3.0.0",
"@jupyterlab/mathjax2": "~3.0.0",
"@jupyterlab/mathjax2-extension": "~3.0.0",
"@jupyterlab/metapackage": "~3.0.0",
"@jupyterlab/nbconvert-css": "~3.0.0",
"@jupyterlab/nbformat": "~3.0.0",
"@jupyterlab/notebook": "~3.0.0",
"@jupyterlab/notebook-extension": "~3.0.0",
"@jupyterlab/observables": "~4.0.0",
"@jupyterlab/outputarea": "~3.0.0",
"@jupyterlab/pdf-extension": "~3.0.0",
"@jupyterlab/property-inspector": "~3.0.0",
"@jupyterlab/rendermime": "~3.0.0",
"@jupyterlab/rendermime-extension": "~3.0.0",
"@jupyterlab/rendermime-interfaces": "~3.0.0",
"@jupyterlab/running": "~3.0.0",
"@jupyterlab/running-extension": "~3.0.0",
"@jupyterlab/services": "~6.0.0",
"@jupyterlab/settingeditor": "~3.0.0",
"@jupyterlab/settingeditor-extension": "~3.0.0",
"@jupyterlab/settingregistry": "~3.0.0",
"@jupyterlab/shortcuts-extension": "~3.0.0",
"@jupyterlab/statedb": "~3.0.0",
"@jupyterlab/statusbar": "~3.0.0",
"@jupyterlab/statusbar-extension": "~3.0.0",
"@jupyterlab/terminal": "~3.0.0",
"@jupyterlab/terminal-extension": "~3.0.0",
"@jupyterlab/theme-dark-extension": "~3.0.0",
"@jupyterlab/theme-light-extension": "~3.0.0",
"@jupyterlab/toc": "~5.0.0",
"@jupyterlab/toc-extension": "~5.0.0",
"@jupyterlab/tooltip": "~3.0.0",
"@jupyterlab/tooltip-extension": "~3.0.0",
"@jupyterlab/translation": "~3.0.0",
"@jupyterlab/translation-extension": "~3.0.0",
"@jupyterlab/ui-components": "~3.0.0",
"@jupyterlab/ui-components-extension": "~3.0.0",
"@jupyterlab/vdom": "~3.0.0",
"@jupyterlab/vdom-extension": "~3.0.0",
"@jupyterlab/vega5-extension": "~3.0.0",
"@lumino/algorithm": "^1.2.3",
"@lumino/application": "^1.8.4",
"@lumino/commands": "^1.10.1",
"@lumino/coreutils": "^1.4.3",
"@lumino/disposable": "^1.3.5",
"@lumino/domutils": "^1.1.7",
"@lumino/dragdrop": "^1.5.1",
"@lumino/messaging": "^1.3.3",
"@lumino/properties": "^1.1.6",
"@lumino/signaling": "^1.3.5",
"@lumino/virtualdom": "^1.6.1",
"@lumino/widgets": "^1.17.0",
"@jupyterlab/application": "~3.1.8",
"@jupyterlab/application-extension": "~3.1.8",
"@jupyterlab/apputils": "~3.1.8",
"@jupyterlab/apputils-extension": "~3.1.9",
"@jupyterlab/attachments": "~3.1.8",
"@jupyterlab/cells": "~3.1.8",
"@jupyterlab/celltags": "~3.1.8",
"@jupyterlab/celltags-extension": "~3.1.8",
"@jupyterlab/codeeditor": "~3.1.8",
"@jupyterlab/codemirror": "~3.1.8",
"@jupyterlab/codemirror-extension": "~3.1.8",
"@jupyterlab/completer": "~3.1.8",
"@jupyterlab/completer-extension": "~3.1.8",
"@jupyterlab/console": "~3.1.8",
"@jupyterlab/console-extension": "~3.1.8",
"@jupyterlab/coreutils": "~5.1.8",
"@jupyterlab/csvviewer": "~3.1.8",
"@jupyterlab/csvviewer-extension": "~3.1.8",
"@jupyterlab/debugger": "~3.1.8",
"@jupyterlab/debugger-extension": "~3.1.8",
"@jupyterlab/docmanager": "~3.1.8",
"@jupyterlab/docmanager-extension": "~3.1.8",
"@jupyterlab/docprovider": "~3.1.8",
"@jupyterlab/docprovider-extension": "~3.1.8",
"@jupyterlab/docregistry": "~3.1.8",
"@jupyterlab/documentsearch": "~3.1.8",
"@jupyterlab/documentsearch-extension": "~3.1.8",
"@jupyterlab/extensionmanager": "~3.1.8",
"@jupyterlab/extensionmanager-extension": "~3.1.8",
"@jupyterlab/filebrowser": "~3.1.8",
"@jupyterlab/filebrowser-extension": "~3.1.8",
"@jupyterlab/fileeditor": "~3.1.8",
"@jupyterlab/fileeditor-extension": "~3.1.8",
"@jupyterlab/help-extension": "~3.1.8",
"@jupyterlab/htmlviewer": "~3.1.8",
"@jupyterlab/htmlviewer-extension": "~3.1.8",
"@jupyterlab/hub-extension": "~3.1.8",
"@jupyterlab/imageviewer": "~3.1.8",
"@jupyterlab/imageviewer-extension": "~3.1.8",
"@jupyterlab/inspector": "~3.1.8",
"@jupyterlab/inspector-extension": "~3.1.8",
"@jupyterlab/javascript-extension": "~3.1.9",
"@jupyterlab/json-extension": "~3.1.9",
"@jupyterlab/launcher": "~3.1.8",
"@jupyterlab/launcher-extension": "~3.1.8",
"@jupyterlab/logconsole": "~3.1.8",
"@jupyterlab/logconsole-extension": "~3.1.8",
"@jupyterlab/mainmenu": "~3.1.8",
"@jupyterlab/mainmenu-extension": "~3.1.8",
"@jupyterlab/markdownviewer": "~3.1.8",
"@jupyterlab/markdownviewer-extension": "~3.1.8",
"@jupyterlab/mathjax2": "~3.1.8",
"@jupyterlab/mathjax2-extension": "~3.1.8",
"@jupyterlab/metapackage": "~3.1.9",
"@jupyterlab/nbconvert-css": "~3.1.8",
"@jupyterlab/nbformat": "~3.1.8",
"@jupyterlab/notebook": "~3.1.8",
"@jupyterlab/notebook-extension": "~3.1.8",
"@jupyterlab/observables": "~4.1.8",
"@jupyterlab/outputarea": "~3.1.8",
"@jupyterlab/pdf-extension": "~3.1.8",
"@jupyterlab/property-inspector": "~3.1.8",
"@jupyterlab/rendermime": "~3.1.8",
"@jupyterlab/rendermime-extension": "~3.1.8",
"@jupyterlab/rendermime-interfaces": "~3.1.8",
"@jupyterlab/running": "~3.1.8",
"@jupyterlab/running-extension": "~3.1.8",
"@jupyterlab/services": "~6.1.8",
"@jupyterlab/settingeditor": "~3.1.8",
"@jupyterlab/settingeditor-extension": "~3.1.8",
"@jupyterlab/settingregistry": "~3.1.8",
"@jupyterlab/shared-models": "~3.1.8",
"@jupyterlab/shortcuts-extension": "~3.1.8",
"@jupyterlab/statedb": "~3.1.8",
"@jupyterlab/statusbar": "~3.1.8",
"@jupyterlab/statusbar-extension": "~3.1.8",
"@jupyterlab/terminal": "~3.1.8",
"@jupyterlab/terminal-extension": "~3.1.8",
"@jupyterlab/theme-dark-extension": "~3.1.8",
"@jupyterlab/theme-light-extension": "~3.1.8",
"@jupyterlab/toc": "~5.1.8",
"@jupyterlab/toc-extension": "~5.1.8",
"@jupyterlab/tooltip": "~3.1.8",
"@jupyterlab/tooltip-extension": "~3.1.8",
"@jupyterlab/translation": "~3.1.8",
"@jupyterlab/translation-extension": "~3.1.8",
"@jupyterlab/ui-components": "~3.1.8",
"@jupyterlab/ui-components-extension": "~3.1.8",
"@jupyterlab/vdom": "~3.1.9",
"@jupyterlab/vdom-extension": "~3.1.9",
"@jupyterlab/vega5-extension": "~3.1.9",
"@lumino/algorithm": "^1.3.3",
"@lumino/application": "^1.16.0",
"@lumino/commands": "^1.12.0",
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
"@lumino/domutils": "^1.2.3",
"@lumino/dragdrop": "^1.7.1",
"@lumino/messaging": "^1.4.3",
"@lumino/properties": "^1.2.3",
"@lumino/signaling": "^1.4.3",
"@lumino/virtualdom": "^1.8.0",
"@lumino/widgets": "^1.19.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
"react-dom": "^17.0.1",
"yjs": "^13.5.6"
},
"jupyterlab": {
"singletonPackages": [
"@jupyterlab/application",
"@jupyterlab/apputils",
"@jupyterlab/codeeditor",
"@jupyterlab/codemirror",
"@jupyterlab/completer",
"@jupyterlab/console",
"@jupyterlab/coreutils",
"@jupyterlab/debugger",
"@jupyterlab/docmanager",
"@jupyterlab/docprovider",
"@jupyterlab/documentsearch",
"@jupyterlab/extensionmanager",
"@jupyterlab/filebrowser",
Expand All @@ -187,16 +196,20 @@
"@jupyterlab/launcher",
"@jupyterlab/logconsole",
"@jupyterlab/mainmenu",
"@jupyterlab/markdownviewer",
"@jupyterlab/notebook",
"@jupyterlab/rendermime",
"@jupyterlab/rendermime-interfaces",
"@jupyterlab/services",
"@jupyterlab/settingeditor",
"@jupyterlab/settingregistry",
"@jupyterlab/shared-models",
"@jupyterlab/statedb",
"@jupyterlab/statusbar",
"@jupyterlab/terminal",
"@jupyterlab/toc",
"@jupyterlab/tooltip",
"@jupyterlab/translation",
"@jupyterlab/ui-components",
"@lumino/algorithm",
"@lumino/application",
Expand All @@ -211,7 +224,8 @@
"@lumino/virtualdom",
"@lumino/widgets",
"react",
"react-dom"
"react-dom",
"yjs"
]
}
}
1 change: 0 additions & 1 deletion packages/gridstack-editor/style/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
@import url('~@jupyterlab/documentsearch/style/index.css');
@import url('~@jupyterlab/mainmenu/style/index.css');
@import url('~@jupyterlab/notebook/style/index.css');
@import url('~@jupyterlab/theme-light-extension/style/index.css');
@import url('~@jupyterlab/ui-components/style/index.css');

@import url('~@voila-dashboards/jupyterlab-gridstack/style/index.css');
Expand Down
Loading