From 5b8dbeb6d262e6e757dddce4c557dd68c07d17b4 Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Thu, 16 Nov 2023 13:03:58 +0100 Subject: [PATCH 1/9] Added @lumino dependencies. --- js/package.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/js/package.json b/js/package.json index 5654238e7..ac8636b49 100644 --- a/js/package.json +++ b/js/package.json @@ -28,6 +28,14 @@ }, "dependencies": { "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6", + "@lumino/algorithm": "^1.11.1", + "@lumino/coreutils": "^1.11.1", + "@lumino/disposable": "^1.10.1", + "@lumino/domutils": "^1.8.1", + "@lumino/messaging": "^1.10.1", + "@lumino/properties": "^1.8.1", + "@lumino/signaling": "^1.10.1", + "@lumino/widgets": "^1.30.0", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", "leaflet": "^1.7.1", From a0e6a425689fe04af8380b55a6a32f97da6acef4 Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Thu, 16 Nov 2023 14:29:09 +0100 Subject: [PATCH 2/9] Removed unused @lumino dependencies. --- js/package.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/js/package.json b/js/package.json index ac8636b49..0c3de3d8e 100644 --- a/js/package.json +++ b/js/package.json @@ -28,14 +28,8 @@ }, "dependencies": { "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6", - "@lumino/algorithm": "^1.11.1", - "@lumino/coreutils": "^1.11.1", - "@lumino/disposable": "^1.10.1", - "@lumino/domutils": "^1.8.1", - "@lumino/messaging": "^1.10.1", - "@lumino/properties": "^1.8.1", - "@lumino/signaling": "^1.10.1", - "@lumino/widgets": "^1.30.0", + "@lumino/messaging": "^1.10.1", + "@lumino/widgets": "^1.30.0", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", "leaflet": "^1.7.1", From fe3fd2fb785789899475af320666d6f9be819ee9 Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Fri, 17 Nov 2023 11:05:37 +0100 Subject: [PATCH 3/9] Updated webpack-cli version. --- js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index 0c3de3d8e..a50f3e5e3 100644 --- a/js/package.json +++ b/js/package.json @@ -67,7 +67,7 @@ "rimraf": "^2.6.1", "style-loader": "^1.1.2", "webpack": "^5", - "webpack-cli": "^3.3.10" + "webpack-cli": "^5.1.4" }, "jupyterlab": { "extension": "src/jupyterlab-plugin", From 27992081eb1186c69da5476c5a6e5f98bcc73a37 Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Fri, 17 Nov 2023 11:16:51 +0100 Subject: [PATCH 4/9] Changed @lumino dependencies to v2. --- js/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/package.json b/js/package.json index a50f3e5e3..41a2a31bc 100644 --- a/js/package.json +++ b/js/package.json @@ -28,8 +28,8 @@ }, "dependencies": { "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6", - "@lumino/messaging": "^1.10.1", - "@lumino/widgets": "^1.30.0", + "@lumino/messaging": "^2.1", + "@lumino/widgets": "^2.1", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", "leaflet": "^1.7.1", From b50a61e7d090a84a7868c377fcc4e0b04b3a81d3 Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Fri, 17 Nov 2023 11:27:02 +0100 Subject: [PATCH 5/9] Removed @lumino dependencies. --- js/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/package.json b/js/package.json index 41a2a31bc..be040402c 100644 --- a/js/package.json +++ b/js/package.json @@ -28,8 +28,6 @@ }, "dependencies": { "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6", - "@lumino/messaging": "^2.1", - "@lumino/widgets": "^2.1", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", "leaflet": "^1.7.1", From 48130424f894b448d92bcc4d604df3d5f84d8cb1 Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Fri, 17 Nov 2023 11:29:10 +0100 Subject: [PATCH 6/9] Fixed resize bug. Added if(!this.obj) return; for all branches. --- js/src/Map.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/Map.js b/js/src/Map.js index ceb1d50ff..eb1e37604 100644 --- a/js/src/Map.js +++ b/js/src/Map.js @@ -448,6 +448,7 @@ export class LeafletMapView extends utils.LeafletDOMWidgetView { _processLuminoMessage(msg, _super) { _super.call(this, msg); + if(!this.obj) return; switch (msg.type) { case 'resize': // We set the dirty flag to true to prevent the sub-pixel error @@ -468,7 +469,6 @@ export class LeafletMapView extends utils.LeafletDOMWidgetView { this.dirty = true; // If we are in a jupyter-widget tab, we get an after-show before // this.displayed is resolved. In this case, obj is not created yet. - if(!this.obj) return; this.obj.invalidateSize({ animate: false, pan: true, From 5725f90ed7ffb4f98d2209cfbd19ce15fc52993a Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Fri, 17 Nov 2023 11:37:59 +0100 Subject: [PATCH 7/9] Updated @jupyterlab/builder version. --- js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index be040402c..a0482e856 100644 --- a/js/package.json +++ b/js/package.json @@ -50,7 +50,7 @@ "stream-browserify": "^3.0.0" }, "devDependencies": { - "@jupyterlab/builder": "^3.6.0", + "@jupyterlab/builder": "^4.0.8", "css-loader": "^3.4.2", "eslint": "^8.23.1", "eslint-config-prettier": "^8.5.0", From 54953a8b7fdccdcc4e2a2bb6574571da111bc3d0 Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Fri, 17 Nov 2023 13:44:05 +0100 Subject: [PATCH 8/9] Updated @jupyterlab/builder dependency. From 5b01ded7359215ebb0a10c7631ee150a14b8b533 Mon Sep 17 00:00:00 2001 From: Daniel Wiell Date: Fri, 17 Nov 2023 14:03:05 +0100 Subject: [PATCH 9/9] Updated jupyterlab python version. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e743f19b1..49d220848 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,4 +1,4 @@ [build-system] # avoid 3.6 so we don't need the rust buildchain -requires = ["jupyter_packaging~=0.12", "jupyterlab~=3.6.0", "setuptools>=40.8.0", "wheel"] +requires = ["jupyter_packaging~=0.12", "jupyterlab~=4.0.8", "setuptools>=40.8.0", "wheel"] build-backend = "setuptools.build_meta"