From 25d169fe8f032a97b33e8486ecd60f5ef16f7d0d Mon Sep 17 00:00:00 2001 From: Hiroshi Ogawa Date: Thu, 27 Nov 2025 16:41:29 +0900 Subject: [PATCH] chore: use override for rolldown CI (#9111) --- .github/workflows/ci.yml | 4 +++- package.json | 12 ------------ pnpm-workspace.yaml | 21 ++++++++++++++++----- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5d7d9fe7..07033accf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -222,7 +222,9 @@ jobs: - uses: browser-actions/setup-chrome@b94431e051d1c52dcbe9a7092a4f10f827795416 # v2.1.0 - name: Install - run: pnpm add vite@npm:rolldown-vite && git add . && git commit -m "ci" && pnpm i --prefer-offline --no-frozen-lockfile + run: | + yq -i '.overrides.vite = "npm:rolldown-vite"' pnpm-workspace.yaml + git add . && git commit -m "ci" && pnpm i --prefer-offline --no-frozen-lockfile - uses: ./.github/actions/setup-playwright diff --git a/package.json b/package.json index 64b07a040..6599399fc 100644 --- a/package.json +++ b/package.json @@ -70,18 +70,6 @@ "zx": "^8.8.5" }, "pnpm": { - "overrides": { - "@vitest/browser": "workspace:*", - "@vitest/browser-playwright": "workspace:*", - "@vitest/browser-preview": "workspace:*", - "@vitest/browser-webdriverio": "workspace:*", - "@vitest/ui": "workspace:*", - "acorn": "8.11.3", - "mlly": "^1.8.0", - "rollup": "$rollup", - "vite": "$vite", - "vitest": "workspace:*" - }, "peerDependencyRules": { "ignoreMissing": [ "@algolia/client-search" diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index dbff49014..255a48ca3 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -5,6 +5,22 @@ packages: - test/* - test/config/fixtures/conditions-pkg +trustPolicy: no-downgrade +trustPolicyExclude: + - semver@6.3.1 + - chokidar@4.0.3 + +overrides: + '@vitest/browser': 'workspace:*' + '@vitest/browser-playwright': 'workspace:*' + '@vitest/browser-preview': 'workspace:*' + '@vitest/browser-webdriverio': 'workspace:*' + '@vitest/ui': 'workspace:*' + acorn: 8.11.3 + mlly: ^1.8.0 + rollup: $rollup + vite: $vite + vitest: 'workspace:*' catalog: '@iconify-json/carbon': ^1.2.14 '@iconify-json/logos': ^1.2.10 @@ -43,8 +59,3 @@ catalog: unplugin-vue-components: ^0.28.0 vue: ^3.5.25 ws: ^8.18.3 - -trustPolicy: no-downgrade -trustPolicyExclude: - - semver@6.3.1 - - chokidar@4.0.3