From 6362c6a5807af35a397be94458d46832441ed38a Mon Sep 17 00:00:00 2001 From: wjgogogo <906626481@qq.com> Date: Thu, 28 Nov 2024 17:17:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20react-component?= =?UTF-8?q?s=20=E5=B1=82=E7=9A=84=20svg=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-react-components/package.json | 2 + .../components/common/icons/calendar-icon.tsx | 19 ++ .../src/components/common/icons/col-icon.tsx | 18 ++ .../src/components/common/icons/index.tsx | 13 +- .../components/common/icons/location-icon.tsx | 19 ++ .../src/components/common/icons/row-icon.tsx | 18 ++ .../common/icons/svg/calendar-icon.svg | 13 - .../components/common/icons/svg/col-icon.svg | 27 -- .../common/icons/svg/location-icon.svg | 13 - .../components/common/icons/svg/row-icon.svg | 24 -- .../components/common/icons/svg/text-icon.svg | 13 - .../common/icons/svg/value-icon.svg | 27 -- .../src/components/common/icons/text-icon.tsx | 19 ++ .../components/common/icons/value-icon.tsx | 18 ++ packages/s2-react-components/vite.config.ts | 2 - pnpm-lock.yaml | 267 +++++++++++++++++- 16 files changed, 371 insertions(+), 141 deletions(-) create mode 100644 packages/s2-react-components/src/components/common/icons/calendar-icon.tsx create mode 100644 packages/s2-react-components/src/components/common/icons/col-icon.tsx create mode 100644 packages/s2-react-components/src/components/common/icons/location-icon.tsx create mode 100644 packages/s2-react-components/src/components/common/icons/row-icon.tsx delete mode 100644 packages/s2-react-components/src/components/common/icons/svg/calendar-icon.svg delete mode 100644 packages/s2-react-components/src/components/common/icons/svg/col-icon.svg delete mode 100644 packages/s2-react-components/src/components/common/icons/svg/location-icon.svg delete mode 100644 packages/s2-react-components/src/components/common/icons/svg/row-icon.svg delete mode 100644 packages/s2-react-components/src/components/common/icons/svg/text-icon.svg delete mode 100644 packages/s2-react-components/src/components/common/icons/svg/value-icon.svg create mode 100644 packages/s2-react-components/src/components/common/icons/text-icon.tsx create mode 100644 packages/s2-react-components/src/components/common/icons/value-icon.tsx diff --git a/packages/s2-react-components/package.json b/packages/s2-react-components/package.json index b6e9a19b0a..b1c8fa3de4 100644 --- a/packages/s2-react-components/package.json +++ b/packages/s2-react-components/package.json @@ -50,6 +50,7 @@ "build:sync-assets": "rsync -av --include='*/' --include='*.less' --include='*.svg' --exclude='*' src/", "build:umd": "cross-env FORMAT=umd vite build", "clean": "rimraf lib esm dist temp", + "gen:svg": "svgr ./src/components/common/icons/svg --out-dir ./src/components/common/icons ", "start": "cross-env PLAYGROUND=true vite", "test": "jest --passWithNoTests", "test:ci": "pnpm test -- --maxWorkers=3", @@ -72,6 +73,7 @@ "@ant-design/icons": "^5.3.7", "@antv/s2": "workspace:*", "@antv/s2-react": "workspace:*", + "@svgr/cli": "^8.1.0", "@testing-library/react": "^15.0.7", "@testing-library/react-hooks": "^8.0.1", "@types/react": "^18.3.3", diff --git a/packages/s2-react-components/src/components/common/icons/calendar-icon.tsx b/packages/s2-react-components/src/components/common/icons/calendar-icon.tsx new file mode 100644 index 0000000000..50e3b0bb0d --- /dev/null +++ b/packages/s2-react-components/src/components/common/icons/calendar-icon.tsx @@ -0,0 +1,19 @@ +import React from 'react'; + +export function CalendarIcon(props: React.SVGProps) { + return ( + + + + ); +} diff --git a/packages/s2-react-components/src/components/common/icons/col-icon.tsx b/packages/s2-react-components/src/components/common/icons/col-icon.tsx new file mode 100644 index 0000000000..d01af192b6 --- /dev/null +++ b/packages/s2-react-components/src/components/common/icons/col-icon.tsx @@ -0,0 +1,18 @@ +import React from 'react'; + +export function ColIcon(props: React.SVGProps) { + return ( + + + + + + + ); +} diff --git a/packages/s2-react-components/src/components/common/icons/index.tsx b/packages/s2-react-components/src/components/common/icons/index.tsx index ed0201d507..db0e2029f7 100644 --- a/packages/s2-react-components/src/components/common/icons/index.tsx +++ b/packages/s2-react-components/src/components/common/icons/index.tsx @@ -1,9 +1,8 @@ import './index.less'; -import { ReactComponent as CalendarIcon } from './svg/calendar-icon.svg'; -import { ReactComponent as ColIcon } from './svg/col-icon.svg'; -import { ReactComponent as LocationIcon } from './svg/location-icon.svg'; -import { ReactComponent as RowIcon } from './svg/row-icon.svg'; -import { ReactComponent as TextIcon } from './svg/text-icon.svg'; -import { ReactComponent as ValueIcon } from './svg/value-icon.svg'; -export { CalendarIcon, ColIcon, LocationIcon, RowIcon, TextIcon, ValueIcon }; +export * from './calendar-icon'; +export * from './col-icon'; +export * from './location-icon'; +export * from './row-icon'; +export * from './text-icon'; +export * from './value-icon'; diff --git a/packages/s2-react-components/src/components/common/icons/location-icon.tsx b/packages/s2-react-components/src/components/common/icons/location-icon.tsx new file mode 100644 index 0000000000..45adc5c1fe --- /dev/null +++ b/packages/s2-react-components/src/components/common/icons/location-icon.tsx @@ -0,0 +1,19 @@ +import React from 'react'; + +export function LocationIcon(props: React.SVGProps) { + return ( + + + + ); +} diff --git a/packages/s2-react-components/src/components/common/icons/row-icon.tsx b/packages/s2-react-components/src/components/common/icons/row-icon.tsx new file mode 100644 index 0000000000..d526c9332c --- /dev/null +++ b/packages/s2-react-components/src/components/common/icons/row-icon.tsx @@ -0,0 +1,18 @@ +import React from 'react'; + +export function RowIcon(props: React.SVGProps) { + return ( + + + + + + + ); +} diff --git a/packages/s2-react-components/src/components/common/icons/svg/calendar-icon.svg b/packages/s2-react-components/src/components/common/icons/svg/calendar-icon.svg deleted file mode 100644 index 84ebfceba7..0000000000 --- a/packages/s2-react-components/src/components/common/icons/svg/calendar-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/packages/s2-react-components/src/components/common/icons/svg/col-icon.svg b/packages/s2-react-components/src/components/common/icons/svg/col-icon.svg deleted file mode 100644 index 048ccc1605..0000000000 --- a/packages/s2-react-components/src/components/common/icons/svg/col-icon.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/packages/s2-react-components/src/components/common/icons/svg/location-icon.svg b/packages/s2-react-components/src/components/common/icons/svg/location-icon.svg deleted file mode 100644 index 49a9c711f8..0000000000 --- a/packages/s2-react-components/src/components/common/icons/svg/location-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/packages/s2-react-components/src/components/common/icons/svg/row-icon.svg b/packages/s2-react-components/src/components/common/icons/svg/row-icon.svg deleted file mode 100644 index cf29db358b..0000000000 --- a/packages/s2-react-components/src/components/common/icons/svg/row-icon.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - diff --git a/packages/s2-react-components/src/components/common/icons/svg/text-icon.svg b/packages/s2-react-components/src/components/common/icons/svg/text-icon.svg deleted file mode 100644 index af3a86d533..0000000000 --- a/packages/s2-react-components/src/components/common/icons/svg/text-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/packages/s2-react-components/src/components/common/icons/svg/value-icon.svg b/packages/s2-react-components/src/components/common/icons/svg/value-icon.svg deleted file mode 100644 index af3905b602..0000000000 --- a/packages/s2-react-components/src/components/common/icons/svg/value-icon.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/packages/s2-react-components/src/components/common/icons/text-icon.tsx b/packages/s2-react-components/src/components/common/icons/text-icon.tsx new file mode 100644 index 0000000000..409a08eb46 --- /dev/null +++ b/packages/s2-react-components/src/components/common/icons/text-icon.tsx @@ -0,0 +1,19 @@ +import React from 'react'; + +export function TextIcon(props: React.SVGProps) { + return ( + + + + ); +} diff --git a/packages/s2-react-components/src/components/common/icons/value-icon.tsx b/packages/s2-react-components/src/components/common/icons/value-icon.tsx new file mode 100644 index 0000000000..cdde7d3ce3 --- /dev/null +++ b/packages/s2-react-components/src/components/common/icons/value-icon.tsx @@ -0,0 +1,18 @@ +import React from 'react'; + +export function ValueIcon(props: React.SVGProps) { + return ( + + + + + + + ); +} diff --git a/packages/s2-react-components/vite.config.ts b/packages/s2-react-components/vite.config.ts index 7c02136935..d60ba83f44 100644 --- a/packages/s2-react-components/vite.config.ts +++ b/packages/s2-react-components/vite.config.ts @@ -5,7 +5,6 @@ import react from '@vitejs/plugin-react'; import path from 'path'; import type { UserConfig } from 'vite'; import { defineConfig } from 'vite'; -import svgr from 'vite-plugin-svgr'; import { getBaseConfig } from '../../build.config.base.mjs'; const { getViteConfig, isDevMode } = getBaseConfig({ @@ -27,7 +26,6 @@ export default defineConfig({ react({ jsxRuntime: 'classic', }), - svgr(), ] as UserConfig['plugins'], }) as UserConfig), }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 24628bf251..53a941f36e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -431,6 +431,9 @@ importers: '@antv/s2-react': specifier: workspace:* version: link:../s2-react + '@svgr/cli': + specifier: ^8.1.0 + version: 8.1.0(typescript@5.4.5) '@testing-library/react': specifier: ^15.0.7 version: 15.0.7(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -2541,6 +2544,12 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-add-jsx-attribute@8.0.0': + resolution: {integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==} + engines: {node: '>=14'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-remove-jsx-attribute@8.0.0': resolution: {integrity: sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==} engines: {node: '>=14'} @@ -2559,56 +2568,123 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0': + resolution: {integrity: sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==} + engines: {node: '>=14'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-svg-dynamic-title@6.5.1': resolution: {integrity: sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==} engines: {node: '>=10'} peerDependencies: '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-svg-dynamic-title@8.0.0': + resolution: {integrity: sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==} + engines: {node: '>=14'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-svg-em-dimensions@6.5.1': resolution: {integrity: sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==} engines: {node: '>=10'} peerDependencies: '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-svg-em-dimensions@8.0.0': + resolution: {integrity: sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==} + engines: {node: '>=14'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-transform-react-native-svg@6.5.1': resolution: {integrity: sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==} engines: {node: '>=10'} peerDependencies: '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-transform-react-native-svg@8.1.0': + resolution: {integrity: sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==} + engines: {node: '>=14'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-transform-svg-component@6.5.1': resolution: {integrity: sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==} engines: {node: '>=12'} peerDependencies: '@babel/core': ^7.0.0-0 + '@svgr/babel-plugin-transform-svg-component@8.0.0': + resolution: {integrity: sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==} + engines: {node: '>=12'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@svgr/babel-preset@6.5.1': resolution: {integrity: sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==} engines: {node: '>=10'} peerDependencies: '@babel/core': ^7.0.0-0 + '@svgr/babel-preset@8.1.0': + resolution: {integrity: sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==} + engines: {node: '>=14'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@svgr/cli@8.1.0': + resolution: {integrity: sha512-SnlaLspB610XFXvs3PmhzViHErsXp0yIy4ERyZlHDlO1ro2iYtHMWYk2mztdLD/lBjiA4ZXe4RePON3qU/Tc4A==} + engines: {node: '>=14'} + hasBin: true + '@svgr/core@6.5.1': resolution: {integrity: sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==} engines: {node: '>=10'} + '@svgr/core@8.1.0': + resolution: {integrity: sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==} + engines: {node: '>=14'} + '@svgr/hast-util-to-babel-ast@6.5.1': resolution: {integrity: sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==} engines: {node: '>=10'} + '@svgr/hast-util-to-babel-ast@8.0.0': + resolution: {integrity: sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==} + engines: {node: '>=14'} + '@svgr/plugin-jsx@6.5.1': resolution: {integrity: sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw==} engines: {node: '>=10'} peerDependencies: '@svgr/core': ^6.0.0 + '@svgr/plugin-jsx@8.1.0': + resolution: {integrity: sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==} + engines: {node: '>=14'} + peerDependencies: + '@svgr/core': '*' + + '@svgr/plugin-prettier@8.1.0': + resolution: {integrity: sha512-o4/uFI8G64tAjBZ4E7gJfH+VP7Qi3T0+M4WnIsP91iFnGPqs5WvPDkpZALXPiyWEtzfYs1Rmwy1Zdfu8qoZuKw==} + engines: {node: '>=14'} + peerDependencies: + '@svgr/core': '*' + '@svgr/plugin-svgo@6.5.1': resolution: {integrity: sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ==} engines: {node: '>=10'} peerDependencies: '@svgr/core': '*' + '@svgr/plugin-svgo@8.1.0': + resolution: {integrity: sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==} + engines: {node: '>=14'} + peerDependencies: + '@svgr/core': '*' + '@swc/core-darwin-arm64@1.4.2': resolution: {integrity: sha512-1uSdAn1MRK5C1m/TvLZ2RDvr0zLvochgrZ2xL+lRzugLlCTlSA+Q4TWtrZaOz+vnnFVliCpw7c7qu0JouhgQIw==} engines: {node: '>=10'} @@ -4563,6 +4639,10 @@ packages: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} + commander@9.5.0: + resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==} + engines: {node: ^12.20.0 || >=14} + common-path-prefix@3.0.0: resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} @@ -4842,6 +4922,9 @@ packages: css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} + css-select@5.1.0: + resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==} + css-tree@1.0.0-alpha.37: resolution: {integrity: sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==} engines: {node: '>=8.0.0'} @@ -4850,6 +4933,10 @@ packages: resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==} engines: {node: '>=8.0.0'} + css-tree@2.2.1: + resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==} + engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'} + css-tree@2.3.1: resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==} engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} @@ -4898,6 +4985,10 @@ packages: resolution: {integrity: sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==} engines: {node: '>=8.0.0'} + csso@5.0.5: + resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==} + engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'} + cssom@0.3.8: resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} @@ -5004,6 +5095,10 @@ packages: resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==} engines: {node: '>=0.10'} + dashify@2.0.0: + resolution: {integrity: sha512-hpA5C/YrPjucXypHPPc0oJ1l9Hf6wWbiOL7Ik42cxnsUOhWiCB/fylKbKqqJalW9FgkNQCw16YO8uW9Hs0Iy1A==} + engines: {node: '>=4'} + data-uri-to-buffer@4.0.1: resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==} engines: {node: '>= 12'} @@ -6353,7 +6448,7 @@ packages: resolution: {integrity: sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==} engines: {node: '>= 4.0'} os: [darwin] - deprecated: The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2 + deprecated: Upgrade to fsevents v2 to mitigate potential security issues fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} @@ -8548,6 +8643,9 @@ packages: mdn-data@2.0.14: resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==} + mdn-data@2.0.28: + resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==} + mdn-data@2.0.30: resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==} @@ -11956,6 +12054,9 @@ packages: resolution: {integrity: sha512-OtZKrVrGIT+m++lxyF0z5n68nkwdgZotPhy89bfA4T7nSWe0xeQtfbjM1z5VLTilJdWXH46g8i0oAcpQNkzZTg==} engines: {node: '>= 18', pnpm: '>= 9'} + snake-case@3.0.4: + resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} + snapdragon-node@2.1.1: resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==} engines: {node: '>=0.10.0'} @@ -12420,6 +12521,11 @@ packages: engines: {node: '>=10.13.0'} hasBin: true + svgo@3.3.2: + resolution: {integrity: sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==} + engines: {node: '>=14.0.0'} + hasBin: true + svgson@4.1.0: resolution: {integrity: sha512-DodISxHtdLKUghDYA+PGK4Qq350+CbBAkdvGLkBFSmWd9WKSg4dijgjB1IiRPTmsUCd+a7KYe+ILHtklYgQyzQ==} @@ -14048,7 +14154,7 @@ snapshots: '@babel/parser': 7.24.7 '@babel/template': 7.24.7 '@babel/traverse': 7.24.7 - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 convert-source-map: 2.0.0 debug: 4.3.5 gensync: 1.0.0-beta.2 @@ -14087,7 +14193,7 @@ snapshots: '@babel/generator@7.2.0': dependencies: - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 jsesc: 2.5.2 lodash: 4.17.21 source-map: 0.5.7 @@ -14150,7 +14256,7 @@ snapshots: '@babel/helper-member-expression-to-functions@7.24.7': dependencies: '@babel/traverse': 7.24.7 - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 transitivePeerDependencies: - supports-color @@ -14189,7 +14295,7 @@ snapshots: '@babel/helper-optimise-call-expression@7.24.7': dependencies: - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 '@babel/helper-plugin-utils@7.24.7': {} @@ -14212,7 +14318,7 @@ snapshots: '@babel/helper-skip-transparent-expression-wrappers@7.24.7': dependencies: '@babel/traverse': 7.24.7 - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 transitivePeerDependencies: - supports-color @@ -15217,9 +15323,7 @@ snapshots: jest-runner: 24.9.0 jest-runtime: 24.9.0 transitivePeerDependencies: - - bufferutil - supports-color - - utf-8-validate '@jest/test-sequencer@26.6.3': dependencies: @@ -16004,6 +16108,10 @@ snapshots: dependencies: '@babel/core': 7.24.7 + '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.24.7)': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 @@ -16016,22 +16124,42 @@ snapshots: dependencies: '@babel/core': 7.24.7 + '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.24.7)': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-plugin-svg-dynamic-title@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 + '@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.24.7)': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-plugin-svg-em-dimensions@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 + '@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.24.7)': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-plugin-transform-react-native-svg@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 + '@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.24.7)': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-plugin-transform-svg-component@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 + '@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.24.7)': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-preset@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 @@ -16044,6 +16172,34 @@ snapshots: '@svgr/babel-plugin-transform-react-native-svg': 6.5.1(@babel/core@7.24.7) '@svgr/babel-plugin-transform-svg-component': 6.5.1(@babel/core@7.24.7) + '@svgr/babel-preset@8.1.0(@babel/core@7.24.7)': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.24.7) + '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.24.7) + '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.24.7) + '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.24.7) + '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.24.7) + '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.24.7) + '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.24.7) + '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.24.7) + + '@svgr/cli@8.1.0(typescript@5.4.5)': + dependencies: + '@svgr/core': 8.1.0(typescript@5.4.5) + '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.4.5)) + '@svgr/plugin-prettier': 8.1.0(@svgr/core@8.1.0(typescript@5.4.5)) + '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0(typescript@5.4.5))(typescript@5.4.5) + camelcase: 6.3.0 + chalk: 4.1.2 + commander: 9.5.0 + dashify: 2.0.0 + glob: 8.1.0 + snake-case: 3.0.4 + transitivePeerDependencies: + - supports-color + - typescript + '@svgr/core@6.5.1': dependencies: '@babel/core': 7.24.7 @@ -16054,9 +16210,25 @@ snapshots: transitivePeerDependencies: - supports-color + '@svgr/core@8.1.0(typescript@5.4.5)': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-preset': 8.1.0(@babel/core@7.24.7) + camelcase: 6.3.0 + cosmiconfig: 8.3.6(typescript@5.4.5) + snake-case: 3.0.4 + transitivePeerDependencies: + - supports-color + - typescript + '@svgr/hast-util-to-babel-ast@6.5.1': dependencies: - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 + entities: 4.5.0 + + '@svgr/hast-util-to-babel-ast@8.0.0': + dependencies: + '@babel/types': 7.26.0 entities: 4.5.0 '@svgr/plugin-jsx@6.5.1(@svgr/core@6.5.1)': @@ -16069,6 +16241,22 @@ snapshots: transitivePeerDependencies: - supports-color + '@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.4.5))': + dependencies: + '@babel/core': 7.24.7 + '@svgr/babel-preset': 8.1.0(@babel/core@7.24.7) + '@svgr/core': 8.1.0(typescript@5.4.5) + '@svgr/hast-util-to-babel-ast': 8.0.0 + svg-parser: 2.0.4 + transitivePeerDependencies: + - supports-color + + '@svgr/plugin-prettier@8.1.0(@svgr/core@8.1.0(typescript@5.4.5))': + dependencies: + '@svgr/core': 8.1.0(typescript@5.4.5) + deepmerge: 4.3.1 + prettier: 2.8.8 + '@svgr/plugin-svgo@6.5.1(@svgr/core@6.5.1)': dependencies: '@svgr/core': 6.5.1 @@ -16076,6 +16264,15 @@ snapshots: deepmerge: 4.3.1 svgo: 2.8.0 + '@svgr/plugin-svgo@8.1.0(@svgr/core@8.1.0(typescript@5.4.5))(typescript@5.4.5)': + dependencies: + '@svgr/core': 8.1.0(typescript@5.4.5) + cosmiconfig: 8.3.6(typescript@5.4.5) + deepmerge: 4.3.1 + svgo: 3.3.2 + transitivePeerDependencies: + - typescript + '@swc/core-darwin-arm64@1.4.2': optional: true @@ -17995,21 +18192,21 @@ snapshots: babel-plugin-jest-hoist@26.6.2: dependencies: '@babel/template': 7.24.7 - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.20.6 babel-plugin-jest-hoist@29.6.3: dependencies: '@babel/template': 7.24.7 - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 '@types/babel__core': 7.20.5 '@types/babel__traverse': 7.20.6 babel-plugin-react-compiler@0.0.0-experimental-c23de8d-20240515: dependencies: '@babel/generator': 7.2.0 - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 chalk: 4.1.2 invariant: 2.2.4 pretty-format: 24.9.0 @@ -18707,6 +18904,8 @@ snapshots: commander@8.3.0: {} + commander@9.5.0: {} + common-path-prefix@3.0.0: {} commondir@1.0.1: {} @@ -19056,6 +19255,14 @@ snapshots: domutils: 2.8.0 nth-check: 2.1.1 + css-select@5.1.0: + dependencies: + boolbase: 1.0.0 + css-what: 6.1.0 + domhandler: 5.0.3 + domutils: 3.1.0 + nth-check: 2.1.1 + css-tree@1.0.0-alpha.37: dependencies: mdn-data: 2.0.4 @@ -19066,6 +19273,11 @@ snapshots: mdn-data: 2.0.14 source-map: 0.6.1 + css-tree@2.2.1: + dependencies: + mdn-data: 2.0.28 + source-map-js: 1.2.0 + css-tree@2.3.1: dependencies: mdn-data: 2.0.30 @@ -19140,6 +19352,10 @@ snapshots: dependencies: css-tree: 1.1.3 + csso@5.0.5: + dependencies: + css-tree: 2.2.1 + cssom@0.3.8: {} cssom@0.4.4: {} @@ -19229,6 +19445,8 @@ snapshots: dependencies: assert-plus: 1.0.0 + dashify@2.0.0: {} + data-uri-to-buffer@4.0.1: {} data-urls@1.1.0: @@ -22448,7 +22666,7 @@ snapshots: '@babel/parser': 7.24.7 '@babel/template': 7.24.7 '@babel/traverse': 7.24.7 - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 istanbul-lib-coverage: 2.0.5 semver: 6.3.1 transitivePeerDependencies: @@ -22795,7 +23013,9 @@ snapshots: pretty-format: 24.9.0 throat: 4.1.0 transitivePeerDependencies: + - bufferutil - supports-color + - utf-8-validate jest-jasmine2@26.6.3: dependencies: @@ -23072,7 +23292,7 @@ snapshots: jest-snapshot@24.9.0: dependencies: - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 '@jest/types': 24.9.0 chalk: 2.4.2 expect: 24.9.0 @@ -23090,7 +23310,7 @@ snapshots: jest-snapshot@26.6.2: dependencies: - '@babel/types': 7.24.7 + '@babel/types': 7.26.0 '@jest/types': 26.6.2 '@types/babel__traverse': 7.20.6 '@types/prettier': 2.7.3 @@ -24138,6 +24358,8 @@ snapshots: mdn-data@2.0.14: {} + mdn-data@2.0.28: {} + mdn-data@2.0.30: {} mdn-data@2.0.4: {} @@ -28368,6 +28590,11 @@ snapshots: smol-toml@1.2.1: {} + snake-case@3.0.4: + dependencies: + dot-case: 3.0.4 + tslib: 2.6.3 + snapdragon-node@2.1.1: dependencies: define-property: 1.0.0 @@ -28945,6 +29172,16 @@ snapshots: picocolors: 1.0.1 stable: 0.1.8 + svgo@3.3.2: + dependencies: + '@trysound/sax': 0.2.0 + commander: 7.2.0 + css-select: 5.1.0 + css-tree: 2.3.1 + css-what: 6.1.0 + csso: 5.0.5 + picocolors: 1.0.1 + svgson@4.1.0: dependencies: deep-rename-keys: 0.2.1 From 99dc01b90df32c78709f7cde843369710b02f614 Mon Sep 17 00:00:00 2001 From: wjgogogo <906626481@qq.com> Date: Thu, 28 Nov 2024 18:00:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20vue=20=E5=B1=82?= =?UTF-8?q?=20svg=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-vue/package.json | 1 - packages/s2-vue/playground/App.vue | 11 +++++++--- .../src/components/drill-down/index.vue | 12 +++++----- packages/s2-vue/src/icons/calendar-icon.vue | 22 +++++++++++++++++++ packages/s2-vue/src/icons/location-icon.vue | 22 +++++++++++++++++++ packages/s2-vue/src/icons/text-icon.vue | 22 +++++++++++++++++++ packages/s2-vue/src/svg/calendar-icon.svg | 13 ----------- packages/s2-vue/src/svg/location-icon.svg | 13 ----------- packages/s2-vue/src/svg/text-icon.svg | 13 ----------- packages/s2-vue/vite.config.ts | 9 +------- pnpm-lock.yaml | 11 ---------- 11 files changed, 81 insertions(+), 68 deletions(-) create mode 100644 packages/s2-vue/src/icons/calendar-icon.vue create mode 100644 packages/s2-vue/src/icons/location-icon.vue create mode 100644 packages/s2-vue/src/icons/text-icon.vue delete mode 100644 packages/s2-vue/src/svg/calendar-icon.svg delete mode 100644 packages/s2-vue/src/svg/location-icon.svg delete mode 100644 packages/s2-vue/src/svg/text-icon.svg diff --git a/packages/s2-vue/package.json b/packages/s2-vue/package.json index f1268f178e..a3ceeed591 100644 --- a/packages/s2-vue/package.json +++ b/packages/s2-vue/package.json @@ -64,7 +64,6 @@ "@vue/shared": "^3.3.4", "@vue/tsconfig": "^0.4.0", "ant-design-vue": "^3.2.20", - "vite-svg-loader": "^3.6.0", "vue": "^3.3.4", "vue-tsc": "^2.1.6" }, diff --git a/packages/s2-vue/playground/App.vue b/packages/s2-vue/playground/App.vue index cac67f2291..da7a38a60e 100644 --- a/packages/s2-vue/playground/App.vue +++ b/packages/s2-vue/playground/App.vue @@ -521,15 +521,20 @@ const fieldMap = { const partDrillDown: PartDrillDown = { drillConfig: { dataSet: [ + { + name: '客户性别', + value: 'sex2', + type: 'location', + }, { name: '销售渠道', value: 'channel', type: 'text', }, { - name: '客户性别', - value: 'sex', - type: 'text', + name: '客户性别111', + value: 'sex1', + type: 'date', }, ], }, diff --git a/packages/s2-vue/src/components/drill-down/index.vue b/packages/s2-vue/src/components/drill-down/index.vue index dec31507ed..eee32f16a9 100644 --- a/packages/s2-vue/src/components/drill-down/index.vue +++ b/packages/s2-vue/src/components/drill-down/index.vue @@ -11,9 +11,9 @@ import type { SelectInfo } from 'ant-design-vue/lib/menu/src/interface'; import { isEmpty } from 'lodash'; import type { Key } from 'ant-design-vue/lib/_util/type'; import type { ChangeEvent } from 'ant-design-vue/lib/_util/EventInterface'; -import LocationIcon from '../../svg/location-icon.svg?component'; -import TextIcon from '../../svg/text-icon.svg?component'; -import CalendarIcon from '../../svg/calendar-icon.svg?component'; +import LocationIcon from '../../icons/location-icon.vue'; +import TextIcon from '../../icons/text-icon.vue'; +import CalendarIcon from '../../icons/calendar-icon.vue'; import { initDrillDownEmits, initDrillDownProps, @@ -136,9 +136,9 @@ export default defineComponent({ :class="`${DRILL_DOWN_PRE_CLASS}-menu-item`" > {{ option?.name }} diff --git a/packages/s2-vue/src/icons/calendar-icon.vue b/packages/s2-vue/src/icons/calendar-icon.vue new file mode 100644 index 0000000000..ebeeaccc2e --- /dev/null +++ b/packages/s2-vue/src/icons/calendar-icon.vue @@ -0,0 +1,22 @@ + + diff --git a/packages/s2-vue/src/icons/location-icon.vue b/packages/s2-vue/src/icons/location-icon.vue new file mode 100644 index 0000000000..152d0c6cf0 --- /dev/null +++ b/packages/s2-vue/src/icons/location-icon.vue @@ -0,0 +1,22 @@ + + diff --git a/packages/s2-vue/src/icons/text-icon.vue b/packages/s2-vue/src/icons/text-icon.vue new file mode 100644 index 0000000000..9fabdeb2c3 --- /dev/null +++ b/packages/s2-vue/src/icons/text-icon.vue @@ -0,0 +1,22 @@ + + diff --git a/packages/s2-vue/src/svg/calendar-icon.svg b/packages/s2-vue/src/svg/calendar-icon.svg deleted file mode 100644 index 84ebfceba7..0000000000 --- a/packages/s2-vue/src/svg/calendar-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/packages/s2-vue/src/svg/location-icon.svg b/packages/s2-vue/src/svg/location-icon.svg deleted file mode 100644 index 49a9c711f8..0000000000 --- a/packages/s2-vue/src/svg/location-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/packages/s2-vue/src/svg/text-icon.svg b/packages/s2-vue/src/svg/text-icon.svg deleted file mode 100644 index af3a86d533..0000000000 --- a/packages/s2-vue/src/svg/text-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/packages/s2-vue/vite.config.ts b/packages/s2-vue/vite.config.ts index 96aa0fd4c0..fee8f107a4 100644 --- a/packages/s2-vue/vite.config.ts +++ b/packages/s2-vue/vite.config.ts @@ -4,7 +4,6 @@ import vue from '@vitejs/plugin-vue'; import vueJsx from '@vitejs/plugin-vue-jsx'; import path from 'path'; import { UserConfig, defineConfig } from 'vite'; -import svgLoader from 'vite-svg-loader'; import { getBaseConfig } from '../../build.config.base.mjs'; const { getViteConfig, isDevMode } = getBaseConfig(); @@ -19,12 +18,6 @@ export default defineConfig({ port: 5050, name: 's2-vue', libName: 'S2Vue', - plugins: [ - vue(), - svgLoader({ - defaultImport: 'component', - }), - vueJsx(), - ] as UserConfig['plugins'], + plugins: [vue(), vueJsx()] as UserConfig['plugins'], }), } as UserConfig); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53a941f36e..dcba27089e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -495,9 +495,6 @@ importers: ant-design-vue: specifier: ^3.2.20 version: 3.2.20(vue@3.4.27(typescript@5.4.5)) - vite-svg-loader: - specifier: ^3.6.0 - version: 3.6.0 vue: specifier: ^3.3.4 version: 3.4.27(typescript@5.4.5) @@ -13247,9 +13244,6 @@ packages: peerDependencies: vite: ^2.6.0 || 3 || 4 - vite-svg-loader@3.6.0: - resolution: {integrity: sha512-bZJffcgCREW57kNkgMhuNqeDznWXyQwJ3wKrRhHLMMzwDnP5jr3vXW3cqsmquRR7VTP5mLdKj1/zzPPooGUuPw==} - vite@4.5.2: resolution: {integrity: sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==} engines: {node: ^14.18.0 || >=16.0.0} @@ -30029,11 +30023,6 @@ snapshots: - rollup - supports-color - vite-svg-loader@3.6.0: - dependencies: - '@vue/compiler-sfc': 3.4.27 - svgo: 2.8.0 - vite@4.5.2(@types/node@20.14.2)(less@4.1.3)(lightningcss@1.22.1)(sass@1.77.4)(terser@5.31.1): dependencies: esbuild: 0.18.20 From 154f38ddc61425598875e201a53ea2679b3692c9 Mon Sep 17 00:00:00 2001 From: wjgogogo <906626481@qq.com> Date: Thu, 28 Nov 2024 18:04:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?revert:=20=E5=88=A0=E9=99=A4=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/s2-react-components/package.json | 2 - pnpm-lock.yaml | 241 +--------------------- 2 files changed, 2 insertions(+), 241 deletions(-) diff --git a/packages/s2-react-components/package.json b/packages/s2-react-components/package.json index b1c8fa3de4..b6e9a19b0a 100644 --- a/packages/s2-react-components/package.json +++ b/packages/s2-react-components/package.json @@ -50,7 +50,6 @@ "build:sync-assets": "rsync -av --include='*/' --include='*.less' --include='*.svg' --exclude='*' src/", "build:umd": "cross-env FORMAT=umd vite build", "clean": "rimraf lib esm dist temp", - "gen:svg": "svgr ./src/components/common/icons/svg --out-dir ./src/components/common/icons ", "start": "cross-env PLAYGROUND=true vite", "test": "jest --passWithNoTests", "test:ci": "pnpm test -- --maxWorkers=3", @@ -73,7 +72,6 @@ "@ant-design/icons": "^5.3.7", "@antv/s2": "workspace:*", "@antv/s2-react": "workspace:*", - "@svgr/cli": "^8.1.0", "@testing-library/react": "^15.0.7", "@testing-library/react-hooks": "^8.0.1", "@types/react": "^18.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dcba27089e..da8d8414e8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -431,9 +431,6 @@ importers: '@antv/s2-react': specifier: workspace:* version: link:../s2-react - '@svgr/cli': - specifier: ^8.1.0 - version: 8.1.0(typescript@5.4.5) '@testing-library/react': specifier: ^15.0.7 version: 15.0.7(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -2541,12 +2538,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-add-jsx-attribute@8.0.0': - resolution: {integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-remove-jsx-attribute@8.0.0': resolution: {integrity: sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==} engines: {node: '>=14'} @@ -2565,123 +2556,56 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0': - resolution: {integrity: sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-svg-dynamic-title@6.5.1': resolution: {integrity: sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==} engines: {node: '>=10'} peerDependencies: '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-svg-dynamic-title@8.0.0': - resolution: {integrity: sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-svg-em-dimensions@6.5.1': resolution: {integrity: sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==} engines: {node: '>=10'} peerDependencies: '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-svg-em-dimensions@8.0.0': - resolution: {integrity: sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-transform-react-native-svg@6.5.1': resolution: {integrity: sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==} engines: {node: '>=10'} peerDependencies: '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-transform-react-native-svg@8.1.0': - resolution: {integrity: sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-transform-svg-component@6.5.1': resolution: {integrity: sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==} engines: {node: '>=12'} peerDependencies: '@babel/core': ^7.0.0-0 - '@svgr/babel-plugin-transform-svg-component@8.0.0': - resolution: {integrity: sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==} - engines: {node: '>=12'} - peerDependencies: - '@babel/core': ^7.0.0-0 - '@svgr/babel-preset@6.5.1': resolution: {integrity: sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==} engines: {node: '>=10'} peerDependencies: '@babel/core': ^7.0.0-0 - '@svgr/babel-preset@8.1.0': - resolution: {integrity: sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==} - engines: {node: '>=14'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@svgr/cli@8.1.0': - resolution: {integrity: sha512-SnlaLspB610XFXvs3PmhzViHErsXp0yIy4ERyZlHDlO1ro2iYtHMWYk2mztdLD/lBjiA4ZXe4RePON3qU/Tc4A==} - engines: {node: '>=14'} - hasBin: true - '@svgr/core@6.5.1': resolution: {integrity: sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==} engines: {node: '>=10'} - '@svgr/core@8.1.0': - resolution: {integrity: sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==} - engines: {node: '>=14'} - '@svgr/hast-util-to-babel-ast@6.5.1': resolution: {integrity: sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==} engines: {node: '>=10'} - '@svgr/hast-util-to-babel-ast@8.0.0': - resolution: {integrity: sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==} - engines: {node: '>=14'} - '@svgr/plugin-jsx@6.5.1': resolution: {integrity: sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw==} engines: {node: '>=10'} peerDependencies: '@svgr/core': ^6.0.0 - '@svgr/plugin-jsx@8.1.0': - resolution: {integrity: sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==} - engines: {node: '>=14'} - peerDependencies: - '@svgr/core': '*' - - '@svgr/plugin-prettier@8.1.0': - resolution: {integrity: sha512-o4/uFI8G64tAjBZ4E7gJfH+VP7Qi3T0+M4WnIsP91iFnGPqs5WvPDkpZALXPiyWEtzfYs1Rmwy1Zdfu8qoZuKw==} - engines: {node: '>=14'} - peerDependencies: - '@svgr/core': '*' - '@svgr/plugin-svgo@6.5.1': resolution: {integrity: sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ==} engines: {node: '>=10'} peerDependencies: '@svgr/core': '*' - '@svgr/plugin-svgo@8.1.0': - resolution: {integrity: sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==} - engines: {node: '>=14'} - peerDependencies: - '@svgr/core': '*' - '@swc/core-darwin-arm64@1.4.2': resolution: {integrity: sha512-1uSdAn1MRK5C1m/TvLZ2RDvr0zLvochgrZ2xL+lRzugLlCTlSA+Q4TWtrZaOz+vnnFVliCpw7c7qu0JouhgQIw==} engines: {node: '>=10'} @@ -4636,10 +4560,6 @@ packages: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} - commander@9.5.0: - resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==} - engines: {node: ^12.20.0 || >=14} - common-path-prefix@3.0.0: resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} @@ -4919,9 +4839,6 @@ packages: css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} - css-select@5.1.0: - resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==} - css-tree@1.0.0-alpha.37: resolution: {integrity: sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==} engines: {node: '>=8.0.0'} @@ -4930,10 +4847,6 @@ packages: resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==} engines: {node: '>=8.0.0'} - css-tree@2.2.1: - resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==} - engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'} - css-tree@2.3.1: resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==} engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} @@ -4982,10 +4895,6 @@ packages: resolution: {integrity: sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==} engines: {node: '>=8.0.0'} - csso@5.0.5: - resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==} - engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'} - cssom@0.3.8: resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} @@ -5092,10 +5001,6 @@ packages: resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==} engines: {node: '>=0.10'} - dashify@2.0.0: - resolution: {integrity: sha512-hpA5C/YrPjucXypHPPc0oJ1l9Hf6wWbiOL7Ik42cxnsUOhWiCB/fylKbKqqJalW9FgkNQCw16YO8uW9Hs0Iy1A==} - engines: {node: '>=4'} - data-uri-to-buffer@4.0.1: resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==} engines: {node: '>= 12'} @@ -8640,9 +8545,6 @@ packages: mdn-data@2.0.14: resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==} - mdn-data@2.0.28: - resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==} - mdn-data@2.0.30: resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==} @@ -12051,9 +11953,6 @@ packages: resolution: {integrity: sha512-OtZKrVrGIT+m++lxyF0z5n68nkwdgZotPhy89bfA4T7nSWe0xeQtfbjM1z5VLTilJdWXH46g8i0oAcpQNkzZTg==} engines: {node: '>= 18', pnpm: '>= 9'} - snake-case@3.0.4: - resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} - snapdragon-node@2.1.1: resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==} engines: {node: '>=0.10.0'} @@ -12518,11 +12417,6 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - svgo@3.3.2: - resolution: {integrity: sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==} - engines: {node: '>=14.0.0'} - hasBin: true - svgson@4.1.0: resolution: {integrity: sha512-DodISxHtdLKUghDYA+PGK4Qq350+CbBAkdvGLkBFSmWd9WKSg4dijgjB1IiRPTmsUCd+a7KYe+ILHtklYgQyzQ==} @@ -15317,7 +15211,9 @@ snapshots: jest-runner: 24.9.0 jest-runtime: 24.9.0 transitivePeerDependencies: + - bufferutil - supports-color + - utf-8-validate '@jest/test-sequencer@26.6.3': dependencies: @@ -16102,10 +15998,6 @@ snapshots: dependencies: '@babel/core': 7.24.7 - '@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.24.7)': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 @@ -16118,42 +16010,22 @@ snapshots: dependencies: '@babel/core': 7.24.7 - '@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.24.7)': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-plugin-svg-dynamic-title@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 - '@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.24.7)': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-plugin-svg-em-dimensions@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 - '@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.24.7)': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-plugin-transform-react-native-svg@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 - '@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.24.7)': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-plugin-transform-svg-component@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 - '@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.24.7)': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-preset@6.5.1(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 @@ -16166,34 +16038,6 @@ snapshots: '@svgr/babel-plugin-transform-react-native-svg': 6.5.1(@babel/core@7.24.7) '@svgr/babel-plugin-transform-svg-component': 6.5.1(@babel/core@7.24.7) - '@svgr/babel-preset@8.1.0(@babel/core@7.24.7)': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-plugin-add-jsx-attribute': 8.0.0(@babel/core@7.24.7) - '@svgr/babel-plugin-remove-jsx-attribute': 8.0.0(@babel/core@7.24.7) - '@svgr/babel-plugin-remove-jsx-empty-expression': 8.0.0(@babel/core@7.24.7) - '@svgr/babel-plugin-replace-jsx-attribute-value': 8.0.0(@babel/core@7.24.7) - '@svgr/babel-plugin-svg-dynamic-title': 8.0.0(@babel/core@7.24.7) - '@svgr/babel-plugin-svg-em-dimensions': 8.0.0(@babel/core@7.24.7) - '@svgr/babel-plugin-transform-react-native-svg': 8.1.0(@babel/core@7.24.7) - '@svgr/babel-plugin-transform-svg-component': 8.0.0(@babel/core@7.24.7) - - '@svgr/cli@8.1.0(typescript@5.4.5)': - dependencies: - '@svgr/core': 8.1.0(typescript@5.4.5) - '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.4.5)) - '@svgr/plugin-prettier': 8.1.0(@svgr/core@8.1.0(typescript@5.4.5)) - '@svgr/plugin-svgo': 8.1.0(@svgr/core@8.1.0(typescript@5.4.5))(typescript@5.4.5) - camelcase: 6.3.0 - chalk: 4.1.2 - commander: 9.5.0 - dashify: 2.0.0 - glob: 8.1.0 - snake-case: 3.0.4 - transitivePeerDependencies: - - supports-color - - typescript - '@svgr/core@6.5.1': dependencies: '@babel/core': 7.24.7 @@ -16204,27 +16048,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@svgr/core@8.1.0(typescript@5.4.5)': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-preset': 8.1.0(@babel/core@7.24.7) - camelcase: 6.3.0 - cosmiconfig: 8.3.6(typescript@5.4.5) - snake-case: 3.0.4 - transitivePeerDependencies: - - supports-color - - typescript - '@svgr/hast-util-to-babel-ast@6.5.1': dependencies: '@babel/types': 7.26.0 entities: 4.5.0 - '@svgr/hast-util-to-babel-ast@8.0.0': - dependencies: - '@babel/types': 7.26.0 - entities: 4.5.0 - '@svgr/plugin-jsx@6.5.1(@svgr/core@6.5.1)': dependencies: '@babel/core': 7.24.7 @@ -16235,22 +16063,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.4.5))': - dependencies: - '@babel/core': 7.24.7 - '@svgr/babel-preset': 8.1.0(@babel/core@7.24.7) - '@svgr/core': 8.1.0(typescript@5.4.5) - '@svgr/hast-util-to-babel-ast': 8.0.0 - svg-parser: 2.0.4 - transitivePeerDependencies: - - supports-color - - '@svgr/plugin-prettier@8.1.0(@svgr/core@8.1.0(typescript@5.4.5))': - dependencies: - '@svgr/core': 8.1.0(typescript@5.4.5) - deepmerge: 4.3.1 - prettier: 2.8.8 - '@svgr/plugin-svgo@6.5.1(@svgr/core@6.5.1)': dependencies: '@svgr/core': 6.5.1 @@ -16258,15 +16070,6 @@ snapshots: deepmerge: 4.3.1 svgo: 2.8.0 - '@svgr/plugin-svgo@8.1.0(@svgr/core@8.1.0(typescript@5.4.5))(typescript@5.4.5)': - dependencies: - '@svgr/core': 8.1.0(typescript@5.4.5) - cosmiconfig: 8.3.6(typescript@5.4.5) - deepmerge: 4.3.1 - svgo: 3.3.2 - transitivePeerDependencies: - - typescript - '@swc/core-darwin-arm64@1.4.2': optional: true @@ -18898,8 +18701,6 @@ snapshots: commander@8.3.0: {} - commander@9.5.0: {} - common-path-prefix@3.0.0: {} commondir@1.0.1: {} @@ -19249,14 +19050,6 @@ snapshots: domutils: 2.8.0 nth-check: 2.1.1 - css-select@5.1.0: - dependencies: - boolbase: 1.0.0 - css-what: 6.1.0 - domhandler: 5.0.3 - domutils: 3.1.0 - nth-check: 2.1.1 - css-tree@1.0.0-alpha.37: dependencies: mdn-data: 2.0.4 @@ -19267,11 +19060,6 @@ snapshots: mdn-data: 2.0.14 source-map: 0.6.1 - css-tree@2.2.1: - dependencies: - mdn-data: 2.0.28 - source-map-js: 1.2.0 - css-tree@2.3.1: dependencies: mdn-data: 2.0.30 @@ -19346,10 +19134,6 @@ snapshots: dependencies: css-tree: 1.1.3 - csso@5.0.5: - dependencies: - css-tree: 2.2.1 - cssom@0.3.8: {} cssom@0.4.4: {} @@ -19439,8 +19223,6 @@ snapshots: dependencies: assert-plus: 1.0.0 - dashify@2.0.0: {} - data-uri-to-buffer@4.0.1: {} data-urls@1.1.0: @@ -23007,9 +22789,7 @@ snapshots: pretty-format: 24.9.0 throat: 4.1.0 transitivePeerDependencies: - - bufferutil - supports-color - - utf-8-validate jest-jasmine2@26.6.3: dependencies: @@ -24352,8 +24132,6 @@ snapshots: mdn-data@2.0.14: {} - mdn-data@2.0.28: {} - mdn-data@2.0.30: {} mdn-data@2.0.4: {} @@ -28584,11 +28362,6 @@ snapshots: smol-toml@1.2.1: {} - snake-case@3.0.4: - dependencies: - dot-case: 3.0.4 - tslib: 2.6.3 - snapdragon-node@2.1.1: dependencies: define-property: 1.0.0 @@ -29166,16 +28939,6 @@ snapshots: picocolors: 1.0.1 stable: 0.1.8 - svgo@3.3.2: - dependencies: - '@trysound/sax': 0.2.0 - commander: 7.2.0 - css-select: 5.1.0 - css-tree: 2.3.1 - css-what: 6.1.0 - csso: 5.0.5 - picocolors: 1.0.1 - svgson@4.1.0: dependencies: deep-rename-keys: 0.2.1