From 15e6521c0e5c6fab4e90f1bbb36904c658a8c45e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2026 12:23:16 +0000 Subject: [PATCH 1/2] chore(deps): update dependency typescript to v6 --- package.json | 2 +- pnpm-lock.yaml | 35 +++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 5bb1ef2f..dfc210f7 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "tar-stream": "^2.2.0", "tshy": "^3.3.2", "tshy-after": "^1.4.1", - "typescript": "^5.9.3", + "typescript": "^6.0.0", "vite-plus": "^0.1.14", "vitest": "npm:@voidzero-dev/vite-plus-test@^0.1.14" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 57f7b794..37477727 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -69,7 +69,7 @@ importers: version: 1.3.0 '@vitest/coverage-v8': specifier: ^4.1.0 - version: 4.1.0(@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2)) + version: 4.1.0(@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2)) busboy: specifier: ^1.6.0 version: 1.6.0 @@ -98,14 +98,14 @@ importers: specifier: ^1.4.1 version: 1.4.1 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.0 + version: 6.0.2 vite-plus: specifier: ^0.1.14 - version: 0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2) + version: 0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2) vitest: specifier: npm:@voidzero-dev/vite-plus-test@^0.1.14 - version: '@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2)' + version: '@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2)' packages: @@ -1820,6 +1820,11 @@ packages: engines: {node: '>=14.17'} hasBin: true + typescript@6.0.2: + resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==} + engines: {node: '>=14.17'} + hasBin: true + unbox-primitive@1.1.0: resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==} engines: {node: '>= 0.4'} @@ -2306,7 +2311,7 @@ snapshots: '@ungap/structured-clone@1.3.0': {} - '@vitest/coverage-v8@4.1.0(@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2))': + '@vitest/coverage-v8@4.1.0(@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2))': dependencies: '@bcoe/v8-coverage': 1.0.2 '@vitest/utils': 4.1.0 @@ -2318,7 +2323,7 @@ snapshots: obug: 2.1.1 std-env: 4.0.0 tinyrainbow: 3.1.0 - vitest: '@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2)' + vitest: '@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2)' '@vitest/pretty-format@4.1.0': dependencies: @@ -2330,7 +2335,7 @@ snapshots: convert-source-map: 2.0.0 tinyrainbow: 3.1.0 - '@voidzero-dev/vite-plus-core@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(yaml@2.8.2)': + '@voidzero-dev/vite-plus-core@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(yaml@2.8.2)': dependencies: '@oxc-project/runtime': 0.121.0 '@oxc-project/types': 0.122.0 @@ -2340,7 +2345,7 @@ snapshots: '@arethetypeswrong/core': 0.18.2 '@types/node': 22.19.15 fsevents: 2.3.3 - typescript: 5.9.3 + typescript: 6.0.2 yaml: 2.8.2 '@voidzero-dev/vite-plus-darwin-arm64@0.1.14': @@ -2361,11 +2366,11 @@ snapshots: '@voidzero-dev/vite-plus-linux-x64-musl@0.1.14': optional: true - '@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2)': + '@voidzero-dev/vite-plus-test@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2)': dependencies: '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.3 - '@voidzero-dev/vite-plus-core': 0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(yaml@2.8.2) + '@voidzero-dev/vite-plus-core': 0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(yaml@2.8.2) es-module-lexer: 1.7.0 obug: 2.1.1 pixelmatch: 7.1.0 @@ -3559,6 +3564,8 @@ snapshots: typescript@5.9.3: {} + typescript@6.0.2: {} + unbox-primitive@1.1.0: dependencies: call-bound: 1.0.4 @@ -3576,11 +3583,11 @@ snapshots: validate-npm-package-name@5.0.1: {} - vite-plus@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2): + vite-plus@0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2): dependencies: '@oxc-project/types': 0.122.0 - '@voidzero-dev/vite-plus-core': 0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(yaml@2.8.2) - '@voidzero-dev/vite-plus-test': 0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@5.9.3)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2) + '@voidzero-dev/vite-plus-core': 0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(yaml@2.8.2) + '@voidzero-dev/vite-plus-test': 0.1.14(@arethetypeswrong/core@0.18.2)(@types/node@22.19.15)(typescript@6.0.2)(vite@8.0.0(@types/node@22.19.15)(yaml@2.8.2))(yaml@2.8.2) cac: 7.0.0 cross-spawn: 7.0.6 oxfmt: 0.42.0 From c6c5a6b5651aaf4ce6dc77d93d1a998b72b567d8 Mon Sep 17 00:00:00 2001 From: MK Date: Wed, 25 Mar 2026 21:58:59 +0800 Subject: [PATCH 2/2] fix(ci): use --legacy-peer-deps for old versions CI The npm install step fails on Node 16/18 because typescript@6 conflicts with vite-plus-core's peerOptional typescript@"^5.0.0". Adding --legacy-peer-deps bypasses this since the next step replaces vite-plus with real vitest@3 and vite@7 anyway. --- .github/workflows/nodejs-old-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nodejs-old-versions.yml b/.github/workflows/nodejs-old-versions.yml index 8e80a22a..58c90150 100644 --- a/.github/workflows/nodejs-old-versions.yml +++ b/.github/workflows/nodejs-old-versions.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-node@v6 with: node-version: ${{ matrix.node }} - - run: npm install + - run: npm install --legacy-peer-deps - name: Patch vitest imports run: | for f in test/*.test.ts; do [ -e "$f" ] || exit 0; sed --version >/dev/null 2>&1 && sed -i "s@'vite-plus/test'@'vitest'@g" "$f" || sed -i '' "s@'vite-plus/test'@'vitest'@g" "$f"; done