diff --git a/package.json b/package.json index 278e2eac89..859ff07447 100644 --- a/package.json +++ b/package.json @@ -221,7 +221,7 @@ "vinyl-fs": "^4.0.0", "vite": "^5.1.3", "vite-plugin-dts": "4.2.1", - "vitest": "^3.0.0", + "vitest": "^3.0.7", "vitest-canvas-mock": "^0.3.3", "yargs": "^17.7.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4b0dcedc55..6348cfb46d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -173,10 +173,10 @@ importers: version: 4.3.4(vite@5.4.11(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0)) '@vitest/coverage-v8': specifier: ^2.0.4 - version: 2.1.8(vitest@3.0.5) + version: 2.1.8(vitest@3.0.7) '@vitest/ui': specifier: ^2.0.4 - version: 2.1.8(vitest@3.0.5) + version: 2.1.8(vitest@3.0.7) autoprefixer: specifier: ^10.4.17 version: 10.4.20(postcss@8.4.49) @@ -370,11 +370,11 @@ importers: specifier: 4.2.1 version: 4.2.1(@types/node@20.17.12)(rollup@4.30.0)(typescript@5.7.2)(vite@5.4.11(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0)) vitest: - specifier: ^3.0.0 - version: 3.0.5(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) + specifier: ^3.0.7 + version: 3.0.7(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) vitest-canvas-mock: specifier: ^0.3.3 - version: 0.3.3(vitest@3.0.5) + version: 0.3.3(vitest@3.0.7) yargs: specifier: ^17.7.2 version: 17.7.2 @@ -3860,8 +3860,8 @@ packages: '@vitest/expect@2.1.8': resolution: {integrity: sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==} - '@vitest/expect@3.0.5': - resolution: {integrity: sha512-nNIOqupgZ4v5jWuQx2DSlHLEs7Q4Oh/7AYwNyE+k0UQzG7tSmjPXShUikn1mpNGzYEN2jJbTvLejwShMitovBA==, tarball: https://registry.npmjs.org/@vitest/expect/-/expect-3.0.5.tgz} + '@vitest/expect@3.0.7': + resolution: {integrity: sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==, tarball: https://registry.npmjs.org/@vitest/expect/-/expect-3.0.7.tgz} '@vitest/mocker@2.1.8': resolution: {integrity: sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==} @@ -3874,8 +3874,8 @@ packages: vite: optional: true - '@vitest/mocker@3.0.5': - resolution: {integrity: sha512-CLPNBFBIE7x6aEGbIjaQAX03ZZlBMaWwAjBdMkIf/cAn6xzLTiM3zYqO/WAbieEjsAZir6tO71mzeHZoodThvw==, tarball: https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.5.tgz} + '@vitest/mocker@3.0.7': + resolution: {integrity: sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==, tarball: https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.7.tgz} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -3888,8 +3888,8 @@ packages: '@vitest/pretty-format@2.1.8': resolution: {integrity: sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==} - '@vitest/pretty-format@3.0.5': - resolution: {integrity: sha512-CjUtdmpOcm4RVtB+up8r2vVDLR16Mgm/bYdkGFe3Yj/scRfCpbSi2W/BDSDcFK7ohw8UXvjMbOp9H4fByd/cOA==, tarball: https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.5.tgz} + '@vitest/pretty-format@3.0.7': + resolution: {integrity: sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==, tarball: https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.7.tgz} '@vitest/runner@1.6.0': resolution: {integrity: sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==} @@ -3897,8 +3897,8 @@ packages: '@vitest/runner@2.1.8': resolution: {integrity: sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==} - '@vitest/runner@3.0.5': - resolution: {integrity: sha512-BAiZFityFexZQi2yN4OX3OkJC6scwRo8EhRB0Z5HIGGgd2q+Nq29LgHU/+ovCtd0fOfXj5ZI6pwdlUmC5bpi8A==, tarball: https://registry.npmjs.org/@vitest/runner/-/runner-3.0.5.tgz} + '@vitest/runner@3.0.7': + resolution: {integrity: sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==, tarball: https://registry.npmjs.org/@vitest/runner/-/runner-3.0.7.tgz} '@vitest/snapshot@1.6.0': resolution: {integrity: sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==} @@ -3906,8 +3906,8 @@ packages: '@vitest/snapshot@2.1.8': resolution: {integrity: sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==} - '@vitest/snapshot@3.0.5': - resolution: {integrity: sha512-GJPZYcd7v8QNUJ7vRvLDmRwl+a1fGg4T/54lZXe+UOGy47F9yUfE18hRCtXL5aHN/AONu29NGzIXSVFh9K0feA==, tarball: https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.5.tgz} + '@vitest/snapshot@3.0.7': + resolution: {integrity: sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==, tarball: https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.7.tgz} '@vitest/spy@1.6.0': resolution: {integrity: sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==} @@ -3915,8 +3915,8 @@ packages: '@vitest/spy@2.1.8': resolution: {integrity: sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==} - '@vitest/spy@3.0.5': - resolution: {integrity: sha512-5fOzHj0WbUNqPK6blI/8VzZdkBlQLnT25knX0r4dbZI9qoZDf3qAdjoMmDcLG5A83W6oUUFJgUd0EYBc2P5xqg==, tarball: https://registry.npmjs.org/@vitest/spy/-/spy-3.0.5.tgz} + '@vitest/spy@3.0.7': + resolution: {integrity: sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==, tarball: https://registry.npmjs.org/@vitest/spy/-/spy-3.0.7.tgz} '@vitest/ui@2.1.8': resolution: {integrity: sha512-5zPJ1fs0ixSVSs5+5V2XJjXLmNzjugHRyV11RqxYVR+oMcogZ9qTuSfKW+OcTV0JeFNznI83BNylzH6SSNJ1+w==} @@ -3929,8 +3929,8 @@ packages: '@vitest/utils@2.1.8': resolution: {integrity: sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==} - '@vitest/utils@3.0.5': - resolution: {integrity: sha512-N9AX0NUoUtVwKwy21JtwzaqR5L5R5A99GAbrHfCCXK1lp593i/3AZAXhSP43wRQuxYsflrdzEfXZFo1reR1Nkg==, tarball: https://registry.npmjs.org/@vitest/utils/-/utils-3.0.5.tgz} + '@vitest/utils@3.0.7': + resolution: {integrity: sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==, tarball: https://registry.npmjs.org/@vitest/utils/-/utils-3.0.7.tgz} '@volar/language-core@2.4.11': resolution: {integrity: sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==} @@ -4697,6 +4697,10 @@ packages: resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==} engines: {node: '>=12'} + chai@5.2.0: + resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==, tarball: https://registry.npmjs.org/chai/-/chai-5.2.0.tgz} + engines: {node: '>=12'} + chalk@3.0.0: resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==} engines: {node: '>=8'} @@ -8072,6 +8076,9 @@ packages: loupe@3.1.2: resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==} + loupe@3.1.3: + resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==, tarball: https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz} + lower-case@1.1.4: resolution: {integrity: sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==} @@ -11280,8 +11287,8 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} hasBin: true - vite-node@3.0.5: - resolution: {integrity: sha512-02JEJl7SbtwSDJdYS537nU6l+ktdvcREfLksk/NDAqtdKWGqHl+joXzEubHROmS3E6pip+Xgu2tFezMu75jH7A==, tarball: https://registry.npmjs.org/vite-node/-/vite-node-3.0.5.tgz} + vite-node@3.0.7: + resolution: {integrity: sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==, tarball: https://registry.npmjs.org/vite-node/-/vite-node-3.0.7.tgz} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -11387,16 +11394,16 @@ packages: jsdom: optional: true - vitest@3.0.5: - resolution: {integrity: sha512-4dof+HvqONw9bvsYxtkfUp2uHsTN9bV2CZIi1pWgoFpL1Lld8LA1ka9q/ONSsoScAKG7NVGf2stJTI7XRkXb2Q==, tarball: https://registry.npmjs.org/vitest/-/vitest-3.0.5.tgz} + vitest@3.0.7: + resolution: {integrity: sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==, tarball: https://registry.npmjs.org/vitest/-/vitest-3.0.7.tgz} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.5 - '@vitest/ui': 3.0.5 + '@vitest/browser': 3.0.7 + '@vitest/ui': 3.0.7 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -15670,7 +15677,7 @@ snapshots: - supports-color optional: true - '@vitest/coverage-v8@2.1.8(vitest@3.0.5)': + '@vitest/coverage-v8@2.1.8(vitest@3.0.7)': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 0.2.3 @@ -15684,7 +15691,7 @@ snapshots: std-env: 3.8.0 test-exclude: 7.0.1 tinyrainbow: 1.2.0 - vitest: 3.0.5(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) + vitest: 3.0.7(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) transitivePeerDependencies: - supports-color @@ -15701,11 +15708,11 @@ snapshots: chai: 5.1.2 tinyrainbow: 1.2.0 - '@vitest/expect@3.0.5': + '@vitest/expect@3.0.7': dependencies: - '@vitest/spy': 3.0.5 - '@vitest/utils': 3.0.5 - chai: 5.1.2 + '@vitest/spy': 3.0.7 + '@vitest/utils': 3.0.7 + chai: 5.2.0 tinyrainbow: 2.0.0 '@vitest/mocker@2.1.8(vite@5.4.11(@types/node@22.10.5)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0))': @@ -15716,9 +15723,9 @@ snapshots: optionalDependencies: vite: 5.4.11(@types/node@22.10.5)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) - '@vitest/mocker@3.0.5(vite@5.4.11(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0))': + '@vitest/mocker@3.0.7(vite@5.4.11(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0))': dependencies: - '@vitest/spy': 3.0.5 + '@vitest/spy': 3.0.7 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: @@ -15728,7 +15735,7 @@ snapshots: dependencies: tinyrainbow: 1.2.0 - '@vitest/pretty-format@3.0.5': + '@vitest/pretty-format@3.0.7': dependencies: tinyrainbow: 2.0.0 @@ -15743,9 +15750,9 @@ snapshots: '@vitest/utils': 2.1.8 pathe: 1.1.2 - '@vitest/runner@3.0.5': + '@vitest/runner@3.0.7': dependencies: - '@vitest/utils': 3.0.5 + '@vitest/utils': 3.0.7 pathe: 2.0.3 '@vitest/snapshot@1.6.0': @@ -15760,9 +15767,9 @@ snapshots: magic-string: 0.30.17 pathe: 1.1.2 - '@vitest/snapshot@3.0.5': + '@vitest/snapshot@3.0.7': dependencies: - '@vitest/pretty-format': 3.0.5 + '@vitest/pretty-format': 3.0.7 magic-string: 0.30.17 pathe: 2.0.3 @@ -15774,7 +15781,7 @@ snapshots: dependencies: tinyspy: 3.0.2 - '@vitest/spy@3.0.5': + '@vitest/spy@3.0.7': dependencies: tinyspy: 3.0.2 @@ -15790,7 +15797,7 @@ snapshots: vitest: 2.1.8(@types/node@22.10.5)(@vitest/ui@2.1.8)(happy-dom@17.1.0)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) optional: true - '@vitest/ui@2.1.8(vitest@3.0.5)': + '@vitest/ui@2.1.8(vitest@3.0.7)': dependencies: '@vitest/utils': 2.1.8 fflate: 0.8.2 @@ -15799,7 +15806,7 @@ snapshots: sirv: 3.0.0 tinyglobby: 0.2.10 tinyrainbow: 1.2.0 - vitest: 3.0.5(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) + vitest: 3.0.7(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) '@vitest/utils@1.6.0': dependencies: @@ -15814,10 +15821,10 @@ snapshots: loupe: 3.1.2 tinyrainbow: 1.2.0 - '@vitest/utils@3.0.5': + '@vitest/utils@3.0.7': dependencies: - '@vitest/pretty-format': 3.0.5 - loupe: 3.1.2 + '@vitest/pretty-format': 3.0.7 + loupe: 3.1.3 tinyrainbow: 2.0.0 '@volar/language-core@2.4.11': @@ -16734,6 +16741,14 @@ snapshots: loupe: 3.1.2 pathval: 2.0.0 + chai@5.2.0: + dependencies: + assertion-error: 2.0.1 + check-error: 2.1.1 + deep-eql: 5.0.2 + loupe: 3.1.3 + pathval: 2.0.0 + chalk@3.0.0: dependencies: ansi-styles: 4.3.0 @@ -20944,6 +20959,8 @@ snapshots: loupe@3.1.2: {} + loupe@3.1.3: {} + lower-case@1.1.4: {} lower-case@2.0.2: @@ -24717,7 +24734,7 @@ snapshots: - supports-color - terser - vite-node@3.0.5(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0): + vite-node@3.0.7(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0): dependencies: cac: 6.7.14 debug: 4.4.0(supports-color@8.1.1) @@ -24804,10 +24821,10 @@ snapshots: stylus: 0.64.0 terser: 5.37.0 - vitest-canvas-mock@0.3.3(vitest@3.0.5): + vitest-canvas-mock@0.3.3(vitest@3.0.7): dependencies: jest-canvas-mock: 2.5.2 - vitest: 3.0.5(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) + vitest: 3.0.7(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) vitest@1.6.0(@types/node@18.19.70)(@vitest/ui@2.1.8)(happy-dom@17.1.0)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0): dependencies: @@ -24833,7 +24850,7 @@ snapshots: why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 18.19.70 - '@vitest/ui': 2.1.8(vitest@3.0.5) + '@vitest/ui': 2.1.8(vitest@3.0.7) happy-dom: 17.1.0 jsdom: 24.1.3 transitivePeerDependencies: @@ -24870,7 +24887,7 @@ snapshots: why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 22.10.5 - '@vitest/ui': 2.1.8(vitest@3.0.5) + '@vitest/ui': 2.1.8(vitest@3.0.7) happy-dom: 17.1.0 jsdom: 24.1.3 transitivePeerDependencies: @@ -24921,16 +24938,16 @@ snapshots: - supports-color - terser - vitest@3.0.5(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0): + vitest@3.0.7(@types/debug@4.1.12)(@types/node@20.17.12)(@vitest/ui@2.1.8)(happy-dom@14.12.3)(jsdom@24.1.3)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0): dependencies: - '@vitest/expect': 3.0.5 - '@vitest/mocker': 3.0.5(vite@5.4.11(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0)) - '@vitest/pretty-format': 3.0.5 - '@vitest/runner': 3.0.5 - '@vitest/snapshot': 3.0.5 - '@vitest/spy': 3.0.5 - '@vitest/utils': 3.0.5 - chai: 5.1.2 + '@vitest/expect': 3.0.7 + '@vitest/mocker': 3.0.7(vite@5.4.11(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0)) + '@vitest/pretty-format': 3.0.7 + '@vitest/runner': 3.0.7 + '@vitest/snapshot': 3.0.7 + '@vitest/spy': 3.0.7 + '@vitest/utils': 3.0.7 + chai: 5.2.0 debug: 4.4.0(supports-color@8.1.1) expect-type: 1.1.0 magic-string: 0.30.17 @@ -24941,12 +24958,12 @@ snapshots: tinypool: 1.0.2 tinyrainbow: 2.0.0 vite: 5.4.11(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) - vite-node: 3.0.5(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) + vite-node: 3.0.7(@types/node@20.17.12)(less@3.13.1)(lightningcss@1.28.2)(sass@1.77.6)(stylus@0.64.0)(terser@5.37.0) why-is-node-running: 2.3.0 optionalDependencies: '@types/debug': 4.1.12 '@types/node': 20.17.12 - '@vitest/ui': 2.1.8(vitest@3.0.5) + '@vitest/ui': 2.1.8(vitest@3.0.7) happy-dom: 14.12.3 jsdom: 24.1.3 transitivePeerDependencies: diff --git a/src/packages/button/button.scss b/src/packages/button/button.scss index 75b660a967..9d88be721e 100644 --- a/src/packages/button/button.scss +++ b/src/packages/button/button.scss @@ -253,6 +253,7 @@ } &-disabled, + &-disabled.nut-button-icononly, &-solid-disabled { color: $button-primary-color; background: $button-primary-disabled; diff --git a/src/packages/button/demos/taro/demo4.tsx b/src/packages/button/demos/taro/demo4.tsx index b5b01ab2fd..3b6899277b 100644 --- a/src/packages/button/demos/taro/demo4.tsx +++ b/src/packages/button/demos/taro/demo4.tsx @@ -1,4 +1,5 @@ import React from 'react' +import { Text } from '@tarojs/components' import { Button, Cell } from '@nutui/nutui-react-taro' import { Plus, Star } from '@nutui/icons-react-taro' import { harmony } from '@/utils/platform-taro' @@ -13,8 +14,8 @@ const Demo4 = () => { diff --git a/src/packages/loading/loading.scss b/src/packages/loading/loading.scss index 356d340396..92415b4f76 100644 --- a/src/packages/loading/loading.scss +++ b/src/packages/loading/loading.scss @@ -4,7 +4,7 @@ align-items: center; justify-content: center; - &.nut-loading-vertical { + &-vertical { flex-direction: column; } @@ -21,6 +21,7 @@ font-size: $loading-icon-size; } } + .nut-loading-lottie-box { width: 56px; height: 56px; @@ -29,10 +30,15 @@ } .nut-loading-text { - padding-top: $spacing-base; color: $loading-color; font-size: $loading-font-size; } + + &-vertical { + .nut-loading-text { + padding-top: $spacing-base; + } + } } @keyframes nut-loading-rotation { diff --git a/src/packages/navbar/demos/taro/demo1.tsx b/src/packages/navbar/demos/taro/demo1.tsx index 2494f5967f..5baad42e1a 100644 --- a/src/packages/navbar/demos/taro/demo1.tsx +++ b/src/packages/navbar/demos/taro/demo1.tsx @@ -13,15 +13,17 @@ const Demo1 = () => { alignItems: 'center', }, title: { + display: 'flex', + alignItems: 'center', + flex: 1, fontSize: pxTransform(18), fontWeight: 'bold', - lineHeight: pxTransform(26), }, description: { fontSize: pxTransform(12), fontWeight: 400, color: 'rgba(0,0,0, 0.5)', - lineHeight: pxTransform(16), + height: pxTransform(16), }, } return ( diff --git a/src/packages/navbar/demos/taro/demo2.tsx b/src/packages/navbar/demos/taro/demo2.tsx index 43dbc34304..26c56d10c6 100644 --- a/src/packages/navbar/demos/taro/demo2.tsx +++ b/src/packages/navbar/demos/taro/demo2.tsx @@ -13,15 +13,17 @@ const Demo2 = () => { alignItems: 'center', }, title: { + display: 'flex', + alignItems: 'center', + flex: 1, fontSize: pxTransform(18), fontWeight: 'bold', - lineHeight: pxTransform(26), }, description: { fontSize: pxTransform(12), fontWeight: 400, color: 'rgba(0,0,0, 0.5)', - lineHeight: pxTransform(16), + height: pxTransform(16), }, } return ( diff --git a/src/packages/numberkeyboard/numberkeyboard.taro.tsx b/src/packages/numberkeyboard/numberkeyboard.taro.tsx index 47f125f763..207805dca5 100644 --- a/src/packages/numberkeyboard/numberkeyboard.taro.tsx +++ b/src/packages/numberkeyboard/numberkeyboard.taro.tsx @@ -161,6 +161,7 @@ export const NumberKeyboard: FunctionComponent< onOverlayClick={onClose} onCloseIconClick={onClose} zIndex={9999} + style={{ minHeight: 0 }} overlayStyle={{ backgroundColor: 'rgba(0, 0, 0, 0)' }} > diff --git a/src/packages/radio/demos/h5/demo7.tsx b/src/packages/radio/demos/h5/demo7.tsx index a8c58125d7..51a8880bd6 100644 --- a/src/packages/radio/demos/h5/demo7.tsx +++ b/src/packages/radio/demos/h5/demo7.tsx @@ -6,7 +6,7 @@ const Demo7 = () => { 自定义尺寸 diff --git a/src/packages/radio/demos/taro/demo7.tsx b/src/packages/radio/demos/taro/demo7.tsx index 64a9bbbf85..d75a80ce67 100644 --- a/src/packages/radio/demos/taro/demo7.tsx +++ b/src/packages/radio/demos/taro/demo7.tsx @@ -6,7 +6,7 @@ const Demo7 = () => { 自定义尺寸 diff --git a/src/packages/radio/radio.scss b/src/packages/radio/radio.scss index 4471e64faa..c14481526c 100644 --- a/src/packages/radio/radio.scss +++ b/src/packages/radio/radio.scss @@ -5,11 +5,6 @@ align-items: center; flex-shrink: 0; - &:last-child { - margin-bottom: 0 !important; - margin-right: 0 !important; - } - &.nut-radio-reverse { flex-direction: row-reverse; @@ -56,6 +51,7 @@ &-button { display: inline-flex; align-items: center; + min-height: 30px; padding: $radio-button-padding; font-size: $radio-button-font-size; background: $radio-button-background; diff --git a/src/packages/radiogroup/radiogroup.scss b/src/packages/radiogroup/radiogroup.scss index 118c930340..661a6e775e 100644 --- a/src/packages/radiogroup/radiogroup.scss +++ b/src/packages/radiogroup/radiogroup.scss @@ -9,6 +9,10 @@ &-button { background-color: $radio-button-background; } + + &:last-child { + margin: 0; + } } &-vertical { @@ -30,9 +34,9 @@ } &-horizontal { - .nut-radio { - display: inline-flex; + display: flex; + .nut-radio { &-button { border: 1px solid $white; } @@ -41,6 +45,10 @@ border: $radio-button-active-border; background-color: $color-primary-light-pressed; } + + &:last-child { + margin: 0 $radiogroup-radio-margin $radiogroup-radio-margin-bottom 0; + } } } diff --git a/src/packages/searchbar/demos/taro/demo3.tsx b/src/packages/searchbar/demos/taro/demo3.tsx index 1cbe893f18..d1aa20bcb2 100644 --- a/src/packages/searchbar/demos/taro/demo3.tsx +++ b/src/packages/searchbar/demos/taro/demo3.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react' -import { SearchBar, ConfigProvider, Toast } from '@nutui/nutui-react-taro' +import { ConfigProvider, SearchBar, Toast } from '@nutui/nutui-react-taro' const Demo3 = () => { const [show, SetShow] = useState(false) diff --git a/src/packages/searchbar/demos/taro/demo5.tsx b/src/packages/searchbar/demos/taro/demo5.tsx index 2f1c4f906d..a3e10a597f 100644 --- a/src/packages/searchbar/demos/taro/demo5.tsx +++ b/src/packages/searchbar/demos/taro/demo5.tsx @@ -2,9 +2,9 @@ import React from 'react' import { SearchBar } from '@nutui/nutui-react-taro' import { ArrowLeft, - Photograph, - More, Close, + More, + Photograph, Star, } from '@nutui/icons-react-taro' diff --git a/src/packages/searchbar/searchbar.taro.tsx b/src/packages/searchbar/searchbar.taro.tsx index 76d9ec5c93..f6bacfe201 100644 --- a/src/packages/searchbar/searchbar.taro.tsx +++ b/src/packages/searchbar/searchbar.taro.tsx @@ -115,13 +115,10 @@ export const SearchBar: FunctionComponent< clearable ? `${classPrefix}-input-clear` : '' }`} ref={searchRef} - style={style} value={value || ''} placeholder={placeholder || locale.placeholder} disabled={disabled || readOnly} maxlength={maxLength} - // @ts-ignore - // onKeyDown={onKeypress} onInput={onInput} onFocus={focus} onBlur={blur} diff --git a/src/packages/searchbar/searchbar.tsx b/src/packages/searchbar/searchbar.tsx index 9901b7b5f9..5d30ffd976 100644 --- a/src/packages/searchbar/searchbar.tsx +++ b/src/packages/searchbar/searchbar.tsx @@ -114,7 +114,6 @@ export const SearchBar: FunctionComponent< clearable ? `${classPrefix}-input-clear` : '' }`} ref={searchRef} - style={style} value={value || ''} placeholder={placeholder || locale.placeholder} disabled={disabled} diff --git a/src/styles/variables-jmapp.scss b/src/styles/variables-jmapp.scss index 0c4e74f5f2..14d331642c 100644 --- a/src/styles/variables-jmapp.scss +++ b/src/styles/variables-jmapp.scss @@ -595,6 +595,7 @@ $input-disabled-color: var( $color-text-disabled ) !default; $input-font-size: var(--nutui-input-font-size, $font-size-base) !default; +$input-lineheight: var(--nutui-input-lineheight, $font-size-l) !default; $input-border-radius: var(--nutui-input-border-radius, $radius-xs) !default; $input-color: var(--nutui-input-color, $color-text) !default; $input-background-color: var(--nutui-input-background-color, $white) !default; diff --git a/src/styles/variables-jrkf.scss b/src/styles/variables-jrkf.scss index ea64b13cb0..18da6bff41 100644 --- a/src/styles/variables-jrkf.scss +++ b/src/styles/variables-jrkf.scss @@ -615,6 +615,7 @@ $input-disabled-color: var( $color-text-disabled ) !default; $input-font-size: var(--nutui-input-font-size, $font-size-base) !default; +$input-lineheight: var(--nutui-input-lineheight, $font-size-l) !default; $input-border-radius: var(--nutui-input-border-radius, $radius-xs) !default; $input-color: var(--nutui-input-color, $color-text) !default; $input-background-color: var(--nutui-input-background-color, $white) !default; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 51a884d520..48ca550924 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -592,6 +592,7 @@ $input-border-bottom-width: var( // $color-text-disabled // ) !default; $input-font-size: var(--nutui-input-font-size, $font-size-base) !default; +$input-lineheight: var(--nutui-input-lineheight, $font-size-l) !default; $input-border-radius: var(--nutui-input-border-radius, $radius-s) !default; // $input-color: var(--nutui-input-color, $color-title) !default; $input-background-color: var( @@ -1854,10 +1855,7 @@ $indicator-border-radius: var( --nutui-indicator-border-radius, $radius-xxs ) !default; -$indicator-dot-margin: var( - --nutui-indicator-dot-margin, - $spacing-xxxs -) !default; +$indicator-dot-margin: var(--nutui-indicator-dot-margin, $spacing-xxs) !default; // menu（✅） $menu-scroll-fixed-top: var(--nutui-menu-scroll-fixed-top, 0) !default;