From a7a23ee17322987259c7cc475aaf6d91801b0852 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 18:09:50 +0530 Subject: [PATCH 01/10] Move dependencies from root to base --- package.json | 15 --------------- packages/base/package.json | 13 +++++++++++++ yarn.lock | 26 +++++++++++++------------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index a6a185de1..bf4eca437 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" } } diff --git a/packages/base/package.json b/packages/base/package.json index 4ac3f6d5d..952a85bb6 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -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.17.1", "@jupyter/ydoc": "^2.0.0 || ^3.0.0", "@jupytergis/schema": "^0.2.1", "@jupyterlab/application": "^4.3.0", @@ -61,13 +65,22 @@ "@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/proj4": "^2.5.5", "@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", diff --git a/yarn.lock b/yarn.lock index 2ea7ca4e6..ea3d06e07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -753,6 +753,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.17.1 "@jupyter/ydoc": ^2.0.0 || ^3.0.0 "@jupytergis/schema": ^0.2.1 "@jupyterlab/application": ^4.3.0 @@ -776,16 +780,25 @@ __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 @@ -898,29 +911,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 From 1332d8a37b07ae8abe9ebf3f8c99008661d1a802 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 18:33:27 +0530 Subject: [PATCH 02/10] add "@jupyter/react-components" to jgis_lab --- python/jupytergis_lab/package.json | 1 + yarn.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/python/jupytergis_lab/package.json b/python/jupytergis_lab/package.json index 7cf68bbe6..83c445924 100644 --- a/python/jupytergis_lab/package.json +++ b/python/jupytergis_lab/package.json @@ -53,6 +53,7 @@ }, "dependencies": { "@jupyter/collaborative-drive": "^3.0.0", + "@jupyter/react-components": "^0.17.1", "@jupytergis/base": "^0.2.1", "@jupytergis/jupytergis-core": "^0.2.1", "@jupytergis/schema": "^0.2.1", diff --git a/yarn.lock b/yarn.lock index ea3d06e07..1340538be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -849,6 +849,7 @@ __metadata: resolution: "@jupytergis/jupytergis-lab@workspace:python/jupytergis_lab" dependencies: "@jupyter/collaborative-drive": ^3.0.0 + "@jupyter/react-components": ^0.17.1 "@jupytergis/base": ^0.2.1 "@jupytergis/jupytergis-core": ^0.2.1 "@jupytergis/schema": ^0.2.1 From 5ca4815f259b8e375e3221eefb619243def39a77 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 18:47:15 +0530 Subject: [PATCH 03/10] pin `@jupyter/react-components` to `0.16.6` --- packages/base/package.json | 2 +- python/jupytergis_lab/package.json | 2 +- yarn.lock | 26 ++------------------------ 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/packages/base/package.json b/packages/base/package.json index 952a85bb6..3e27699ca 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -41,7 +41,7 @@ "@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", + "@jupyter/react-components": "^0.16.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0", "@jupytergis/schema": "^0.2.1", "@jupyterlab/application": "^4.3.0", diff --git a/python/jupytergis_lab/package.json b/python/jupytergis_lab/package.json index 83c445924..2a14f51c1 100644 --- a/python/jupytergis_lab/package.json +++ b/python/jupytergis_lab/package.json @@ -53,7 +53,7 @@ }, "dependencies": { "@jupyter/collaborative-drive": "^3.0.0", - "@jupyter/react-components": "^0.17.1", + "@jupyter/react-components": "^0.16.6", "@jupytergis/base": "^0.2.1", "@jupytergis/jupytergis-core": "^0.2.1", "@jupytergis/schema": "^0.2.1", diff --git a/yarn.lock b/yarn.lock index 1340538be..a65c0820a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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" @@ -756,7 +734,7 @@ __metadata: "@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 + "@jupyter/react-components": ^0.16.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0 "@jupytergis/schema": ^0.2.1 "@jupyterlab/application": ^4.3.0 @@ -849,7 +827,7 @@ __metadata: resolution: "@jupytergis/jupytergis-lab@workspace:python/jupytergis_lab" dependencies: "@jupyter/collaborative-drive": ^3.0.0 - "@jupyter/react-components": ^0.17.1 + "@jupyter/react-components": ^0.16.6 "@jupytergis/base": ^0.2.1 "@jupytergis/jupytergis-core": ^0.2.1 "@jupytergis/schema": ^0.2.1 From bb4727798575f18889a153bb7cfb129d23bb81bc Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 19:00:29 +0530 Subject: [PATCH 04/10] Bump jupyterlite version --- .github/workflows/build.yml | 4 ++-- docs/environment-docs.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe3b1faf5..f727c91f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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.5.0,<0.6.0 + - jupyterlite-xeus>=2,<3 jupyterlite-sphinx sphinx sphinx-tabs diff --git a/docs/environment-docs.yml b/docs/environment-docs.yml index dc1636b6e..c8e882b2d 100644 --- a/docs/environment-docs.yml +++ b/docs/environment-docs.yml @@ -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.5.0,<0.6.0 + - jupyterlite-xeus>=2,<3 - jupyterlite-sphinx - sphinx - sphinx-tabs From b0c2af1ebd3172b133bca0e22e205c132c202209 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 19:03:31 +0530 Subject: [PATCH 05/10] update jupyterlite version --- .github/workflows/build.yml | 2 +- docs/environment-docs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f727c91f1..f984c90aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -262,7 +262,7 @@ jobs: create-args: >- python=3.10 pip - - jupyterlite-core>=0.5.0,<0.6.0 + - jupyterlite-core>=0.4.0,<0.6.0 - jupyterlite-xeus>=2,<3 jupyterlite-sphinx sphinx diff --git a/docs/environment-docs.yml b/docs/environment-docs.yml index c8e882b2d..73129c7a4 100644 --- a/docs/environment-docs.yml +++ b/docs/environment-docs.yml @@ -7,7 +7,7 @@ dependencies: - pip # Needed to install jupytergis wheels in RTD build # Build docs & JupyterLite - - jupyterlite-core>=0.5.0,<0.6.0 + - jupyterlite-core>=0.4.0,<0.6.0 - jupyterlite-xeus>=2,<3 - jupyterlite-sphinx - sphinx From db98a849846aff151f9dd7321743d89e7634caab Mon Sep 17 00:00:00 2001 From: martinRenou Date: Tue, 14 Jan 2025 14:35:43 +0100 Subject: [PATCH 06/10] Fix formatting issue --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f984c90aa..e6551dc65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -262,8 +262,8 @@ jobs: create-args: >- python=3.10 pip - - jupyterlite-core>=0.4.0,<0.6.0 - - jupyterlite-xeus>=2,<3 + jupyterlite-core>=0.4.0,<0.6.0 + jupyterlite-xeus>=2,<3 jupyterlite-sphinx sphinx sphinx-tabs From 2ee30c79490a0bc26cc98f96fdca17e2007f256c Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 19:20:42 +0530 Subject: [PATCH 07/10] move types to devdependencies --- packages/base/package.json | 9 ++++----- yarn.lock | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/base/package.json b/packages/base/package.json index 3e27699ca..64666a9c0 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -65,10 +65,6 @@ "@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/proj4": "^2.5.5", - "@types/three": "^0.134.0", "ajv": "^8.14.0", "colormap": "^2.3.2", "d3-color": "^3.1.0", @@ -90,9 +86,12 @@ }, "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/three": "^0.134.0", "@types/uuid": "^10.0.0", "rimraf": "^3.0.2", "typescript": "^5" diff --git a/yarn.lock b/yarn.lock index a65c0820a..a6433c502 100644 --- a/yarn.lock +++ b/yarn.lock @@ -763,7 +763,7 @@ __metadata: "@types/node": ^18.15.11 "@types/proj4": ^2.5.5 "@types/shpjs": ^3.4.7 - "@types/three": ^0.135.0 + "@types/three": ^0.134.0 "@types/uuid": ^10.0.0 ajv: ^8.14.0 colormap: ^2.3.2 @@ -2948,10 +2948,10 @@ __metadata: languageName: node linkType: hard -"@types/three@npm:^0.135.0": - version: 0.135.0 - resolution: "@types/three@npm:0.135.0" - checksum: 85977e55cc3d7a14be88816a50bcec4eb0f141876d3cdc6dd7870f72122605af87462d7583e950cd0ee6ab21949b8c1b8304a88174d536648deb8ef97968fa1b +"@types/three@npm:^0.134.0": + version: 0.134.0 + resolution: "@types/three@npm:0.134.0" + checksum: 4dc0463b3833fb81ac3645af47404349af6a0e69e3dae37ae9e84dc1ac237689d77c28a6066375e85665191d037843f4adc22d345ab8fe90a5008591f78e86d1 languageName: node linkType: hard From 4a983e934f487645a3768b75227e56b0678321d0 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 19:22:39 +0530 Subject: [PATCH 08/10] three types not needed --- packages/base/package.json | 1 - yarn.lock | 8 -------- 2 files changed, 9 deletions(-) diff --git a/packages/base/package.json b/packages/base/package.json index 64666a9c0..28f257007 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -91,7 +91,6 @@ "@types/node": "^18.15.11", "@types/proj4": "^2.5.5", "@types/shpjs": "^3.4.7", - "@types/three": "^0.134.0", "@types/uuid": "^10.0.0", "rimraf": "^3.0.2", "typescript": "^5" diff --git a/yarn.lock b/yarn.lock index a6433c502..58af1cd3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -763,7 +763,6 @@ __metadata: "@types/node": ^18.15.11 "@types/proj4": ^2.5.5 "@types/shpjs": ^3.4.7 - "@types/three": ^0.134.0 "@types/uuid": ^10.0.0 ajv: ^8.14.0 colormap: ^2.3.2 @@ -2948,13 +2947,6 @@ __metadata: languageName: node linkType: hard -"@types/three@npm:^0.134.0": - version: 0.134.0 - resolution: "@types/three@npm:0.134.0" - checksum: 4dc0463b3833fb81ac3645af47404349af6a0e69e3dae37ae9e84dc1ac237689d77c28a6066375e85665191d037843f4adc22d345ab8fe90a5008591f78e86d1 - languageName: node - linkType: hard - "@types/uuid@npm:^10.0.0": version: 10.0.0 resolution: "@types/uuid@npm:10.0.0" From abbab73d8de4c09ea884a5e11dcaeb1361d86a13 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 19:23:32 +0530 Subject: [PATCH 09/10] also not needed --- python/jupytergis_lab/package.json | 1 - yarn.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/python/jupytergis_lab/package.json b/python/jupytergis_lab/package.json index 2a14f51c1..7cf68bbe6 100644 --- a/python/jupytergis_lab/package.json +++ b/python/jupytergis_lab/package.json @@ -53,7 +53,6 @@ }, "dependencies": { "@jupyter/collaborative-drive": "^3.0.0", - "@jupyter/react-components": "^0.16.6", "@jupytergis/base": "^0.2.1", "@jupytergis/jupytergis-core": "^0.2.1", "@jupytergis/schema": "^0.2.1", diff --git a/yarn.lock b/yarn.lock index 58af1cd3a..198f181fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -826,7 +826,6 @@ __metadata: resolution: "@jupytergis/jupytergis-lab@workspace:python/jupytergis_lab" dependencies: "@jupyter/collaborative-drive": ^3.0.0 - "@jupyter/react-components": ^0.16.6 "@jupytergis/base": ^0.2.1 "@jupytergis/jupytergis-core": ^0.2.1 "@jupytergis/schema": ^0.2.1 From 8c9bef43dd41aced63bd05989b89a5e1b52902b1 Mon Sep 17 00:00:00 2001 From: arjxn-py Date: Tue, 14 Jan 2025 19:24:19 +0530 Subject: [PATCH 10/10] also not needed --- python/jupytergis_lab/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/python/jupytergis_lab/package.json b/python/jupytergis_lab/package.json index 7cf68bbe6..b119dc7ca 100644 --- a/python/jupytergis_lab/package.json +++ b/python/jupytergis_lab/package.json @@ -121,10 +121,6 @@ "yjs-widgets": { "singleton": true, "bundled": false - }, - "@jupyter/react-components": { - "singleton": true, - "bundled": true } } }