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

Migrates to Lab v4 #39

Merged
merged 1 commit into from
Jul 27, 2023
Merged

Migrates to Lab v4 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 4 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Install dependencies
run: python -m pip install -U jupyterlab~=3.1
run: python -m pip install -U jupyterlab~=4.0

- name: Lint the extension
run: |
Expand Down Expand Up @@ -60,8 +60,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Install Python
uses: actions/setup-python@v4
with:
Expand All @@ -77,14 +75,14 @@ jobs:
sudo rm -rf $(which node)
sudo rm -rf $(which node)

pip install "jupyterlab~=3.1" jupyterlab_rise*.whl
pip install "jupyterlab~=4.0" jupyterlab_rise*.whl

jupyter server extension list
jupyter server extension list 2>&1 | grep -ie "jupyterlab_rise.*OK"

jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "jupyterlab-rise.*OK"
python -m jupyterlab.browser_check --no-chrome-test
python -m jupyterlab.browser_check --no-browser-test

integration-tests:
name: Integration tests
Expand All @@ -109,7 +107,7 @@ jobs:
- name: Install the extension
run: |
set -eux
python -m pip install "jupyterlab~=3.1" jupyterlab_rise*.whl
python -m pip install "jupyterlab~=4.0" jupyterlab_rise*.whl

- name: Install dependencies
working-directory: ui-tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install Dependencies
run: |
# Install dependencies for bump_version script
python -m pip install hatch "jupyterlab~=3.1"
python -m pip install hatch "jupyterlab~=4.0"
- name: Check Release
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
*.bundle.*
.yarn
lib/
node_modules/
.eslintcache
Expand Down
3 changes: 3 additions & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
enableImmutableInstalls: false

nodeLinker: node-modules
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RISE: "Live" Reveal.js JupyterLab Slideshow extension.

## Requirements

- JupyterLab >= 3.0
- JupyterLab >= 4.0

## Install

Expand Down
15 changes: 11 additions & 4 deletions app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,21 @@ async function main() {
require('@jupyterlab/codemirror-extension').default.filter(({ id }) =>
[
'@jupyterlab/codemirror-extension:services',
'@jupyterlab/codemirror-extension:codemirror'
'@jupyterlab/codemirror-extension:codemirror',
'@jupyterlab/codemirror-extension:languages',
'@jupyterlab/codemirror-extension:extensions',
'@jupyterlab/codemirror-extension:themes'
].includes(id)
),
require('@jupyterlab/docmanager-extension').default.filter(({ id }) =>
['@jupyterlab/docmanager-extension:plugin'].includes(id)
[
'@jupyterlab/docmanager-extension:plugin',
'@jupyterlab/docmanager-extension:manager',
'@jupyterlab/docmanager-extension:opener'
].includes(id)
),
require('@jupyterlab/docprovider-extension'),
require('@jupyterlab/mathjax2-extension'),
require('@jupyterlab/mathjax-extension'),
require('@jupyterlab/markedparser-extension'),
require('@jupyterlab/notebook-extension').default.filter(({ id }) =>
[
'@jupyterlab/notebook-extension:factory',
Expand Down
91 changes: 46 additions & 45 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,55 +12,56 @@
"watch": "webpack --config ./webpack.config.watch.js"
},
"resolutions": {
"@jupyterlab/application-extension": "^3.0.0",
"@jupyterlab/apputils-extension": "^3.0.0",
"@jupyterlab/codemirror-extension": "^3.0.0",
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/docmanager-extension": "^3.0.0",
"@jupyterlab/docprovider-extension": "^3.0.0",
"@jupyterlab/javascript-extension": "^3.0.0",
"@jupyterlab/json-extension": "^3.0.0",
"@jupyterlab/mathjax2-extension": "^3.0.0",
"@jupyterlab/notebook-extension": "^3.0.0",
"@jupyterlab/outputarea": "^3.0.0",
"@jupyterlab/pdf-extension": "^3.0.0",
"@jupyterlab/rendermime-extension": "^3.0.0",
"@jupyterlab/shortcuts-extension": "^3.0.0",
"@jupyterlab/translation-extension": "^3.0.0",
"@jupyterlab/vega5-extension": "^3.0.0",
"@lumino/application": "^1.25.0",
"@lumino/domutils": "^1.7.0",
"@lumino/dragdrop": "^1.12.0",
"@lumino/properties": "^1.7.0",
"@lumino/virtualdom": "^1.13.0",
"@jupyterlab/application-extension": "^4.0.2",
"@jupyterlab/apputils-extension": "^4.0.2",
"@jupyterlab/codemirror-extension": "^4.0.2",
"@jupyterlab/coreutils": "^6.0.2",
"@jupyterlab/docmanager-extension": "^4.0.2",
"@jupyterlab/fileeditor": "^4.0.2",
"@jupyterlab/javascript-extension": "^4.0.2",
"@jupyterlab/json-extension": "^4.0.2",
"@jupyterlab/mathjax-extension": "^4.0.2",
"@jupyterlab/markedparser-extension": "^4.0.2",
"@jupyterlab/notebook-extension": "^4.0.2",
"@jupyterlab/outputarea": "^4.0.2",
"@jupyterlab/pdf-extension": "^4.0.2",
"@jupyterlab/rendermime-extension": "^4.0.2",
"@jupyterlab/shortcuts-extension": "^4.0.2",
"@jupyterlab/translation-extension": "^4.0.2",
"@jupyterlab/vega5-extension": "^4.0.2",
"@lumino/application": "^2.0.1",
"@lumino/domutils": "^2.0.0",
"@lumino/dragdrop": "^2.0.0",
"@lumino/properties": "^2.0.0",
"@lumino/virtualdom": "^2.0.0",
"jupyterlab-rise-application": "~0.1.0",
"react": "~17.0.2",
"react-dom": "~17.0.2",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"yjs": "~13.5.10"
},
"dependencies": {
"@jupyterlab/application-extension": "^3.0.0",
"@jupyterlab/apputils-extension": "^3.0.0",
"@jupyterlab/codemirror-extension": "^3.0.0",
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/docmanager-extension": "^3.0.0",
"@jupyterlab/docprovider-extension": "^3.0.0",
"@jupyterlab/javascript-extension": "^3.0.0",
"@jupyterlab/json-extension": "^3.0.0",
"@jupyterlab/mathjax2-extension": "^3.0.0",
"@jupyterlab/notebook-extension": "^3.0.0",
"@jupyterlab/pdf-extension": "^3.0.0",
"@jupyterlab/rendermime-extension": "^3.0.0",
"@jupyterlab/shortcuts-extension": "^3.0.0",
"@jupyterlab/theme-dark-extension": "^3.0.0",
"@jupyterlab/theme-light-extension": "^3.0.0",
"@jupyterlab/translation-extension": "^3.0.0",
"@jupyterlab/vega5-extension": "^3.0.0",
"@jupyterlab/application-extension": "^4.0.2",
"@jupyterlab/apputils-extension": "^4.0.2",
"@jupyterlab/codemirror-extension": "^4.0.2",
"@jupyterlab/coreutils": "^6.0.2",
"@jupyterlab/docmanager-extension": "^4.0.2",
"@jupyterlab/javascript-extension": "^4.0.2",
"@jupyterlab/json-extension": "^4.0.2",
"@jupyterlab/markedparser-extension": "^4.0.2",
"@jupyterlab/mathjax-extension": "^4.0.2",
"@jupyterlab/notebook-extension": "^4.0.2",
"@jupyterlab/pdf-extension": "^4.0.2",
"@jupyterlab/rendermime-extension": "^4.0.2",
"@jupyterlab/shortcuts-extension": "^4.0.2",
"@jupyterlab/theme-dark-extension": "^4.0.2",
"@jupyterlab/theme-light-extension": "^4.0.2",
"@jupyterlab/translation-extension": "^4.0.2",
"@jupyterlab/vega5-extension": "^4.0.2",
"jupyterlab-rise-application": "^0.2.1"
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/buildutils": "^3.0.0",
"@jupyterlab/builder": "^4.0.2",
"@jupyterlab/buildutils": "^4.0.2",
"@types/rimraf": "^3.0.0",
"css-loader": "~5.0.1",
"file-loader": "~5.0.2",
Expand All @@ -71,6 +72,7 @@
"playwright": "^1.12.3",
"raw-loader": "~4.0.0",
"rimraf": "~3.0.2",
"source-map-loader": "^4.0.1",
"style-loader": "~1.0.1",
"svg-url-loader": "~6.0.0",
"url-loader": "~4.1.1",
Expand All @@ -89,10 +91,10 @@
"@jupyterlab/codemirror-extension",
"@jupyterlab/coreutils",
"@jupyterlab/docmanager-extension",
"@jupyterlab/docprovider-extension",
"@jupyterlab/javascript-extension",
"@jupyterlab/json-extension",
"@jupyterlab/mathjax2-extension",
"@jupyterlab/mathjax-extension",
"@jupyterlab/markedparser-extension",
"@jupyterlab/notebook-extension",
"@jupyterlab/pdf-extension",
"@jupyterlab/rendermime-extension",
Expand All @@ -111,7 +113,6 @@
"@jupyterlab/codeeditor",
"@jupyterlab/coreutils",
"@jupyterlab/docmanager",
"@jupyterlab/docprovider",
"@jupyterlab/filebrowser",
"@jupyterlab/fileeditor",
"@jupyterlab/mainmenu",
Expand Down
2 changes: 1 addition & 1 deletion binder/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ channels:

dependencies:
# runtime dependencies
- jupyterlab >=3,<4.0.0a0
- jupyterlab >=4,<5.0.0a0
# labextension build dependencies
- nodejs >=18,<19
- pip
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"workspaces": {
"packages": [
"app",
"ui-tests",
"packages/*"
]
},
Expand Down Expand Up @@ -41,7 +42,6 @@
"build": "lerna run build",
"build:prod": "lerna run build:prod",
"clean": "lerna run clean",
"install": "lerna bootstrap",
"eslint": "jlpm eslint:check --fix",
"eslint:check": "eslint . --cache --ext .ts,.tsx",
"lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
Expand Down Expand Up @@ -73,6 +73,6 @@
"stylelint-config-recommended": "^13.0.0",
"stylelint-config-standard": "~34.0.0",
"ts-jest": "^26.0.0",
"typescript": "~4.3.0"
"typescript": "~5.0.4"
}
}
}
36 changes: 18 additions & 18 deletions packages/application/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@
"watch": "tsc -b --watch --preserveWatchOutput"
},
"dependencies": {
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/cells": "^3.0.0",
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/docmanager": "^3.0.0",
"@jupyterlab/docregistry": "^3.0.0",
"@jupyterlab/mathjax2": "^3.0.0",
"@jupyterlab/notebook": "^3.0.0",
"@jupyterlab/rendermime-interfaces": "^3.0.0",
"@jupyterlab/services": "^6.0.0",
"@jupyterlab/settingregistry": "^3.0.0",
"@jupyterlab/theme-light-extension": "^3.0.0",
"@lumino/commands": "^1.17.0",
"@lumino/messaging": "^1.9.0",
"@lumino/signaling": "^1.9.0",
"@lumino/widgets": "^1.28.0",
"@jupyterlab/application": "^4.0.2",
"@jupyterlab/apputils": "^4.0.2",
"@jupyterlab/cells": "^4.0.2",
"@jupyterlab/coreutils": "^6.0.2",
"@jupyterlab/docmanager": "^4.0.2",
"@jupyterlab/docregistry": "^4.0.2",
"@jupyterlab/mathjax2": "^4.0.0-alpha.21",
"@jupyterlab/notebook": "^4.0.2",
"@jupyterlab/rendermime-interfaces": "^3.8.3",
"@jupyterlab/services": "^6.0.2",
"@jupyterlab/settingregistry": "^4.0.2",
"@jupyterlab/theme-light-extension": "^4.0.2",
"@lumino/commands": "^2.0.1",
"@lumino/messaging": "^2.0.0",
"@lumino/signaling": "^2.0.0",
"@lumino/widgets": "^2.0.1",
"reveal.js": "^4.4.0",
"reveal.js-plugins": "^4.1.5"
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/builder": "^4.0.2",
"@types/codemirror": "^5.60.7",
"@types/reveal.js": "^4.3.0",
"@typescript-eslint/eslint-plugin": "^6.1.0",
Expand All @@ -67,7 +67,7 @@
"npm-run-all": "^4.1.5",
"prettier": "^3.0.0",
"rimraf": "^3.0.2",
"typescript": "~4.3.0"
"typescript": "~5.0.4"
},
"sideEffects": [
"style/*.css",
Expand Down
5 changes: 2 additions & 3 deletions packages/application/src/app/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { createRendermimePlugins } from '@jupyterlab/application/lib/mimerendere
import { PageConfig } from '@jupyterlab/coreutils';
import { DocumentRegistry } from '@jupyterlab/docregistry';
import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
import { IIterator, iter } from '@lumino/algorithm';
import { Token } from '@lumino/coreutils';
import { Message } from '@lumino/messaging';
import { Signal, ISignal } from '@lumino/signaling';
Expand Down Expand Up @@ -84,8 +83,8 @@ export class RiseShell extends Widget implements JupyterFrontEnd.IShell {
*
* @param area - Optional regions in the shell whose widgets are iterated.
*/
widgets(area?: string): IIterator<Widget> {
return iter((this.layout as BoxLayout).widgets);
*widgets(area?: string): IterableIterator<Widget> {
yield* (this.layout as BoxLayout).widgets;
}

/**
Expand Down
Loading
Loading