Skip to content

Commit

Permalink
Voila 0.5 migration (#89)
Browse files Browse the repository at this point in the history
* Link jupyterlite locally

* Using voila shell

* Using Voila theme manager

* Update mimerenderer

* Using VoilaApp

* Add `classic-tree` argument

* Improve CLI

* Pass extensionConfig to the frontend

* Bump voila

* Add python test

* Update webpack config

* Update to jupyterlite 0.2.0 alpha

* Embed all jupyterlab-manager plugins

* Update main file

* Update test

* update env

* Bump Jupyterlite

* Bump xeus-python

* Update packages/voici/src/main.ts

Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>

* Fix classic tree template

* Update snapshots

* Update Playwright Snapshots

* Update workflow

* Update packages/voici/src/plugins/widgets.ts

Co-authored-by: martinRenou <martin.renou@gmail.com>

* Update CI

---------

Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: martinRenou <martin.renou@gmail.com>
  • Loading branch information
4 people authored Sep 29, 2023
1 parent 0ddb0aa commit 8573f88
Show file tree
Hide file tree
Showing 43 changed files with 17,463 additions and 12,188 deletions.
26 changes: 19 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,23 @@ jobs:
python -m ruff check .
python -m black --check .
- name: Install voici
run: pip install .

- name: Install browser
run: |
yarn
yarn playwright install chromium
working-directory: ui-tests

- name: Build UI tests
run: yarn run build
working-directory: ui-tests
- name: Install dependencies and build tests
run: |
python -m pip install .
cd ui-tests
yarn install --immutable
yarn run build
- name: Voici Test
run: pytest tests/

- name: Test
- name: UI Test
run: yarn run test
working-directory: ui-tests

Expand All @@ -76,3 +79,12 @@ jobs:
with:
name: voici-test-report
path: ui-tests/playwright-report

- name: Upload voici assests
if: failure()
uses: actions/upload-artifact@v3
with:
name: voici-app
path: |
ui-tests/material
ui-tests/lite
2 changes: 1 addition & 1 deletion .github/workflows/update_playwright_references.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: |
python -m pip install .
cd ui-tests
yarn install --frozen-lockfile
yarn install --immutable
yarn run build
- uses: jupyterlab/maintainer-tools/.github/actions/update-snapshots@main
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ _output
ui-tests/lite
ui-tests/material
.jupyterlite.doit.db

.yarn/
3 changes: 3 additions & 0 deletions .yarnrc.yml
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
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Run the following command to build the demo site:
git clone https://github.com/voila-dashboards/voici
cd voici/demo

voici build --contents notebooks
voici notebooks
```

Then serve it!
Expand Down
4 changes: 2 additions & 2 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ dependencies:
- nodejs=18
- sphinx
- pydata-sphinx-theme
- yarn=1
- yarn=3
- pip:
- jupyterlite-xeus-python >= 0.9.0,<0.10.0
- jupyterlite-xeus-python >= 1.0.0a0
- sphinxcontrib-video
- ..
9 changes: 5 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ channels:
dependencies:
- pip
- black
- yarn=1
- pytest
- yarn=3
- nodejs=18
- pip:
- ruff==0.0.258
- voila==0.5.0a4
- voila==0.5.4
- voila-material>=0.4.3
- jupyterlite-core[lab]>=0.1.0,<0.2.0
- jupyterlite-xeus-python >= 0.9.0
- jupyterlite-core[lab]>=0.2.0a1,<0.3.0
- jupyterlite-xeus-python >= 1.0.0a0
106 changes: 53 additions & 53 deletions packages/voici/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,74 +4,74 @@
"description": "The Voici Frontend",
"author": "Voilà contributors",
"license": "BSD-3-Clause",
"main": "lib/index.js",
"main": "lib/main.js",
"browserslist": ">0.8%, not ie 11, not op_mini all, not dead",
"dependencies": {
"@jupyter-widgets/base": "^6.0.1",
"@jupyter-widgets/jupyterlab-manager": "^5.0.3",
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/apputils-extension": "^3.4.8",
"@jupyterlab/coreutils": "^5.0.0",
"@jupyterlab/docregistry": "^3.0.0",
"@jupyterlab/json-extension": "^3.0.0",
"@jupyterlab/logconsole": "^3.0.0",
"@jupyterlab/mainmenu": "^3.0.0",
"@jupyterlab/markdownviewer-extension": "^3.0.0",
"@jupyterlab/mathjax2-extension": "^3.0.0",
"@jupyterlab/nbconvert-css": "^3.4.8",
"@jupyterlab/nbformat": "^3.0.0",
"@jupyterlab/notebook": "^3.0.0",
"@jupyterlab/outputarea": "^3.0.0",
"@jupyterlab/rendermime": "^3.0.0",
"@jupyterlab/rendermime-extension": "^3.0.0",
"@jupyterlab/services": "^6.1.8",
"@jupyterlab/settingregistry": "^3.0.0",
"@jupyterlab/theme-dark-extension": "^3.4.8",
"@jupyterlab/theme-light-extension": "^3.4.8",
"@jupyterlab/translation": "^3.0.0",
"@jupyterlab/ui-components": "^3.0.0",
"@jupyterlite/contents": "^0.1.2",
"@jupyterlite/iframe-extension": "^0.1.2",
"@jupyterlite/kernel": "^0.1.2",
"@jupyterlite/server": "^0.1.2",
"@jupyterlite/server-extension": "^0.1.2",
"@lumino/algorithm": "^1.6.2",
"@lumino/application": "^1.31.3",
"@lumino/commands": "^1.15.2",
"@lumino/coreutils": "^1.8.2",
"@lumino/datagrid": "^0.36.0",
"@lumino/disposable": "^1.7.2",
"@lumino/domutils": "^1.5.2",
"@lumino/dragdrop": "^1.10.2",
"@lumino/keyboard": "^1.8.0",
"@lumino/messaging": "^1.7.2",
"@lumino/polling": "^1.11.4",
"@lumino/properties": "^1.5.2",
"@lumino/signaling": "^1.7.2",
"@lumino/virtualdom": "^1.11.2",
"@lumino/widgets": "^1.26.2",
"@voila-dashboards/voila": "^0.5.0-alpha.3",
"react": "^17.0.1",
"react-dom": "^17.0.1"
"@jupyter-widgets/base": "^6.0.5",
"@jupyter-widgets/jupyterlab-manager": "^5.0.8",
"@jupyterlab/application": "^4.0.0",
"@jupyterlab/apputils": "^4.0.0",
"@jupyterlab/apputils-extension": "^4.0.0",
"@jupyterlab/coreutils": "^6.0.0",
"@jupyterlab/docregistry": "^4.0.0",
"@jupyterlab/json-extension": "^4.0.0",
"@jupyterlab/logconsole": "^4.0.0",
"@jupyterlab/mainmenu": "^4.0.0",
"@jupyterlab/markdownviewer-extension": "^4.0.0",
"@jupyterlab/mathjax2-extension": "^4.0.0",
"@jupyterlab/nbconvert-css": "^4.0.0",
"@jupyterlab/nbformat": "^4.0.0",
"@jupyterlab/notebook": "^4.0.0",
"@jupyterlab/outputarea": "^4.0.0",
"@jupyterlab/rendermime": "^4.0.0",
"@jupyterlab/rendermime-extension": "^4.0.0",
"@jupyterlab/services": "^7.0.0",
"@jupyterlab/settingregistry": "^4.0.0",
"@jupyterlab/theme-dark-extension": "^4.0.0",
"@jupyterlab/theme-light-extension": "^4.0.0",
"@jupyterlab/translation": "^4.0.0",
"@jupyterlab/ui-components": "^4.0.0",
"@jupyterlite/contents": "^0.2.0-alpha.1",
"@jupyterlite/iframe-extension": "^0.2.0-alpha.1",
"@jupyterlite/kernel": "^0.2.0-alpha.1",
"@jupyterlite/server": "^0.2.0-alpha.1",
"@jupyterlite/server-extension": "^0.2.0-alpha.1",
"@lumino/algorithm": "^2.0.0",
"@lumino/application": "^2.0.0",
"@lumino/commands": "^2.0.0",
"@lumino/coreutils": "^2.0.0",
"@lumino/datagrid": "^2.0.0",
"@lumino/disposable": "^2.0.0",
"@lumino/domutils": "^2.0.0",
"@lumino/dragdrop": "^2.0.0",
"@lumino/keyboard": "^2.0.0",
"@lumino/messaging": "^2.0.0",
"@lumino/polling": "^2.0.0",
"@lumino/properties": "^2.0.0",
"@lumino/signaling": "^2.0.0",
"@lumino/virtualdom": "^2.0.0",
"@lumino/widgets": "^2.0.0",
"@voila-dashboards/voila": "^0.5.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/preset-env": "^7.3.1",
"@jupyterlab/builder": "^3.0.0",
"@types/node": "^18.8.3",
"@jupyterlab/builder": "^4.0.0",
"@types/node": "~18.8.3",
"babel-loader": "^8.0.5",
"css-loader": "~5.0.2",
"css-loader": "^6.7.2",
"file-loader": "^6.2.0",
"fs-extra": "^9.1.0",
"glob": "~7.1.6",
"ignore-loader": "^0.1.2",
"json-loader": "^0.5.7",
"mini-css-extract-plugin": "~0.9.0",
"mini-css-extract-plugin": "^1.3.9",
"p-limit": "^2.2.2",
"raw-loader": "^4.0.2",
"rimraf": "^3.0.2",
"style-loader": "^2.0.0",
"style-loader": "~3.3.1",
"svg-url-loader": "^7.1.1",
"tsc-watch": "^6.0.0",
"typescript": "~5.0.2",
Expand Down
Loading

0 comments on commit 8573f88

Please sign in to comment.