Merge branch 'master' into chore/update-frontend-deps

chore: skip Jest transform for ESM-only json-stringify-pretty-compact and type-cast for MemoizedFunction type in test
Signed-off-by: hainenber <dotronghai96@gmail.com>
2026-05-02 22:44:28 +00:00 · 2026-03-23 07:01:36 +07:00 · 2026-03-22 23:28:17 +07:00 · 2026-03-22 23:01:20 +07:00
7 changed files with 45 additions and 92 deletions
--- a/superset-frontend/jest.config.js
+++ b/superset-frontend/jest.config.js
@@ -69,7 +69,7 @@ module.exports = {
  ],
  coverageReporters: ['lcov', 'json-summary', 'html', 'text'],
  transformIgnorePatterns: [
-    'node_modules/(?!d3-(array|interpolate|color|time|scale|time-format|format)|internmap|@mapbox/tiny-sdf|remark-gfm|(?!@ngrx|(?!deck.gl)|d3-scale)|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp|nanoid|uuid|@rjsf/*.|echarts|zrender|fetch-mock|pretty-ms|parse-ms|ol|@babel/runtime|@emotion|cheerio|cheerio/lib|parse5|dom-serializer|entities|htmlparser2|rehype-sanitize|hast-util-sanitize|unified|unist-.*|hast-.*|rehype-.*|remark-.*|mdast-.*|micromark-.*|parse-entities|property-information|space-separated-tokens|comma-separated-tokens|bail|devlop|zwitch|longest-streak|geostyler|geostyler-.*|(?!geostyler)lodash|react-error-boundary|react-json-tree|react-base16-styling|lodash-es|rbush|quickselect|react-diff-viewer-continued)',
+    'node_modules/(?!d3-(array|interpolate|color|time|scale|time-format|format)|internmap|@mapbox/tiny-sdf|remark-gfm|(?!@ngrx|(?!deck.gl)|d3-scale)|markdown-table|micromark-*.|decode-named-character-reference|character-entities|mdast-util-*.|unist-util-*.|ccount|escape-string-regexp|nanoid|uuid|@rjsf/*.|echarts|zrender|fetch-mock|pretty-ms|parse-ms|ol|@babel/runtime|@emotion|cheerio|cheerio/lib|parse5|dom-serializer|entities|htmlparser2|rehype-sanitize|hast-util-sanitize|unified|unist-.*|hast-.*|rehype-.*|remark-.*|mdast-.*|micromark-.*|parse-entities|property-information|space-separated-tokens|comma-separated-tokens|bail|devlop|zwitch|longest-streak|geostyler|geostyler-.*|(?!geostyler)lodash|react-error-boundary|react-json-tree|react-base16-styling|lodash-es|rbush|quickselect|react-diff-viewer-continued|json-stringify-pretty-compact)',
  ],
  preset: 'ts-jest',
  transform: {
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -100,12 +100,12 @@
        "jquery": "^4.0.0",
        "js-levenshtein": "^1.1.6",
        "json-bigint": "^1.0.0",
-        "json-stringify-pretty-compact": "^2.0.0",
+        "json-stringify-pretty-compact": "^4.0.0",
        "lodash": "^4.17.23",
        "mapbox-gl": "^3.20.0",
        "markdown-to-jsx": "^9.7.6",
        "match-sorter": "^8.2.0",
-        "memoize-one": "^5.2.1",
+        "memoize-one": "^6.0.0",
        "mousetrap": "^1.6.5",
        "mustache": "^4.2.0",
        "nanoid": "^5.1.6",
@@ -290,7 +290,7 @@
        "wait-on": "^9.0.4",
        "webpack": "^5.105.4",
        "webpack-bundle-analyzer": "^5.2.0",
-        "webpack-cli": "^6.0.1",
+        "webpack-cli": "^7.0.2",
        "webpack-dev-server": "^5.2.3",
        "webpack-manifest-plugin": "^5.0.1",
        "webpack-sources": "^3.3.4",
@@ -16931,53 +16931,6 @@
        "@xtuc/long": "4.2.2"
      }
    },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-3.0.1.tgz",
-      "integrity": "sha512-u8d0pJ5YFgneF/GuvEiDA61Tf1VDomHHYMjv/wc9XzYj7nopltpG96nXN5dJRstxZhcNpV1g+nT6CydO7pHbjA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.82.0",
-        "webpack-cli": "6.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/info": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-3.0.1.tgz",
-      "integrity": "sha512-coEmDzc2u/ffMvuW9aCjoRzNSPDl/XLuhPdlFRpT9tZHmJ/039az33CE7uH+8s0uL1j5ZNtfdv0HkfaKRBGJsQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.82.0",
-        "webpack-cli": "6.x.x"
-      }
-    },
-    "node_modules/@webpack-cli/serve": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-3.0.1.tgz",
-      "integrity": "sha512-sbgw03xQaCLiT6gcY/6u3qBDn01CWw/nbaXl3gTdTFuJJ75Gffv3E3DBpgvY2fkkrdS1fpjaXNOmJlnbtKauKg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.12.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.82.0",
-        "webpack-cli": "6.x.x"
-      },
-      "peerDependenciesMeta": {
-        "webpack-dev-server": {
-          "optional": true
-        }
-      }
-    },
    "node_modules/@xtuc/ieee754": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -33860,9 +33813,9 @@
      }
    },
    "node_modules/json-stringify-pretty-compact": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz",
-      "integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz",
+      "integrity": "sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==",
      "license": "MIT"
    },
    "node_modules/json-stringify-safe": {
@@ -36162,9 +36115,9 @@
      }
    },
    "node_modules/memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
      "license": "MIT"
    },
    "node_modules/memoizerific": {
@@ -41452,12 +41405,6 @@
        "js-yaml": "bin/js-yaml.js"
      }
    },
-    "node_modules/react-diff-viewer-continued/node_modules/memoize-one": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
-      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
-      "license": "MIT"
-    },
    "node_modules/react-dnd": {
      "version": "11.1.3",
      "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-11.1.3.tgz",
@@ -42040,6 +41987,12 @@
        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
      }
    },
+    "node_modules/react-window/node_modules/memoize-one": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==",
+      "license": "MIT"
+    },
    "node_modules/reactable": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/reactable/-/reactable-1.1.0.tgz",
@@ -49185,19 +49138,15 @@
      }
    },
    "node_modules/webpack-cli": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-6.0.1.tgz",
-      "integrity": "sha512-MfwFQ6SfwinsUVi0rNJm7rHZ31GyTcpVE5pgVA3hwFRb7COD4TzjUUwhGWKfO50+xdc2MQPuEBBJoqIMGt3JDw==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-7.0.2.tgz",
+      "integrity": "sha512-dB0R4T+C/8YuvM+fabdvil6QE44/ChDXikV5lOOkrUeCkW5hTJv2pGLE3keh+D5hjYw8icBaJkZzpFoaHV4T+g==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@discoveryjs/json-ext": "^0.6.1",
-        "@webpack-cli/configtest": "^3.0.1",
-        "@webpack-cli/info": "^3.0.1",
-        "@webpack-cli/serve": "^3.0.1",
-        "colorette": "^2.0.14",
-        "commander": "^12.1.0",
-        "cross-spawn": "^7.0.3",
+        "@discoveryjs/json-ext": "^1.0.0",
+        "commander": "^14.0.3",
+        "cross-spawn": "^7.0.6",
        "envinfo": "^7.14.0",
        "fastest-levenshtein": "^1.0.12",
        "import-local": "^3.0.2",
@@ -49209,14 +49158,16 @@
        "webpack-cli": "bin/cli.js"
      },
      "engines": {
-        "node": ">=18.12.0"
+        "node": ">=20.9.0"
      },
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/webpack"
      },
      "peerDependencies": {
-        "webpack": "^5.82.0"
+        "webpack": "^5.101.0",
+        "webpack-bundle-analyzer": "^4.0.0 || ^5.0.0",
+        "webpack-dev-server": "^5.0.0"
      },
      "peerDependenciesMeta": {
        "webpack-bundle-analyzer": {
@@ -49228,9 +49179,9 @@
      }
    },
    "node_modules/webpack-cli/node_modules/@discoveryjs/json-ext": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",
-      "integrity": "sha512-4B4OijXeVNOPZlYA2oEwWOTkzyltLao+xbotHQeqN++Rv27Y6s818+n2Qkp8q+Fxhn0t/5lA5X1Mxktud8eayQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-1.0.0.tgz",
+      "integrity": "sha512-dDlz3W405VMFO4w5kIP9DOmELBcvFQGmLoKSdIRstBDubKFYwaNHV1NnlzMCQpXQFGWVALmeMORAuiLx18AvZQ==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -49238,13 +49189,13 @@
      }
    },
    "node_modules/webpack-cli/node_modules/commander": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
-      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.3.tgz",
+      "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==",
      "dev": true,
      "license": "MIT",
      "engines": {
-        "node": ">=18"
+        "node": ">=20"
      }
    },
    "node_modules/webpack-cli/node_modules/envinfo": {
@@ -51122,7 +51073,7 @@
        "@testing-library/user-event": "*",
        "ace-builds": "^1.4.14",
        "brace": "^0.11.1",
-        "memoize-one": "^5.1.1",
+        "memoize-one": "^6.0.0",
        "react": "^17.0.2",
        "react-ace": "^10.1.0",
        "react-dom": "^17.0.2"
@@ -52528,7 +52479,7 @@
        "classnames": "^2.5.1",
        "d3-array": "^3.2.4",
        "lodash": "^4.17.23",
-        "memoize-one": "^5.2.1",
+        "memoize-one": "^6.0.0",
        "react-table": "^7.8.0",
        "regenerator-runtime": "^0.14.1",
        "xss": "^1.0.15"
@@ -52710,7 +52661,7 @@
        "classnames": "^2.5.1",
        "d3-array": "^3.2.4",
        "lodash": "^4.17.23",
-        "memoize-one": "^5.2.1",
+        "memoize-one": "^6.0.0",
        "react-icons": "5.4.0",
        "react-table": "^7.8.0",
        "regenerator-runtime": "^0.14.1",
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -181,12 +181,12 @@
    "jquery": "^4.0.0",
    "js-levenshtein": "^1.1.6",
    "json-bigint": "^1.0.0",
-    "json-stringify-pretty-compact": "^2.0.0",
+    "json-stringify-pretty-compact": "^4.0.0",
    "lodash": "^4.17.23",
    "mapbox-gl": "^3.20.0",
    "markdown-to-jsx": "^9.7.6",
    "match-sorter": "^8.2.0",
-    "memoize-one": "^5.2.1",
+    "memoize-one": "^6.0.0",
    "mousetrap": "^1.6.5",
    "mustache": "^4.2.0",
    "nanoid": "^5.1.6",
@@ -371,7 +371,7 @@
    "wait-on": "^9.0.4",
    "webpack": "^5.105.4",
    "webpack-bundle-analyzer": "^5.2.0",
-    "webpack-cli": "^6.0.1",
+    "webpack-cli": "^7.0.2",
    "webpack-dev-server": "^5.2.3",
    "webpack-manifest-plugin": "^5.0.1",
    "webpack-sources": "^3.3.4",
--- a/superset-frontend/packages/superset-ui-chart-controls/package.json
+++ b/superset-frontend/packages/superset-ui-chart-controls/package.json
@@ -40,7 +40,7 @@
    "@testing-library/user-event": "*",
    "ace-builds": "^1.4.14",
    "brace": "^0.11.1",
-    "memoize-one": "^5.1.1",
+    "memoize-one": "^6.0.0",
    "react": "^17.0.2",
    "react-ace": "^10.1.0",
    "react-dom": "^17.0.2"
--- a/superset-frontend/plugins/plugin-chart-ag-grid-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-ag-grid-table/package.json
@@ -29,7 +29,7 @@
    "classnames": "^2.5.1",
    "d3-array": "^3.2.4",
    "lodash": "^4.17.23",
-    "memoize-one": "^5.2.1",
+    "memoize-one": "^6.0.0",
    "react-table": "^7.8.0",
    "regenerator-runtime": "^0.14.1",
    "xss": "^1.0.15"
--- a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.test.ts
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/transformProps.test.ts
@@ -234,7 +234,9 @@ describe('BigNumberTotal transformProps', () => {
  test('should propagate colorThresholdFormatters from getColorFormatters', () => {
    // Override the getColorFormatters mock to return specific value
    const mockFormatters = [{ formatter: 'red' }];
-    (getColorFormatters as jest.Mock).mockReturnValueOnce(mockFormatters);
+    (getColorFormatters as unknown as jest.Mock).mockReturnValueOnce(
+      mockFormatters,
+    );

    const chartProps = {
      width: 800,
--- a/superset-frontend/plugins/plugin-chart-table/package.json
+++ b/superset-frontend/plugins/plugin-chart-table/package.json
@@ -30,7 +30,7 @@
    "classnames": "^2.5.1",
    "d3-array": "^3.2.4",
    "lodash": "^4.17.23",
-    "memoize-one": "^5.2.1",
+    "memoize-one": "^6.0.0",
    "react-table": "^7.8.0",
    "regenerator-runtime": "^0.14.1",
    "xss": "^1.0.15"
Author	SHA1	Message	Date
Đỗ Trọng Hải	0ac80bee9c	Merge branch 'master' into chore/update-frontend-deps	2026-03-23 07:01:36 +07:00
hainenber	89458957e7	chore: skip Jest transform for ESM-only `json-stringify-pretty-compact` and type-cast for MemoizedFunction type in test Signed-off-by: hainenber <dotronghai96@gmail.com>	2026-03-22 23:28:17 +07:00
hainenber	5eaa6ecd13	build(deps): update major versions for `simple-zstd`, `memoize-one`, `json-stringify-pretty-compact`, `webpack-cli` `copy-webpack-plugin` Signed-off-by: hainenber <dotronghai96@gmail.com>	2026-03-22 23:01:20 +07:00