From 750113441cd0160ed53e918253a7256466028ac0 Mon Sep 17 00:00:00 2001 From: "Hugh A. Miles II" Date: Tue, 27 Jun 2023 12:12:03 -0700 Subject: [PATCH] chore: update d3-colors (#24505) --- superset-frontend/jest.config.js | 2 +- superset-frontend/package-lock.json | 53 +++++++++++++++++++++-------- superset-frontend/package.json | 3 +- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/superset-frontend/jest.config.js b/superset-frontend/jest.config.js index f667d9140253e..24e4886ecda43 100644 --- a/superset-frontend/jest.config.js +++ b/superset-frontend/jest.config.js @@ -51,7 +51,7 @@ module.exports = { moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'], snapshotSerializers: ['@emotion/jest/enzyme-serializer'], transformIgnorePatterns: [ - 'node_modules/(?!remark-gfm|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp)', + 'node_modules/(?!d3-(interpolate|color)|remark-gfm|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp)', ], globals: { __DEV__: true, diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index cca363b39ed8c..d2493fdb3ab36 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -68,7 +68,7 @@ "classnames": "^2.2.5", "core-js": "^3.6.5", "d3-array": "^1.2.4", - "d3-color": "^1.2.0", + "d3-color": "^3.1.0", "d3-scale": "^2.1.2", "dom-to-image-more": "^2.10.1", "emotion-rgba": "0.0.9", @@ -29590,9 +29590,12 @@ "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==" }, "node_modules/d3-color": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz", - "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "engines": { + "node": ">=12" + } }, "node_modules/d3-dispatch": { "version": "1.0.6", @@ -61490,6 +61493,11 @@ "internmap": "^1.0.0" } }, + "plugins/legacy-plugin-chart-world-map/node_modules/d3-color": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz", + "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" + }, "plugins/legacy-preset-chart-big-number": { "name": "@superset-ui/legacy-preset-chart-big-number", "version": "0.18.25", @@ -61540,6 +61548,11 @@ "react-map-gl": "^6.1.19" } }, + "plugins/legacy-preset-chart-deckgl/node_modules/d3-color": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz", + "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" + }, "plugins/legacy-preset-chart-deckgl/node_modules/d3-scale": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz", @@ -64766,7 +64779,7 @@ "requires": { "d3-array": "^1.2.0", "d3-collection": "1", - "d3-color": "1", + "d3-color": "^3.1.0", "d3-format": "1", "d3-interpolate": "1", "d3-time": "1", @@ -65738,7 +65751,7 @@ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", "requires": { - "d3-color": "1 - 2" + "d3-color": "^3.1.0" } }, "d3-scale": { @@ -77317,6 +77330,11 @@ "requires": { "internmap": "^1.0.0" } + }, + "d3-color": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz", + "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" } } }, @@ -77342,6 +77360,11 @@ "xss": "^1.0.10" }, "dependencies": { + "d3-color": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz", + "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" + }, "d3-scale": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz", @@ -79302,7 +79325,7 @@ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", "requires": { - "d3-color": "1 - 3" + "d3-color": "^3.1.0" } }, "d3-scale": { @@ -79611,7 +79634,7 @@ "requires": { "d3-array": "^1.2.0", "d3-collection": "1", - "d3-color": "1", + "d3-color": "^3.1.0", "d3-format": "1", "d3-interpolate": "1", "d3-time": "1", @@ -85162,9 +85185,9 @@ "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==" }, "d3-color": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz", - "integrity": "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==" }, "d3-dispatch": { "version": "1.0.6", @@ -85223,7 +85246,7 @@ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz", "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==", "requires": { - "d3-color": "1" + "d3-color": "^3.1.0" } }, "d3-interpolate-path": { @@ -85284,7 +85307,7 @@ "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz", "integrity": "sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==", "requires": { - "d3-color": "1 - 2", + "d3-color": "^3.1.0", "d3-interpolate": "1 - 2" } }, @@ -85339,7 +85362,7 @@ "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz", "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==", "requires": { - "d3-color": "1", + "d3-color": "^3.1.0", "d3-dispatch": "1", "d3-ease": "1", "d3-interpolate": "1", @@ -86390,7 +86413,7 @@ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", "requires": { - "d3-color": "1 - 2" + "d3-color": "^3.1.0" } }, "d3-scale": { diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 3c9f75572d567..8b44b3a61f2e1 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -133,7 +133,7 @@ "classnames": "^2.2.5", "core-js": "^3.6.5", "d3-array": "^1.2.4", - "d3-color": "^1.2.0", + "d3-color": "^3.1.0", "d3-scale": "^2.1.2", "dom-to-image-more": "^2.10.1", "emotion-rgba": "0.0.9", @@ -351,6 +351,7 @@ "npm": "^7.5.4 || ^8.1.2" }, "overrides": { + "d3-color": "^3.1.0", "yosay": { "ansi-regex": "^4.1.1" }