diff --git a/electron.vite.config.ts b/electron.vite.config.ts index 730b3ccbea..441c0c1ffc 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -112,6 +112,7 @@ export default defineConfig({ '@cherrystudio/ai-core': resolve('packages/aiCore/src'), '@cherrystudio/extension-table-plus': resolve('packages/extension-table-plus/src'), '@cherrystudio/ai-sdk-provider': resolve('packages/ai-sdk-provider/src'), + '@cherrystudio/ui/icons': resolve('packages/ui/src/components/icons'), '@cherrystudio/ui': resolve('packages/ui/src') } }, diff --git a/packages/ui/package.json b/packages/ui/package.json index 6df25ee88e..a02e3c71e6 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -85,7 +85,6 @@ "react-dom": "^19.0.0", "storybook": "^10.0.5", "styled-components": "^6.1.15", - "svgo": "^4.0.0", "tsdown": "^0.15.5", "tsx": "^4.20.6", "typescript": "^5.6.2", @@ -133,6 +132,13 @@ "require": "./dist/utils/index.js", "default": "./dist/utils/index.js" }, + "./icons": { + "types": "./dist/components/icons/index.d.ts", + "react-native": "./dist/components/icons/index.js", + "import": "./dist/components/icons/index.mjs", + "require": "./dist/components/icons/index.js", + "default": "./dist/components/icons/index.js" + }, "./styles": "./src/styles/index.css", "./styles/tokens.css": "./src/styles/tokens.css", "./styles/theme.css": "./src/styles/theme.css", diff --git a/tsconfig.web.json b/tsconfig.web.json index 61fb46c7af..f254b778f0 100644 --- a/tsconfig.web.json +++ b/tsconfig.web.json @@ -31,6 +31,7 @@ "@cherrystudio/ai-core": ["./packages/aiCore/src/index.ts"], "@cherrystudio/extension-table-plus": ["./packages/extension-table-plus/src/index.ts"], "@cherrystudio/ai-sdk-provider": ["./packages/ai-sdk-provider/src/index.ts"], + "@cherrystudio/ui/icons": ["./packages/ui/src/components/icons/index.ts"], "@cherrystudio/ui": ["./packages/ui/src/index.ts"], "@cherrystudio/ui/*": ["./packages/ui/src/*"] diff --git a/yarn.lock b/yarn.lock index 534dd235ee..6417b51312 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2161,7 +2161,6 @@ __metadata: "@storybook/addon-docs": "npm:^10.0.5" "@storybook/addon-themes": "npm:^10.0.5" "@storybook/react-vite": "npm:^10.0.5" - "@svgr/cli": "npm:^8.1.0" "@svgr/core": "npm:^8.1.0" "@svgr/plugin-jsx": "npm:^8.1.0" "@svgr/plugin-prettier": "npm:^8.1.0" @@ -2185,8 +2184,6 @@ __metadata: react-dropzone: "npm:^14.3.8" storybook: "npm:^10.0.5" styled-components: "npm:^6.1.15" - svgo: "npm:^4.0.0" - svgson: "npm:^5.3.1" tailwind-merge: "npm:^2.5.5" tsdown: "npm:^0.15.5" tsx: "npm:^4.20.6" @@ -10475,27 +10472,7 @@ __metadata: languageName: node linkType: hard -"@svgr/cli@npm:^8.1.0": - version: 8.1.0 - resolution: "@svgr/cli@npm:8.1.0" - dependencies: - "@svgr/core": "npm:8.1.0" - "@svgr/plugin-jsx": "npm:8.1.0" - "@svgr/plugin-prettier": "npm:8.1.0" - "@svgr/plugin-svgo": "npm:8.1.0" - camelcase: "npm:^6.2.0" - chalk: "npm:^4.1.2" - commander: "npm:^9.4.1" - dashify: "npm:^2.0.0" - glob: "npm:^8.0.3" - snake-case: "npm:^3.0.4" - bin: - svgr: bin/svgr - checksum: 10c0/c682defbd1d00c864353a0d03b946547b2dbac6ddcd82467c5c3698cb2995d17595cf1603e4953930ca240092b36aedad4108e567c1162e6df4bd331b2423269 - languageName: node - linkType: hard - -"@svgr/core@npm:8.1.0, @svgr/core@npm:^8.1.0": +"@svgr/core@npm:^8.1.0": version: 8.1.0 resolution: "@svgr/core@npm:8.1.0" dependencies: @@ -10518,7 +10495,7 @@ __metadata: languageName: node linkType: hard -"@svgr/plugin-jsx@npm:8.1.0, @svgr/plugin-jsx@npm:^8.1.0": +"@svgr/plugin-jsx@npm:^8.1.0": version: 8.1.0 resolution: "@svgr/plugin-jsx@npm:8.1.0" dependencies: @@ -10532,7 +10509,7 @@ __metadata: languageName: node linkType: hard -"@svgr/plugin-prettier@npm:8.1.0, @svgr/plugin-prettier@npm:^8.1.0": +"@svgr/plugin-prettier@npm:^8.1.0": version: 8.1.0 resolution: "@svgr/plugin-prettier@npm:8.1.0" dependencies: @@ -10544,7 +10521,7 @@ __metadata: languageName: node linkType: hard -"@svgr/plugin-svgo@npm:8.1.0, @svgr/plugin-svgo@npm:^8.1.0": +"@svgr/plugin-svgo@npm:^8.1.0": version: 8.1.0 resolution: "@svgr/plugin-svgo@npm:8.1.0" dependencies: @@ -15736,13 +15713,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^11.1.0": - version: 11.1.0 - resolution: "commander@npm:11.1.0" - checksum: 10c0/13cc6ac875e48780250f723fb81c1c1178d35c5decb1abb1b628b3177af08a8554e76b2c0f29de72d69eef7c864d12613272a71fabef8047922bc622ab75a179 - languageName: node - linkType: hard - "commander@npm:^2.19.0, commander@npm:^2.8.1": version: 2.20.3 resolution: "commander@npm:2.20.3" @@ -16111,16 +16081,6 @@ __metadata: languageName: node linkType: hard -"css-tree@npm:^3.0.1": - version: 3.1.0 - resolution: "css-tree@npm:3.1.0" - dependencies: - mdn-data: "npm:2.12.2" - source-map-js: "npm:^1.0.1" - checksum: 10c0/b5715852c2f397c715ca00d56ec53fc83ea596295ae112eb1ba6a1bda3b31086380e596b1d8c4b980fe6da09e7d0fc99c64d5bb7313030dd0fba9c1415f30979 - languageName: node - linkType: hard - "css-tree@npm:~2.2.0": version: 2.2.1 resolution: "css-tree@npm:2.2.1" @@ -16587,13 +16547,6 @@ __metadata: languageName: node linkType: hard -"dashify@npm:^2.0.0": - version: 2.0.0 - resolution: "dashify@npm:2.0.0" - checksum: 10c0/b9ab76cbd9739b6dba4359083cc9a670e6a0876f90ab3409b9984cf386b82a28a89009afe15d13ce62f97bc84ce49be2fe85f3a6791481a8d31e962cd0f0e710 - languageName: node - linkType: hard - "dashjs@npm:^5.0.3": version: 5.0.3 resolution: "dashjs@npm:5.0.3" @@ -16822,16 +16775,6 @@ __metadata: languageName: node linkType: hard -"deep-rename-keys@npm:^0.2.1": - version: 0.2.1 - resolution: "deep-rename-keys@npm:0.2.1" - dependencies: - kind-of: "npm:^3.0.2" - rename-keys: "npm:^1.1.2" - checksum: 10c0/841eb25a07f1853651e5061c84e9d0eb2be44d7a7b16381de778e5378e87aa7fb6a97cf49f3723d861f77ac857f3bfee85121168cf01ecfe86de16125e138627 - languageName: node - linkType: hard - "deepmerge@npm:4.3.1, deepmerge@npm:^4.3.1": version: 4.3.1 resolution: "deepmerge@npm:4.3.1" @@ -18335,13 +18278,6 @@ __metadata: languageName: node linkType: hard -"eventemitter3@npm:^2.0.0": - version: 2.0.3 - resolution: "eventemitter3@npm:2.0.3" - checksum: 10c0/001ff65ddf1c2d627edcdde5efc2a8335a42af72406970de3b4917368e9f0fab5de7d02cdbfb0f5fca944543b2057e045be91c91b9ae3adc6a4dc10c99ad814f - languageName: node - linkType: hard - "eventemitter3@npm:^4.0.4": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" @@ -19362,7 +19298,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1, glob@npm:^8.0.3, glob@npm:^8.1.0": +"glob@npm:^8.0.1, glob@npm:^8.1.0": version: 8.1.0 resolution: "glob@npm:8.1.0" dependencies: @@ -20301,13 +20237,6 @@ __metadata: languageName: node linkType: hard -"is-buffer@npm:^1.1.5, is-buffer@npm:~1.1.6": - version: 1.1.6 - resolution: "is-buffer@npm:1.1.6" - checksum: 10c0/ae18aa0b6e113d6c490ad1db5e8df9bdb57758382b313f5a22c9c61084875c6396d50bbf49315f5b1926d142d74dfb8d31b40d993a383e0a158b15fea7a82234 - languageName: node - linkType: hard - "is-buffer@npm:^2.0.0": version: 2.0.5 resolution: "is-buffer@npm:2.0.5" @@ -20315,6 +20244,13 @@ __metadata: languageName: node linkType: hard +"is-buffer@npm:~1.1.6": + version: 1.1.6 + resolution: "is-buffer@npm:1.1.6" + checksum: 10c0/ae18aa0b6e113d6c490ad1db5e8df9bdb57758382b313f5a22c9c61084875c6396d50bbf49315f5b1926d142d74dfb8d31b40d993a383e0a158b15fea7a82234 + languageName: node + linkType: hard + "is-ci@npm:^3.0.0": version: 3.0.1 resolution: "is-ci@npm:3.0.1" @@ -21003,15 +20939,6 @@ __metadata: languageName: node linkType: hard -"kind-of@npm:^3.0.2": - version: 3.2.2 - resolution: "kind-of@npm:3.2.2" - dependencies: - is-buffer: "npm:^1.1.5" - checksum: 10c0/7e34bc29d4b02c997f92f080de34ebb92033a96736bbb0bb2410e033a7e5ae6571f1fa37b2d7710018f95361473b816c604234197f4f203f9cf149d8ef1574d9 - languageName: node - linkType: hard - "kind-of@npm:^6.0.0, kind-of@npm:^6.0.2": version: 6.0.3 resolution: "kind-of@npm:6.0.3" @@ -22325,13 +22252,6 @@ __metadata: languageName: node linkType: hard -"mdn-data@npm:2.12.2": - version: 2.12.2 - resolution: "mdn-data@npm:2.12.2" - checksum: 10c0/b22443b71d70f72ccc3c6ba1608035431a8fc18c3c8fc53523f06d20e05c2ac10f9b53092759a2ca85cf02f0d37036f310b581ce03e7b99ac74d388ef8152ade - languageName: node - linkType: hard - "mdurl@npm:^2.0.0": version: 2.0.0 resolution: "mdurl@npm:2.0.0" @@ -26478,13 +26398,6 @@ __metadata: languageName: node linkType: hard -"rename-keys@npm:^1.1.2": - version: 1.2.0 - resolution: "rename-keys@npm:1.2.0" - checksum: 10c0/db7b819ec3dc480492d3840dad9f30fa0ed267e6e77b15e99fb8ad1b4e84ca12bbda9968c186a3eded994fdcad88cd8277d9986af20dbbd30fe5e3c409862244 - languageName: node - linkType: hard - "repeat-string@npm:^1.0.0": version: 1.6.1 resolution: "repeat-string@npm:1.6.1" @@ -27080,13 +26993,6 @@ __metadata: languageName: node linkType: hard -"sax@npm:^1.4.1": - version: 1.4.3 - resolution: "sax@npm:1.4.3" - checksum: 10c0/45bba07561d93f184a8686e1a543418ced8c844b994fbe45cc49d5cd2fc8ac7ec949dae38565e35e388ad0cca2b75997a29b6857c927bf6553da3f80ed0e4e62 - languageName: node - linkType: hard - "saxes@npm:^5.0.1": version: 5.0.1 resolution: "saxes@npm:5.0.1" @@ -28198,33 +28104,6 @@ __metadata: languageName: node linkType: hard -"svgo@npm:^4.0.0": - version: 4.0.0 - resolution: "svgo@npm:4.0.0" - dependencies: - commander: "npm:^11.1.0" - css-select: "npm:^5.1.0" - css-tree: "npm:^3.0.1" - css-what: "npm:^6.1.0" - csso: "npm:^5.0.5" - picocolors: "npm:^1.1.1" - sax: "npm:^1.4.1" - bin: - svgo: ./bin/svgo.js - checksum: 10c0/2b01c910d59d10bb15e17714181a8fa96531b09a4e2cf2ca1abe24dbcb8400725b6d542d6e456c62222546e334d5b344799c170c5b6be0c48e31b02c23297275 - languageName: node - linkType: hard - -"svgson@npm:^5.3.1": - version: 5.3.1 - resolution: "svgson@npm:5.3.1" - dependencies: - deep-rename-keys: "npm:^0.2.1" - xml-reader: "npm:2.4.3" - checksum: 10c0/44d9cf62ec3eaf00d6ed5b2b939971c46aabfba08847dac6ac494c2177e5d08dddfebc2946891adf8705a0c5409c55766ba74a4c6a41f7dc41fce66c95dcb4ee - languageName: node - linkType: hard - "swagger-jsdoc@npm:^6.2.8": version: 6.2.8 resolution: "swagger-jsdoc@npm:6.2.8" @@ -30278,15 +30157,6 @@ __metadata: languageName: node linkType: hard -"xml-lexer@npm:^0.2.2": - version: 0.2.2 - resolution: "xml-lexer@npm:0.2.2" - dependencies: - eventemitter3: "npm:^2.0.0" - checksum: 10c0/592f8520a654836b2eb458895c108c6493a2cee52f8e38c027ff6d922d45484b6e7386647f70362cbb0324f705465bdf040a4076f842af265e2e368a3b29d5a7 - languageName: node - linkType: hard - "xml-name-validator@npm:^5.0.0": version: 5.0.0 resolution: "xml-name-validator@npm:5.0.0" @@ -30294,16 +30164,6 @@ __metadata: languageName: node linkType: hard -"xml-reader@npm:2.4.3": - version: 2.4.3 - resolution: "xml-reader@npm:2.4.3" - dependencies: - eventemitter3: "npm:^2.0.0" - xml-lexer: "npm:^0.2.2" - checksum: 10c0/b2514806af287800f1cc7756c0d9773ec45ce26acc32f8e23bd22c04eaa18ffe6b05275acc276e291f037f9f9ffd3d65dc9044363f6a087a95a7a1c62428aec2 - languageName: node - linkType: hard - "xml2js@npm:0.6.2": version: 0.6.2 resolution: "xml2js@npm:0.6.2"