From f7ab21eb8b16a6b41cfbb27d8a38fdc76a49c112 Mon Sep 17 00:00:00 2001 From: Lily Kuang Date: Fri, 20 Jan 2023 15:58:33 -0800 Subject: [PATCH] chore: migrate @vx/responsive to @visx/responsive for react 18 upgrade --- superset-frontend/package-lock.json | 93 +++++++------------ superset-frontend/package.json | 2 +- .../DashboardBuilder/DashboardContainer.tsx | 2 +- 3 files changed, 34 insertions(+), 63 deletions(-) diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index bd990f5473aaa..472801654b859 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -50,7 +50,7 @@ "@superset-ui/plugin-chart-word-cloud": "file:./plugins/plugin-chart-word-cloud", "@superset-ui/preset-chart-xy": "file:./plugins/preset-chart-xy", "@superset-ui/switchboard": "file:./packages/superset-ui-switchboard", - "@vx/responsive": "^0.0.195", + "@visx/responsive": "^3.0.0", "abortcontroller-polyfill": "^1.1.9", "ace-builds": "^1.4.14", "antd": "4.10.3", @@ -21782,6 +21782,20 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@visx/responsive": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@visx/responsive/-/responsive-3.0.0.tgz", + "integrity": "sha512-immnxQwOWlrxbnlCIqJWuDpPfrM6tglgMTN1WsyXyGluLMJqhuuxqxllfXaRPkQFS4fcvs66KCEELdazh96U2w==", + "dependencies": { + "@types/lodash": "^4.14.172", + "@types/react": "*", + "lodash": "^4.17.21", + "prop-types": "^15.6.1" + }, + "peerDependencies": { + "react": "^16.0.0-0 || ^17.0.0-0 || ^18.0.0-0" + } + }, "node_modules/@vx/axis": { "version": "0.0.140", "resolved": "https://registry.npmjs.org/@vx/axis/-/axis-0.0.140.tgz", @@ -21923,9 +21937,9 @@ "integrity": "sha1-k7MltLlcnVuW33QPQgQBf1c5ZVk=" }, "node_modules/@vx/responsive": { - "version": "0.0.195", - "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.195.tgz", - "integrity": "sha512-3zjkjqg8V3Kr1moSI7EAzlW7MLR87p2CXc+qh0zZg/zLrc3C89JnxyMYFfS7jM4PlHr26n634YddQDVydwARBA==", + "version": "0.0.199", + "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.199.tgz", + "integrity": "sha512-ONrmLUAG+8wzD3cn/EmsuZh6JHeyejqup3ZsV25t04VaVJAVQAJukAfNdH8YiwSJu0zSo+txkBTfrnOmFyQLOw==", "dependencies": { "@types/lodash": "^4.14.146", "@types/react": "*", @@ -59342,21 +59356,6 @@ "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz", "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==" }, - "packages/superset-ui-core/node_modules/@vx/responsive": { - "version": "0.0.199", - "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.199.tgz", - "integrity": "sha512-ONrmLUAG+8wzD3cn/EmsuZh6JHeyejqup3ZsV25t04VaVJAVQAJukAfNdH8YiwSJu0zSo+txkBTfrnOmFyQLOw==", - "dependencies": { - "@types/lodash": "^4.14.146", - "@types/react": "*", - "lodash": "^4.17.10", - "prop-types": "^15.6.1", - "resize-observer-polyfill": "1.5.1" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, "packages/superset-ui-core/node_modules/d3-array": { "version": "2.12.1", "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", @@ -60340,21 +60339,6 @@ "react": "^16.3.0-0" } }, - "plugins/legacy-plugin-chart-histogram/node_modules/@vx/responsive": { - "version": "0.0.199", - "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.199.tgz", - "integrity": "sha512-ONrmLUAG+8wzD3cn/EmsuZh6JHeyejqup3ZsV25t04VaVJAVQAJukAfNdH8YiwSJu0zSo+txkBTfrnOmFyQLOw==", - "dependencies": { - "@types/lodash": "^4.14.146", - "@types/react": "*", - "lodash": "^4.17.10", - "prop-types": "^15.6.1", - "resize-observer-polyfill": "1.5.1" - }, - "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" - } - }, "plugins/legacy-plugin-chart-histogram/node_modules/@vx/scale": { "version": "0.0.197", "resolved": "https://registry.npmjs.org/@vx/scale/-/scale-0.0.197.tgz", @@ -75654,18 +75638,6 @@ "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz", "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==" }, - "@vx/responsive": { - "version": "0.0.199", - "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.199.tgz", - "integrity": "sha512-ONrmLUAG+8wzD3cn/EmsuZh6JHeyejqup3ZsV25t04VaVJAVQAJukAfNdH8YiwSJu0zSo+txkBTfrnOmFyQLOw==", - "requires": { - "@types/lodash": "^4.14.146", - "@types/react": "*", - "lodash": "^4.17.10", - "prop-types": "^15.6.1", - "resize-observer-polyfill": "1.5.1" - } - }, "d3-array": { "version": "2.12.1", "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", @@ -76383,18 +76355,6 @@ "prop-types": "^15.5.10" } }, - "@vx/responsive": { - "version": "0.0.199", - "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.199.tgz", - "integrity": "sha512-ONrmLUAG+8wzD3cn/EmsuZh6JHeyejqup3ZsV25t04VaVJAVQAJukAfNdH8YiwSJu0zSo+txkBTfrnOmFyQLOw==", - "requires": { - "@types/lodash": "^4.14.146", - "@types/react": "*", - "lodash": "^4.17.10", - "prop-types": "^15.6.1", - "resize-observer-polyfill": "1.5.1" - } - }, "@vx/scale": { "version": "0.0.197", "resolved": "https://registry.npmjs.org/@vx/scale/-/scale-0.0.197.tgz", @@ -78408,6 +78368,17 @@ "eslint-visitor-keys": "^3.0.0" } }, + "@visx/responsive": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@visx/responsive/-/responsive-3.0.0.tgz", + "integrity": "sha512-immnxQwOWlrxbnlCIqJWuDpPfrM6tglgMTN1WsyXyGluLMJqhuuxqxllfXaRPkQFS4fcvs66KCEELdazh96U2w==", + "requires": { + "@types/lodash": "^4.14.172", + "@types/react": "*", + "lodash": "^4.17.21", + "prop-types": "^15.6.1" + } + }, "@vx/axis": { "version": "0.0.140", "resolved": "https://registry.npmjs.org/@vx/axis/-/axis-0.0.140.tgz", @@ -78524,9 +78495,9 @@ "integrity": "sha1-k7MltLlcnVuW33QPQgQBf1c5ZVk=" }, "@vx/responsive": { - "version": "0.0.195", - "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.195.tgz", - "integrity": "sha512-3zjkjqg8V3Kr1moSI7EAzlW7MLR87p2CXc+qh0zZg/zLrc3C89JnxyMYFfS7jM4PlHr26n634YddQDVydwARBA==", + "version": "0.0.199", + "resolved": "https://registry.npmjs.org/@vx/responsive/-/responsive-0.0.199.tgz", + "integrity": "sha512-ONrmLUAG+8wzD3cn/EmsuZh6JHeyejqup3ZsV25t04VaVJAVQAJukAfNdH8YiwSJu0zSo+txkBTfrnOmFyQLOw==", "requires": { "@types/lodash": "^4.14.146", "@types/react": "*", diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 80116d4eb045e..e50b6701b0798 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -114,7 +114,7 @@ "@superset-ui/plugin-chart-word-cloud": "file:./plugins/plugin-chart-word-cloud", "@superset-ui/preset-chart-xy": "file:./plugins/preset-chart-xy", "@superset-ui/switchboard": "file:./packages/superset-ui-switchboard", - "@vx/responsive": "^0.0.195", + "@visx/responsive": "^3.0.0", "abortcontroller-polyfill": "^1.1.9", "ace-builds": "^1.4.14", "antd": "4.10.3", diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx index a98a419ac63df..386d96266a099 100644 --- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx +++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx @@ -28,7 +28,7 @@ import { isFeatureEnabled, SupersetClient, } from '@superset-ui/core'; -import { ParentSize } from '@vx/responsive'; +import { ParentSize } from '@visx/responsive'; import pick from 'lodash/pick'; import Tabs from 'src/components/Tabs'; import DashboardGrid from 'src/dashboard/containers/DashboardGrid';