diff --git a/flake.nix b/flake.nix index b6aaf8c6fe..3a2be7cda8 100644 --- a/flake.nix +++ b/flake.nix @@ -197,7 +197,7 @@ fetcherVersion = 4; # Update with the hash reported by a failed fixed-output build: # nix build .#dbx-pnpm-deps 2>&1 | grep 'got:' - hash = "sha256-Y2St1Pf2+/R+WHd8RIbwUHeCvmYsFAh07+8LVGhOjTo="; + hash = "sha256-M79LmFqGZMv/0/3VMq1B6l44GpAAJYhoN4HbcTdu5vw="; }; # ── Step 2: vendor Cargo dependencies ───────────────────────────── # diff --git a/package.json b/package.json index 05d82b3150..6ac5b880df 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,6 @@ "pinyin-pro": "^3.28.2", "proj4": "^2.20.9", "reka-ui": "^2.10.1", - "shadcn-vue": "^2.7.4", "shiki": "^4.2.0", "smol-toml": "^1.8.0", "splitpanes": "^4.1.2", @@ -138,6 +137,7 @@ "lint-staged": "^16.4.0", "oxfmt": "0.53.0", "oxlint": "^1.68.0", + "shadcn-vue": "^2.7.4", "tailwindcss": "^4.3.0", "tsx": "^4.22.4", "typescript": "~6.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 606538180c..ec474b725e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,10 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + postcss@^8: '>=8.5.23' + nanoid@^3: '>=3.3.18' + importers: .: @@ -179,9 +183,6 @@ importers: reka-ui: specifier: ^2.10.1 version: 2.10.1(vue@3.5.35(typescript@6.0.3)) - shadcn-vue: - specifier: ^2.7.4 - version: 2.7.4(eslint@10.2.1(jiti@2.7.0))(magicast@0.5.5)(vue@3.5.35(typescript@6.0.3)) shiki: specifier: ^4.2.0 version: 4.2.0 @@ -261,6 +262,9 @@ importers: oxlint: specifier: ^1.68.0 version: 1.68.0 + shadcn-vue: + specifier: ^2.7.4 + version: 2.7.4(eslint@10.2.1(jiti@2.7.0))(magicast@0.5.5)(vue@3.5.35(typescript@6.0.3)) tailwindcss: specifier: ^4.3.0 version: 4.3.0 @@ -1771,6 +1775,7 @@ packages: '@xmldom/xmldom@0.8.13': resolution: {integrity: sha512-KRYzxepc14G/CEpEGc3Yn+JKaAeT63smlDr+vjB8jRfgTBBI9wRj/nkQEO+ucV8p8I9bfKLWp37uHgFrbntPvw==} engines: {node: '>=10.0.0'} + deprecated: this version has critical issues, please update to the latest version accepts@2.0.0: resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==} @@ -3117,16 +3122,6 @@ packages: muggle-string@0.4.1: resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==} - nanoid@3.3.12: - resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - - nanoid@3.3.15: - resolution: {integrity: sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - nanoid@3.3.18: resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -3373,7 +3368,7 @@ packages: resolution: {integrity: sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg==} engines: {node: '>=12'} peerDependencies: - postcss: ^8.3.5 + postcss: '>=8.5.23' postcss-sass@0.5.0: resolution: {integrity: sha512-qtu8awh1NMF3o9j/x9j3EZnd+BlF66X6NZYl12BdKoG2Z4hmydOt/dZj2Nq+g0kfk2pQy3jeYFBmvG9DBwynGQ==} @@ -3383,7 +3378,7 @@ packages: resolution: {integrity: sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==} engines: {node: '>=12.0'} peerDependencies: - postcss: ^8.4.29 + postcss: '>=8.5.23' postcss-selector-parser@7.1.4: resolution: {integrity: sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==} @@ -3393,14 +3388,6 @@ packages: resolution: {integrity: sha512-8I7Cd8sxiEITIp32xBK4K/Aj1ukX6vuWnx8oY/oAH35NfQI4OZaY5nd68Yx8HeN5S49uhQ6DL0rNk0ZBu/TaLg==} engines: {node: ^8.10.0 || ^10.13.0 || ^11.10.1 || >=12.13.0} - postcss@8.5.15: - resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==} - engines: {node: ^10 || ^12 || >=14} - - postcss@8.5.16: - resolution: {integrity: sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==} - engines: {node: ^10 || ^12 || >=14} - postcss@8.5.26: resolution: {integrity: sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==} engines: {node: ^10 || ^12 || >=14} @@ -5383,7 +5370,7 @@ snapshots: '@vue/compiler-sfc@2.7.16': dependencies: '@babel/parser': 7.29.7 - postcss: 8.5.16 + postcss: 8.5.26 source-map: 0.6.1 optionalDependencies: prettier: 2.8.8 @@ -5397,7 +5384,7 @@ snapshots: '@vue/shared': 3.5.35 estree-walker: 2.0.2 magic-string: 0.30.21 - postcss: 8.5.15 + postcss: 8.5.26 source-map-js: 1.2.1 '@vue/compiler-sfc@3.5.39': @@ -5409,7 +5396,7 @@ snapshots: '@vue/shared': 3.5.39 estree-walker: 2.0.2 magic-string: 0.30.21 - postcss: 8.5.16 + postcss: 8.5.26 source-map-js: 1.2.1 '@vue/compiler-ssr@3.5.35': @@ -6795,10 +6782,6 @@ snapshots: muggle-string@0.4.1: {} - nanoid@3.3.12: {} - - nanoid@3.3.15: {} - nanoid@3.3.18: {} natural-compare@1.4.0: {} @@ -7043,18 +7026,18 @@ snapshots: dependencies: find-up: 3.0.0 - postcss-less@6.0.0(postcss@8.5.16): + postcss-less@6.0.0(postcss@8.5.26): dependencies: - postcss: 8.5.16 + postcss: 8.5.26 postcss-sass@0.5.0: dependencies: gonzales-pe: 4.3.0 - postcss: 8.5.16 + postcss: 8.5.26 - postcss-scss@4.0.9(postcss@8.5.16): + postcss-scss@4.0.9(postcss@8.5.26): dependencies: - postcss: 8.5.16 + postcss: 8.5.26 postcss-selector-parser@7.1.4: dependencies: @@ -7066,23 +7049,11 @@ snapshots: debug: 4.4.3 fast-diff: 1.3.0 lodash.sortedlastindex: 4.1.0 - postcss: 8.5.16 + postcss: 8.5.26 stylus: 0.57.0 transitivePeerDependencies: - supports-color - postcss@8.5.15: - dependencies: - nanoid: 3.3.12 - picocolors: 1.1.1 - source-map-js: 1.2.1 - - postcss@8.5.16: - dependencies: - nanoid: 3.3.15 - picocolors: 1.1.1 - source-map-js: 1.2.1 - postcss@8.5.26: dependencies: nanoid: 3.3.18 @@ -7287,7 +7258,7 @@ snapshots: open: 10.2.0 ora: 9.4.1 pathe: 2.0.3 - postcss: 8.5.16 + postcss: 8.5.26 postcss-selector-parser: 7.1.4 prompts: 2.4.2 reka-ui: 2.10.1(vue@3.5.35(typescript@6.0.3)) @@ -7760,10 +7731,10 @@ snapshots: magic-string: 0.30.21 micromatch: 4.0.8 node-html-parser: 7.1.0 - postcss: 8.5.16 - postcss-less: 6.0.0(postcss@8.5.16) + postcss: 8.5.26 + postcss-less: 6.0.0(postcss@8.5.26) postcss-sass: 0.5.0 - postcss-scss: 4.0.9(postcss@8.5.16) + postcss-scss: 4.0.9(postcss@8.5.26) postcss-styl: 0.12.3 recast-x: 1.0.5 table: 6.9.0 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5d221fe90e..b03e3b64ca 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,6 +1,10 @@ packages: - "packages/*" +overrides: + postcss@^8: ">=8.5.23" + nanoid@^3: ">=3.3.18" + allowBuilds: better-sqlite3: true esbuild: true