From 8721378e8204adb020bf6bcb1328c87c36202e9f Mon Sep 17 00:00:00 2001 From: Techassi Date: Fri, 6 Nov 2026 13:58:58 +0100 Subject: [PATCH 1/2] fix(superset): Pin d3-selection to 3.0.0 Cherry-pick of 71e564cf0149b53541b1edb97608e2055008494a (#1735). --- CHANGELOG.md | 2 ++ .../0004-Pin-d3-selection-to-3.0.0.patch | 28 +++++++++++++++++ ...-Re-generate-package-lock.json-file.patch} | 31 ++++++++++++------- 3 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 superset/stackable/patches/4.1.4/0004-Pin-d3-selection-to-3.0.0.patch rename superset/stackable/patches/4.1.4/{0004-Re-generate-package-lock.json-file.patch => 0005-Re-generate-package-lock.json-file.patch} (83%) diff --git a/CHANGELOG.md b/CHANGELOG.md index df8c42560..7607a31e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,11 @@ All notable changes to this project will be documented in this file. ### Fixed +- superset: Fix the broken 4.1.4 build by pinning the d3-selection package to 3.0.0 ([#xxxx]). - spark: Propagate the entrypoint's exit code so failed applications are no longer reported as successful ([#1595]). [#1595]: https://github.com/stackabletech/docker-images/pull/1595 +[#xxxx]: https://github.com/stackabletech/docker-images/pull/xxxx ## [26.7.0] - 2026-07-21 diff --git a/superset/stackable/patches/4.1.4/0004-Pin-d3-selection-to-3.0.0.patch b/superset/stackable/patches/4.1.4/0004-Pin-d3-selection-to-3.0.0.patch new file mode 100644 index 000000000..967752e79 --- /dev/null +++ b/superset/stackable/patches/4.1.4/0004-Pin-d3-selection-to-3.0.0.patch @@ -0,0 +1,28 @@ +From b0c6c5a565a7d20e7497bddc0f1e251b2b2881ec Mon Sep 17 00:00:00 2001 +From: Techassi +Date: Fri, 6 Nov 2026 11:50:59 +0100 +Subject: Pin d3-selection to 3.0.0 + +--- + superset-frontend/package.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/superset-frontend/package.json b/superset-frontend/package.json +index bc2746107eda6131155c9de8f37cc6b34bbe0af4..f6dd7ba565b09d9cd13f6082b22e7880507e712e 100644 +--- a/superset-frontend/package.json ++++ b/superset-frontend/package.json +@@ -131,6 +131,7 @@ + "classnames": "^2.2.5", + "core-js": "^3.37.1", + "d3-scale": "^2.1.2", ++ "d3-selection": "3.0.0", + "dom-to-image-more": "^3.2.0", + "dom-to-pdf": "^0.3.2", + "emotion-rgba": "0.0.12", +@@ -374,4 +375,4 @@ + "allowTopLevel": true + }, + "_id": "superset@0.0.0-dev" +-} +\ No newline at end of file ++} diff --git a/superset/stackable/patches/4.1.4/0004-Re-generate-package-lock.json-file.patch b/superset/stackable/patches/4.1.4/0005-Re-generate-package-lock.json-file.patch similarity index 83% rename from superset/stackable/patches/4.1.4/0004-Re-generate-package-lock.json-file.patch rename to superset/stackable/patches/4.1.4/0005-Re-generate-package-lock.json-file.patch index b6a8aa5b6..7c60754c8 100644 --- a/superset/stackable/patches/4.1.4/0004-Re-generate-package-lock.json-file.patch +++ b/superset/stackable/patches/4.1.4/0005-Re-generate-package-lock.json-file.patch @@ -1,15 +1,16 @@ -From 9df113e76d522299762d4e9a3dcea4b5a54a732f Mon Sep 17 00:00:00 2001 +From 2442668fc0730ca478d2ebcc53f94a5a30677e2d Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 8 Apr 2026 13:11:03 +0200 Subject: Re-generate package-lock.json file This file was re-generated using npm 10.8.2 and Node 20.20.2. +The command used was: npm install --package-lock-only --- - superset-frontend/package-lock.json | 56 +++++++++++++++++++++++++---- - 1 file changed, 49 insertions(+), 7 deletions(-) + superset-frontend/package-lock.json | 57 +++++++++++++++++++++++++---- + 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json -index a137adab3..9329cb321 100644 +index a137adab3012c0bc669f57219d22c403c4e5a318..0f8fbee6ed14f2c7bcec87ec9eadd98d3e7fc889 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -1,12 +1,12 @@ @@ -27,7 +28,15 @@ index a137adab3..9329cb321 100644 "license": "Apache-2.0", "workspaces": [ "packages/*", -@@ -83,7 +83,7 @@ +@@ -66,6 +66,7 @@ + "classnames": "^2.2.5", + "core-js": "^3.37.1", + "d3-scale": "^2.1.2", ++ "d3-selection": "3.0.0", + "dom-to-image-more": "^3.2.0", + "dom-to-pdf": "^0.3.2", + "emotion-rgba": "0.0.12", +@@ -83,7 +84,7 @@ "json-bigint": "^1.0.0", "json-stringify-pretty-compact": "^2.0.0", "lodash": "^4.17.21", @@ -36,7 +45,7 @@ index a137adab3..9329cb321 100644 "mapbox-gl": "^2.10.0", "markdown-to-jsx": "^7.4.7", "match-sorter": "^6.3.4", -@@ -14922,6 +14922,27 @@ +@@ -14922,6 +14923,27 @@ "optional": true, "peer": true }, @@ -64,7 +73,7 @@ index a137adab3..9329cb321 100644 "node_modules/@swc/types": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz", -@@ -73002,7 +73023,7 @@ +@@ -73002,7 +73024,7 @@ "@math.gl/core": "^3.5.0", "@probe.gl/env": "^3.5.0", "@probe.gl/stats": "^3.5.0", @@ -73,7 +82,7 @@ index a137adab3..9329cb321 100644 } }, "@luma.gl/experimental": { -@@ -73024,7 +73045,7 @@ +@@ -73024,7 +73046,7 @@ "@luma.gl/constants": "8.5.20", "@probe.gl/env": "^3.5.0", "@probe.gl/log": "^3.5.0", @@ -82,7 +91,7 @@ index a137adab3..9329cb321 100644 } }, "@luma.gl/shadertools": { -@@ -79374,6 +79395,27 @@ +@@ -79374,6 +79396,27 @@ "optional": true, "peer": true }, @@ -110,7 +119,7 @@ index a137adab3..9329cb321 100644 "@swc/types": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz", -@@ -95463,7 +95505,7 @@ +@@ -95463,7 +95506,7 @@ "pn": "^1.1.0", "request": "^2.87.0", "request-promise-native": "^1.0.5", @@ -119,7 +128,7 @@ index a137adab3..9329cb321 100644 "symbol-tree": "^3.2.2", "tough-cookie": "^2.3.4", "w3c-hr-time": "^1.0.1", -@@ -103564,7 +103606,7 @@ +@@ -103564,7 +103607,7 @@ "optional": true, "requires": { "iconv-lite": "^0.6.3", From 837bae14af761bb2fc82fe5f3d493ba99b77cc21 Mon Sep 17 00:00:00 2001 From: Techassi Date: Fri, 6 Nov 2026 14:07:35 +0100 Subject: [PATCH 2/2] chore: Update changelog link --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7607a31e8..fc98b849b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,11 @@ All notable changes to this project will be documented in this file. ### Fixed -- superset: Fix the broken 4.1.4 build by pinning the d3-selection package to 3.0.0 ([#xxxx]). +- superset: Fix the broken 4.1.4 build by pinning the d3-selection package to 3.0.0 ([#1736]). - spark: Propagate the entrypoint's exit code so failed applications are no longer reported as successful ([#1595]). [#1595]: https://github.com/stackabletech/docker-images/pull/1595 -[#xxxx]: https://github.com/stackabletech/docker-images/pull/xxxx +[#1736]: https://github.com/stackabletech/docker-images/pull/1736 ## [26.7.0] - 2026-07-21