diff --git a/web/package.json b/web/package.json index 7887c75d6d..bd88c9f9da 100644 --- a/web/package.json +++ b/web/package.json @@ -210,7 +210,7 @@ "@vitejs/plugin-react": "5.1.2", "@vitest/coverage-v8": "4.0.17", "autoprefixer": "10.4.21", - "code-inspector-plugin": "1.3.6", + "code-inspector-plugin": "1.4.1", "cross-env": "10.1.0", "esbuild-wasm": "0.27.2", "eslint": "9.39.2", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index bf582463e2..fc88ea53eb 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -517,8 +517,8 @@ importers: specifier: 10.4.21 version: 10.4.21(postcss@8.5.6) code-inspector-plugin: - specifier: 1.3.6 - version: 1.3.6 + specifier: 1.4.1 + version: 1.4.1 cross-env: specifier: 10.1.0 version: 10.1.0 @@ -887,23 +887,23 @@ packages: '@clack/prompts@0.8.2': resolution: {integrity: sha512-6b9Ab2UiZwJYA9iMyboYyW9yJvAO9V753ZhS+DHKEjZRKAxPPOb7MXXu84lsPFG+vZt6FRFniZ8rXi+zCIw4yQ==} - '@code-inspector/core@1.3.6': - resolution: {integrity: sha512-bSxf/PWDPY6rv9EFf0mJvTnLnz3927PPrpX6BmQcRKQab+Ez95yRqrVZY8IcBUpaqA/k3etA5rZ1qkN0V4ERtw==} + '@code-inspector/core@1.4.1': + resolution: {integrity: sha512-k5iLYvrBBPBPODcwuzgEcAZnXU4XTnEO1jOmNQBHCehN6nrMO1m5Efjz35KPkSX+8T4IWvXvLoXR5XPfhDlxug==} - '@code-inspector/esbuild@1.3.6': - resolution: {integrity: sha512-s35dseBXI2yqfX6ZK29Ix941jaE/4KPlZZeMk6B5vDahj75FDUfVxQ7ORy4cX2hyz8CmlOycsY/au5mIvFpAFg==} + '@code-inspector/esbuild@1.4.1': + resolution: {integrity: sha512-0tf73j0wgsu1Rl5CNe5o5L/GB/lGvQQVjuLTbAB/but+Bw//nHRnlrA29lBzNM6cyBDZzwofa71Q+TH8Fu4aZQ==} - '@code-inspector/mako@1.3.6': - resolution: {integrity: sha512-FJvuTElOi3TUCWTIaYTFYk2iTUD6MlO51SC8SYfwmelhuvnOvTMa2TkylInX16OGb4f7sGNLRj2r+7NNx/gqpw==} + '@code-inspector/mako@1.4.1': + resolution: {integrity: sha512-inpiJbc8J+qaEYcMgzyAFusuyryZ9i0wUQhLJRbWl1WrUdWTE8xNHDjhPeTVaMav42NTGDnVKJhhKD6tNaxyFA==} - '@code-inspector/turbopack@1.3.6': - resolution: {integrity: sha512-pfXgvZCn4/brpTvqy8E0HTe6V/ksVKEPQo697Nt5k22kBnlEM61UT3rI2Art+fDDEMPQTxVOFpdbwCKSLwMnmQ==} + '@code-inspector/turbopack@1.4.1': + resolution: {integrity: sha512-xVefk907E39U/oywR9YiEqJn1VlNBHIcIsYkjNnFp0U3qBb3A40VqivlCqkWaP9xHAwEH8/UT3Sfh3aoUPC9/Q==} - '@code-inspector/vite@1.3.6': - resolution: {integrity: sha512-vXYvzGc0S1NR4p3BeD1Xx2170OnyecZD0GtebLlTiHw/cetzlrBHVpbkIwIEzzzpTYYshwwDt8ZbuvdjmqhHgw==} + '@code-inspector/vite@1.4.1': + resolution: {integrity: sha512-ptbGkmtw5mvuFse6Kjmd6bCgm+isHrBq+HumWlAMBH//Qb2frHkEV7kWjO6/AkBXfm/ccNJy+jNwWq0632ChDg==} - '@code-inspector/webpack@1.3.6': - resolution: {integrity: sha512-bi/+vsym9d6NXQQ++Phk74VLMiVoGKjgPHr445j/D43URG8AN8yYa+gRDBEDcZx4B128dihrVMxEO8+OgWGjTw==} + '@code-inspector/webpack@1.4.1': + resolution: {integrity: sha512-UkqC5MsWRVJT2y10GM7tIZdQmFuGAlArJSfq2hq727eXMDV3otY5d1UCQopYvUIEC90QQNHJDeK4e+UQipF6AQ==} '@csstools/color-helpers@5.1.0': resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==} @@ -3944,8 +3944,8 @@ packages: react: ^18 || ^19 || ^19.0.0-rc react-dom: ^18 || ^19 || ^19.0.0-rc - code-inspector-plugin@1.3.6: - resolution: {integrity: sha512-ddTg8embDqLZxKEdSNOm+/0YnVVgWKr10+Bu2qFqQDObj/3twGh0Z23TIz+5/URxfRhTPbp2sUSpWlw78piJbQ==} + code-inspector-plugin@1.4.1: + resolution: {integrity: sha512-DuOEoOWtkz3Mq6JTogJjSfXkVnXuGy6Gjfi+eBYtgRFlZmQ5sw1/LacsPnTK89O4Oz6gZj+zjxpwNfpWg3htpA==} collapse-white-space@2.1.0: resolution: {integrity: sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw==} @@ -8025,7 +8025,7 @@ snapshots: picocolors: 1.1.1 sisteransi: 1.0.5 - '@code-inspector/core@1.3.6': + '@code-inspector/core@1.4.1': dependencies: '@vue/compiler-dom': 3.5.27 chalk: 4.1.2 @@ -8035,35 +8035,35 @@ snapshots: transitivePeerDependencies: - supports-color - '@code-inspector/esbuild@1.3.6': + '@code-inspector/esbuild@1.4.1': dependencies: - '@code-inspector/core': 1.3.6 + '@code-inspector/core': 1.4.1 transitivePeerDependencies: - supports-color - '@code-inspector/mako@1.3.6': + '@code-inspector/mako@1.4.1': dependencies: - '@code-inspector/core': 1.3.6 + '@code-inspector/core': 1.4.1 transitivePeerDependencies: - supports-color - '@code-inspector/turbopack@1.3.6': + '@code-inspector/turbopack@1.4.1': dependencies: - '@code-inspector/core': 1.3.6 - '@code-inspector/webpack': 1.3.6 + '@code-inspector/core': 1.4.1 + '@code-inspector/webpack': 1.4.1 transitivePeerDependencies: - supports-color - '@code-inspector/vite@1.3.6': + '@code-inspector/vite@1.4.1': dependencies: - '@code-inspector/core': 1.3.6 + '@code-inspector/core': 1.4.1 chalk: 4.1.1 transitivePeerDependencies: - supports-color - '@code-inspector/webpack@1.3.6': + '@code-inspector/webpack@1.4.1': dependencies: - '@code-inspector/core': 1.3.6 + '@code-inspector/core': 1.4.1 transitivePeerDependencies: - supports-color @@ -11336,14 +11336,14 @@ snapshots: - '@types/react' - '@types/react-dom' - code-inspector-plugin@1.3.6: + code-inspector-plugin@1.4.1: dependencies: - '@code-inspector/core': 1.3.6 - '@code-inspector/esbuild': 1.3.6 - '@code-inspector/mako': 1.3.6 - '@code-inspector/turbopack': 1.3.6 - '@code-inspector/vite': 1.3.6 - '@code-inspector/webpack': 1.3.6 + '@code-inspector/core': 1.4.1 + '@code-inspector/esbuild': 1.4.1 + '@code-inspector/mako': 1.4.1 + '@code-inspector/turbopack': 1.4.1 + '@code-inspector/vite': 1.4.1 + '@code-inspector/webpack': 1.4.1 chalk: 4.1.1 transitivePeerDependencies: - supports-color diff --git a/web/tailwind-common-config.ts b/web/tailwind-common-config.ts index 9cf49b6391..c5deb64677 100644 --- a/web/tailwind-common-config.ts +++ b/web/tailwind-common-config.ts @@ -1,7 +1,7 @@ import path from 'node:path' import { fileURLToPath } from 'node:url' import { getIconCollections, iconsPlugin } from '@egoist/tailwindcss-icons' -import { cleanupSVG, importDirectorySync, isEmptyColor, parseColors, runSVGO } from '@iconify/tools' +import { cleanupSVG, deOptimisePaths, importDirectorySync, isEmptyColor, parseColors, runSVGO } from '@iconify/tools' import { compareColors, stringToColor } from '@iconify/utils/lib/colors' import tailwindTypography from '@tailwindcss/typography' // @ts-expect-error workaround for turbopack issue @@ -68,6 +68,9 @@ function getCollections(dir: string) { // Optimise runSVGO(svg) + + // Update paths for compatibility with old software + deOptimisePaths(svg) } catch (err) { // Invalid icon @@ -232,8 +235,14 @@ const config = { iconsPlugin({ collections: { 'custom-public': getCollections(path.resolve(_dirname, 'app/components/base/icons/assets/public')), + 'custom-vender': getCollections(path.resolve(_dirname, 'app/components/base/icons/assets/vender')), ...getIconCollections(['heroicons', 'ri']), }, + extraProperties: { + width: '1rem', + height: '1rem', + display: 'block', + }, }), ], // https://github.com/tailwindlabs/tailwindcss/discussions/5969