Skip to content

Move dependencies from root to dependent package + Update JupyterLite in lite build #333

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

Merged
martinRenou merged 10 commits into from
Jan 14, 2025
Merged

Move dependencies from root to dependent package + Update JupyterLite in lite build #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a7a23ee
Move dependencies from root to base
arjxn-py Jan 14, 2025
1332d8a
add "@jupyter/react-components" to jgis_lab
arjxn-py Jan 14, 2025
5ca4815
pin `@jupyter/react-components` to `0.16.6`
arjxn-py Jan 14, 2025
bb47277
Bump jupyterlite version
arjxn-py Jan 14, 2025
b0c2af1
update jupyterlite version
arjxn-py Jan 14, 2025
db98a84
Fix formatting issue
martinRenou Jan 14, 2025
2ee30c7
move types to devdependencies
arjxn-py Jan 14, 2025
4a983e9
three types not needed
arjxn-py Jan 14, 2025
abbab73
also not needed
arjxn-py Jan 14, 2025
8c9bef4
also not needed
arjxn-py Jan 14, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ jobs:
create-args: >-
python=3.10
pip
jupyterlite-core>=0.2.0,<0.3.0
jupyterlite-xeus>=0.1.2,<0.2
jupyterlite-core>=0.4.0,<0.6.0
jupyterlite-xeus>=2,<3
jupyterlite-sphinx
sphinx
sphinx-tabs
Expand Down
4 changes: 2 additions & 2 deletions docs/environment-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ dependencies:
- pip # Needed to install jupytergis wheels in RTD build

# Build docs & JupyterLite
- jupyterlite-core>=0.2.0,<0.3.0
- jupyterlite-xeus>=0.1.2,<0.2
- jupyterlite-core>=0.4.0,<0.6.0
- jupyterlite-xeus>=2,<3
- jupyterlite-sphinx
- sphinx
- sphinx-tabs
Expand Down
15 changes: 0 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@
"@jupyterlab/services": " ^7.0.0"
},
"devDependencies": {
"@types/colormap": "^2.3.4",
"@types/proj4": "^2.5.5",
"@types/webpack-env": "^1.18.5",
"@typescript-eslint/eslint-plugin": "5.55.0",
"@typescript-eslint/parser": "5.55.0",
Expand All @@ -73,18 +71,5 @@
"rimraf": "^3.0.2",
"typescript": "^5",
"webpack": "^5.76.3"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "latest",
"@jupyter/react-components": "^0.17.1",
"colormap": "^2.3.2",
"geojson-vt": "^4.0.2",
"geotiff": "^2.1.3",
"ol": "^10.1.0",
"pmtiles": "^3.0.7",
"proj4": "^2.14.0",
"proj4-list": "^1.0.2"
}
}
17 changes: 14 additions & 3 deletions packages/base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@
"watch": "tsc -w"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "latest",
"@jupyter/react-components": "^0.16.6",
"@jupyter/ydoc": "^2.0.0 || ^3.0.0",
"@jupytergis/schema": "^0.2.1",
"@jupyterlab/application": "^4.3.0",
Expand All @@ -61,13 +65,18 @@
"@naisutech/react-tree": "^3.0.1",
"@rjsf/core": "^4.2.0",
"@rjsf/validator-ajv8": "^5.23.1",
"@types/d3-color": "^3.1.0",
"@types/three": "^0.134.0",
"ajv": "^8.14.0",
"colormap": "^2.3.2",
"d3-color": "^3.1.0",
"gdal3.js": "^2.8.1",
"geojson-vt": "^4.0.2",
"geotiff": "^2.1.3",
"ol": "^10.1.0",
"ol-pmtiles": "^0.5.0",
"pbf": "^4.0.1",
"pmtiles": "^3.0.7",
"proj4": "^2.14.0",
"proj4-list": "^1.0.2",
"react": "^18.0.1",
"shpjs": "^6.1.0",
"styled-components": "^5.3.6",
Expand All @@ -77,9 +86,11 @@
},
"devDependencies": {
"@apidevtools/json-schema-ref-parser": "^9.0.9",
"@types/colormap": "^2.3.4",
"@types/d3-color": "^3.1.0",
"@types/node": "^18.15.11",
"@types/proj4": "^2.5.5",
"@types/shpjs": "^3.4.7",
"@types/three": "^0.135.0",
"@types/uuid": "^10.0.0",
"rimraf": "^3.0.2",
"typescript": "^5"
Expand Down
4 changes: 0 additions & 4 deletions python/jupytergis_lab/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,6 @@
"yjs-widgets": {
"singleton": true,
"bundled": false
},
"@jupyter/react-components": {
"singleton": true,
"bundled": true
}
}
}
Expand Down
56 changes: 13 additions & 43 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,16 +700,6 @@ __metadata:
languageName: node
linkType: hard

"@jupyter/react-components@npm:^0.17.1":
version: 0.17.1
resolution: "@jupyter/react-components@npm:0.17.1"
dependencies:
"@jupyter/web-components": ^0.17.1
react: ">=17.0.0 <19.0.0"
checksum: 1c8b5d3a814c0c372ea21ae5544dcd6f021aecfa8168fa44c34a9364ea10ad539ff4791d524b3803be3fbe55d33a0e76576c6f715999d324ca437f289662e099
languageName: node
linkType: hard

"@jupyter/web-components@npm:^0.16.6, @jupyter/web-components@npm:^0.16.7":
version: 0.16.7
resolution: "@jupyter/web-components@npm:0.16.7"
Expand All @@ -722,18 +712,6 @@ __metadata:
languageName: node
linkType: hard

"@jupyter/web-components@npm:^0.17.1":
version: 0.17.1
resolution: "@jupyter/web-components@npm:0.17.1"
dependencies:
"@microsoft/fast-colors": ^5.3.1
"@microsoft/fast-element": ^1.12.0
"@microsoft/fast-foundation": ^2.49.4
"@microsoft/fast-web-utilities": ^5.4.1
checksum: 51fd643aa7ef27a482ee19a53845d71aaf80b8b4a88437a2733519e975a394959b84a65d5415c5fb56acf18bf06b788680a0f06b6118a938bebbda6561dc5fb7
languageName: node
linkType: hard

"@jupyter/ydoc@npm:^2.0.0 || ^3.0.0, @jupyter/ydoc@npm:^2.0.0 || ^3.0.0-a3, @jupyter/ydoc@npm:^3.0.0":
version: 3.0.2
resolution: "@jupyter/ydoc@npm:3.0.2"
Expand All @@ -753,6 +731,10 @@ __metadata:
resolution: "@jupytergis/base@workspace:packages/base"
dependencies:
"@apidevtools/json-schema-ref-parser": ^9.0.9
"@fortawesome/fontawesome-svg-core": ^6.5.2
"@fortawesome/free-solid-svg-icons": ^6.5.2
"@fortawesome/react-fontawesome": latest
"@jupyter/react-components": ^0.16.6
"@jupyter/ydoc": ^2.0.0 || ^3.0.0
"@jupytergis/schema": ^0.2.1
"@jupyterlab/application": ^4.3.0
Expand All @@ -776,16 +758,24 @@ __metadata:
"@naisutech/react-tree": ^3.0.1
"@rjsf/core": ^4.2.0
"@rjsf/validator-ajv8": ^5.23.1
"@types/colormap": ^2.3.4
"@types/d3-color": ^3.1.0
"@types/node": ^18.15.11
"@types/proj4": ^2.5.5
"@types/shpjs": ^3.4.7
"@types/three": ^0.135.0
"@types/uuid": ^10.0.0
ajv: ^8.14.0
colormap: ^2.3.2
d3-color: ^3.1.0
gdal3.js: ^2.8.1
geojson-vt: ^4.0.2
geotiff: ^2.1.3
ol: ^10.1.0
ol-pmtiles: ^0.5.0
pbf: ^4.0.1
pmtiles: ^3.0.7
proj4: ^2.14.0
proj4-list: ^1.0.2
react: ^18.0.1
rimraf: ^3.0.2
shpjs: ^6.1.0
Expand Down Expand Up @@ -898,29 +888,16 @@ __metadata:
version: 0.0.0-use.local
resolution: "@jupytergis/jupytergis-root@workspace:."
dependencies:
"@fortawesome/fontawesome-svg-core": ^6.5.2
"@fortawesome/free-solid-svg-icons": ^6.5.2
"@fortawesome/react-fontawesome": latest
"@jupyter/react-components": ^0.17.1
"@types/colormap": ^2.3.4
"@types/proj4": ^2.5.5
"@types/webpack-env": ^1.18.5
"@typescript-eslint/eslint-plugin": 5.55.0
"@typescript-eslint/parser": 5.55.0
colormap: ^2.3.2
copy-webpack-plugin: ^10.0.0
eslint: ^8.36.0
eslint-config-prettier: ^8.8.0
eslint-plugin-prettier: ^5.0.1
geojson-vt: ^4.0.2
geotiff: ^2.1.3
lerna: ^8.1.9
npm-run-all: ^4.1.5
ol: ^10.1.0
pmtiles: ^3.0.7
prettier: ^3.0.0
proj4: ^2.14.0
proj4-list: ^1.0.2
rimraf: ^3.0.2
typescript: ^5
webpack: ^5.76.3
Expand Down Expand Up @@ -2969,13 +2946,6 @@ __metadata:
languageName: node
linkType: hard

"@types/three@npm:^0.135.0":
version: 0.135.0
resolution: "@types/three@npm:0.135.0"
checksum: 85977e55cc3d7a14be88816a50bcec4eb0f141876d3cdc6dd7870f72122605af87462d7583e950cd0ee6ab21949b8c1b8304a88174d536648deb8ef97968fa1b
languageName: node
linkType: hard

"@types/uuid@npm:^10.0.0":
version: 10.0.0
resolution: "@types/uuid@npm:10.0.0"
Expand Down
Loading