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

WebPack tweaks for fonts, licenses, Windows #557

Merged
merged 13 commits into from
Mar 16, 2022
Merged

WebPack tweaks for fonts, licenses, Windows #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
57a33c1
start mime
bollwyvl Mar 15, 2022
90bcd29
Update to JupyterLab 3.3.2 packages
jtpio Mar 15, 2022
6d810d8
Bump jupyterlab Python package
jtpio Mar 15, 2022
ab8b211
Merge remote-tracking branch 'jtpio/update-lab' into gh-550-webpack-v…
bollwyvl Mar 15, 2022
4f19c1c
resolve examples
bollwyvl Mar 15, 2022
f48c640
hack upstream rules, no licenses on windows
bollwyvl Mar 16, 2022
b834a08
add a windows dev CI job
bollwyvl Mar 16, 2022
f30a8e4
more work on windows dev
bollwyvl Mar 16, 2022
f25ad87
add cache_epoch to win dev
bollwyvl Mar 16, 2022
d27361f
try json-loader for windows
bollwyvl Mar 16, 2022
e813170
configure git on windows
bollwyvl Mar 16, 2022
7d713b8
linting
bollwyvl Mar 16, 2022
8d75047
overload CI environment variable on win-dev
bollwyvl Mar 16, 2022
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: 1 addition & 1 deletion .binder/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- twine
# demo stuff
- jupyter-server-proxy
- jupyterlab >=3.3.0,<4
- jupyterlab >=3.3.2,<4
- retrolab >=0.3.20,<0.4
# extra docs tools
- sphinx-autobuild
Expand Down
50 changes: 50 additions & 0 deletions .github/workflows/win-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Windows Dev

on:
push:
branches:
- main
pull_request:
branches:
- '*'

env:
CACHE_EPOCH: 1
CI: 0

jobs:
win-dev:
runs-on: windows-latest
defaults:
run:
shell: cmd /C CALL {0}
steps:
- name: Set git to use LF
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout
uses: actions/checkout@v2
- name: Conda
uses: conda-incubator/setup-miniconda@v2
with:
environment-file: .binder/environment.yml
miniforge-variant: Mambaforge
use-mamba: true
- name: Cache (node_modules)
uses: actions/cache@v2
id: cache-node-modules
with:
path: node_modules/
key: |
${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
- name: Node
run: doit setup:js || doit setup:js || doit setup:js
- name: Build
run: doit build
- name: Dist
run: doit dist
- name: Dev
run: doit dev
- name: Lint
run: doit lint || doit lint || doit lint
204 changes: 102 additions & 102 deletions app/lab/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,72 +3,72 @@
"version": "0.1.0-beta.2",
"private": true,
"resolutions": {
"@jupyterlab/application": "~3.3.0",
"@jupyterlab/application-extension": "~3.3.0",
"@jupyterlab/apputils": "~3.3.0",
"@jupyterlab/apputils-extension": "~3.3.0",
"@jupyterlab/celltags-extension": "~3.3.0",
"@jupyterlab/codeeditor": "~3.3.0",
"@jupyterlab/codemirror": "~3.3.0",
"@jupyterlab/codemirror-extension": "~3.3.0",
"@jupyterlab/completer": "~3.3.0",
"@jupyterlab/completer-extension": "~3.3.0",
"@jupyterlab/console": "~3.3.0",
"@jupyterlab/console-extension": "~3.3.0",
"@jupyterlab/coreutils": "~5.3.0",
"@jupyterlab/csvviewer-extension": "~3.3.0",
"@jupyterlab/docmanager": "~3.3.0",
"@jupyterlab/docmanager-extension": "~3.3.0",
"@jupyterlab/docprovider": "~3.3.0",
"@jupyterlab/documentsearch": "~3.3.0",
"@jupyterlab/filebrowser": "~3.3.0",
"@jupyterlab/filebrowser-extension": "~3.3.0",
"@jupyterlab/fileeditor": "~3.3.0",
"@jupyterlab/fileeditor-extension": "~3.3.0",
"@jupyterlab/help-extension": "~3.3.0",
"@jupyterlab/htmlviewer-extension": "~3.3.0",
"@jupyterlab/imageviewer": "~3.3.0",
"@jupyterlab/imageviewer-extension": "~3.3.0",
"@jupyterlab/inspector": "~3.3.0",
"@jupyterlab/inspector-extension": "~3.3.0",
"@jupyterlab/javascript-extension": "~3.3.0",
"@jupyterlab/json-extension": "~3.3.0",
"@jupyterlab/launcher": "~3.3.0",
"@jupyterlab/launcher-extension": "~3.3.0",
"@jupyterlab/logconsole": "~3.3.0",
"@jupyterlab/logconsole-extension": "~3.3.0",
"@jupyterlab/mainmenu": "~3.3.0",
"@jupyterlab/mainmenu-extension": "~3.3.0",
"@jupyterlab/markdownviewer": "~3.3.0",
"@jupyterlab/markdownviewer-extension": "~3.3.0",
"@jupyterlab/mathjax2-extension": "~3.3.0",
"@jupyterlab/notebook": "~3.3.0",
"@jupyterlab/notebook-extension": "~3.3.0",
"@jupyterlab/outputarea": "~3.3.0",
"@jupyterlab/pdf-extension": "~3.3.0",
"@jupyterlab/rendermime": "~3.3.0",
"@jupyterlab/rendermime-extension": "~3.3.0",
"@jupyterlab/rendermime-interfaces": "~3.3.0",
"@jupyterlab/running-extension": "~3.3.0",
"@jupyterlab/services": "~6.3.0",
"@jupyterlab/settingeditor": "~3.3.0",
"@jupyterlab/settingeditor-extension": "~3.3.0",
"@jupyterlab/settingregistry": "~3.3.0",
"@jupyterlab/shared-models": "~3.3.0",
"@jupyterlab/shortcuts-extension": "~3.3.0",
"@jupyterlab/statedb": "~3.3.0",
"@jupyterlab/statusbar": "~3.3.0",
"@jupyterlab/statusbar-extension": "~3.3.0",
"@jupyterlab/theme-dark-extension": "~3.3.0",
"@jupyterlab/theme-light-extension": "~3.3.0",
"@jupyterlab/toc-extension": "~5.3.0",
"@jupyterlab/tooltip": "~3.3.0",
"@jupyterlab/tooltip-extension": "~3.3.0",
"@jupyterlab/translation": "~3.3.0",
"@jupyterlab/translation-extension": "~3.3.0",
"@jupyterlab/ui-components": "~3.3.0",
"@jupyterlab/ui-components-extension": "~3.3.0",
"@jupyterlab/vega5-extension": "~3.3.0",
"@jupyterlab/application": "~3.3.2",
"@jupyterlab/application-extension": "~3.3.2",
"@jupyterlab/apputils": "~3.3.2",
"@jupyterlab/apputils-extension": "~3.3.2",
"@jupyterlab/celltags-extension": "~3.3.2",
"@jupyterlab/codeeditor": "~3.3.2",
"@jupyterlab/codemirror": "~3.3.2",
"@jupyterlab/codemirror-extension": "~3.3.2",
"@jupyterlab/completer": "~3.3.2",
"@jupyterlab/completer-extension": "~3.3.2",
"@jupyterlab/console": "~3.3.2",
"@jupyterlab/console-extension": "~3.3.2",
"@jupyterlab/coreutils": "~5.3.2",
"@jupyterlab/csvviewer-extension": "~3.3.2",
"@jupyterlab/docmanager": "~3.3.2",
"@jupyterlab/docmanager-extension": "~3.3.2",
"@jupyterlab/docprovider": "~3.3.2",
"@jupyterlab/documentsearch": "~3.3.2",
"@jupyterlab/filebrowser": "~3.3.2",
"@jupyterlab/filebrowser-extension": "~3.3.2",
"@jupyterlab/fileeditor": "~3.3.2",
"@jupyterlab/fileeditor-extension": "~3.3.2",
"@jupyterlab/help-extension": "~3.3.2",
"@jupyterlab/htmlviewer-extension": "~3.3.2",
"@jupyterlab/imageviewer": "~3.3.2",
"@jupyterlab/imageviewer-extension": "~3.3.2",
"@jupyterlab/inspector": "~3.3.2",
"@jupyterlab/inspector-extension": "~3.3.2",
"@jupyterlab/javascript-extension": "~3.3.2",
"@jupyterlab/json-extension": "~3.3.2",
"@jupyterlab/launcher": "~3.3.2",
"@jupyterlab/launcher-extension": "~3.3.2",
"@jupyterlab/logconsole": "~3.3.2",
"@jupyterlab/logconsole-extension": "~3.3.2",
"@jupyterlab/mainmenu": "~3.3.2",
"@jupyterlab/mainmenu-extension": "~3.3.2",
"@jupyterlab/markdownviewer": "~3.3.2",
"@jupyterlab/markdownviewer-extension": "~3.3.2",
"@jupyterlab/mathjax2-extension": "~3.3.2",
"@jupyterlab/notebook": "~3.3.2",
"@jupyterlab/notebook-extension": "~3.3.2",
"@jupyterlab/outputarea": "~3.3.2",
"@jupyterlab/pdf-extension": "~3.3.2",
"@jupyterlab/rendermime": "~3.3.2",
"@jupyterlab/rendermime-extension": "~3.3.2",
"@jupyterlab/rendermime-interfaces": "~3.3.2",
"@jupyterlab/running-extension": "~3.3.2",
"@jupyterlab/services": "~6.3.2",
"@jupyterlab/settingeditor": "~3.3.2",
"@jupyterlab/settingeditor-extension": "~3.3.2",
"@jupyterlab/settingregistry": "~3.3.2",
"@jupyterlab/shared-models": "~3.3.2",
"@jupyterlab/shortcuts-extension": "~3.3.2",
"@jupyterlab/statedb": "~3.3.2",
"@jupyterlab/statusbar": "~3.3.2",
"@jupyterlab/statusbar-extension": "~3.3.2",
"@jupyterlab/theme-dark-extension": "~3.3.2",
"@jupyterlab/theme-light-extension": "~3.3.2",
"@jupyterlab/toc-extension": "~5.3.2",
"@jupyterlab/tooltip": "~3.3.2",
"@jupyterlab/tooltip-extension": "~3.3.2",
"@jupyterlab/translation": "~3.3.2",
"@jupyterlab/translation-extension": "~3.3.2",
"@jupyterlab/ui-components": "~3.3.2",
"@jupyterlab/ui-components-extension": "~3.3.2",
"@jupyterlab/vega5-extension": "~3.3.2",
"@jupyterlite/application-extension": "~0.1.0-beta.2",
"@jupyterlite/iframe-extension": "~0.1.0-beta.2",
"@jupyterlite/javascript-kernel": "~0.1.0-beta.2",
Expand Down Expand Up @@ -99,42 +99,42 @@
"yjs": "^13.5.28"
},
"dependencies": {
"@jupyterlab/application": "~3.3.0",
"@jupyterlab/application-extension": "~3.3.0",
"@jupyterlab/apputils-extension": "~3.3.0",
"@jupyterlab/celltags-extension": "~3.3.0",
"@jupyterlab/codemirror-extension": "~3.3.0",
"@jupyterlab/completer-extension": "~3.3.0",
"@jupyterlab/console-extension": "~3.3.0",
"@jupyterlab/csvviewer-extension": "~3.3.0",
"@jupyterlab/docmanager-extension": "~3.3.0",
"@jupyterlab/filebrowser-extension": "~3.3.0",
"@jupyterlab/fileeditor-extension": "~3.3.0",
"@jupyterlab/help-extension": "~3.3.0",
"@jupyterlab/htmlviewer-extension": "~3.3.0",
"@jupyterlab/imageviewer-extension": "~3.3.0",
"@jupyterlab/inspector-extension": "~3.3.0",
"@jupyterlab/javascript-extension": "~3.3.0",
"@jupyterlab/json-extension": "~3.3.0",
"@jupyterlab/launcher-extension": "~3.3.0",
"@jupyterlab/logconsole-extension": "~3.3.0",
"@jupyterlab/mainmenu-extension": "~3.3.0",
"@jupyterlab/markdownviewer-extension": "~3.3.0",
"@jupyterlab/mathjax2-extension": "~3.3.0",
"@jupyterlab/notebook-extension": "~3.3.0",
"@jupyterlab/pdf-extension": "~3.3.0",
"@jupyterlab/rendermime-extension": "~3.3.0",
"@jupyterlab/running-extension": "~3.3.0",
"@jupyterlab/settingeditor-extension": "~3.3.0",
"@jupyterlab/shortcuts-extension": "~3.3.0",
"@jupyterlab/statusbar-extension": "~3.3.0",
"@jupyterlab/theme-dark-extension": "~3.3.0",
"@jupyterlab/theme-light-extension": "~3.3.0",
"@jupyterlab/toc-extension": "~5.3.0",
"@jupyterlab/tooltip-extension": "~3.3.0",
"@jupyterlab/translation-extension": "~3.3.0",
"@jupyterlab/ui-components-extension": "~3.3.0",
"@jupyterlab/vega5-extension": "~3.3.0",
"@jupyterlab/application": "~3.3.2",
"@jupyterlab/application-extension": "~3.3.2",
"@jupyterlab/apputils-extension": "~3.3.2",
"@jupyterlab/celltags-extension": "~3.3.2",
"@jupyterlab/codemirror-extension": "~3.3.2",
"@jupyterlab/completer-extension": "~3.3.2",
"@jupyterlab/console-extension": "~3.3.2",
"@jupyterlab/csvviewer-extension": "~3.3.2",
"@jupyterlab/docmanager-extension": "~3.3.2",
"@jupyterlab/filebrowser-extension": "~3.3.2",
"@jupyterlab/fileeditor-extension": "~3.3.2",
"@jupyterlab/help-extension": "~3.3.2",
"@jupyterlab/htmlviewer-extension": "~3.3.2",
"@jupyterlab/imageviewer-extension": "~3.3.2",
"@jupyterlab/inspector-extension": "~3.3.2",
"@jupyterlab/javascript-extension": "~3.3.2",
"@jupyterlab/json-extension": "~3.3.2",
"@jupyterlab/launcher-extension": "~3.3.2",
"@jupyterlab/logconsole-extension": "~3.3.2",
"@jupyterlab/mainmenu-extension": "~3.3.2",
"@jupyterlab/markdownviewer-extension": "~3.3.2",
"@jupyterlab/mathjax2-extension": "~3.3.2",
"@jupyterlab/notebook-extension": "~3.3.2",
"@jupyterlab/pdf-extension": "~3.3.2",
"@jupyterlab/rendermime-extension": "~3.3.2",
"@jupyterlab/running-extension": "~3.3.2",
"@jupyterlab/settingeditor-extension": "~3.3.2",
"@jupyterlab/shortcuts-extension": "~3.3.2",
"@jupyterlab/statusbar-extension": "~3.3.2",
"@jupyterlab/theme-dark-extension": "~3.3.2",
"@jupyterlab/theme-light-extension": "~3.3.2",
"@jupyterlab/toc-extension": "~5.3.2",
"@jupyterlab/tooltip-extension": "~3.3.2",
"@jupyterlab/translation-extension": "~3.3.2",
"@jupyterlab/ui-components-extension": "~3.3.2",
"@jupyterlab/vega5-extension": "~3.3.2",
"@jupyterlite/application-extension": "^0.1.0-beta.2",
"@jupyterlite/iframe-extension": "^0.1.0-beta.2",
"@jupyterlite/javascript-kernel-extension": "^0.1.0-beta.2",
Expand Down
3 changes: 2 additions & 1 deletion app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"watch": "webpack --config webpack.config.watch.js"
},
"devDependencies": {
"@jupyterlab/builder": "^3.3.0",
"@jupyterlab/builder": "^3.3.2",
"css-loader": "^6.6.0",
"file-loader": "^6.2.0",
"fs-extra": "^9.0.1",
Expand All @@ -31,6 +31,7 @@
"rimraf": "^3.0.2",
"style-loader": "^3.3.1",
"svg-url-loader": "^7.1.1",
"json-loader": "^0.5.7",
"url-loader": "^4.1.1",
"webpack": "^5.68.0",
"webpack-bundle-analyzer": "^4.5.0",
Expand Down
Loading