Skip to content

Commit 674af09

Browse files
Merge remote-tracking branch 'upstream/main' into chore-rsc-nightly
2 parents ac6028d + c8ecad0 commit 674af09

File tree

4 files changed

+151
-297
lines changed

4 files changed

+151
-297
lines changed

.github/workflows/publish.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,12 @@ jobs:
6060
with:
6161
path: packages/${{ steps.tag.outputs.pkgName }}/CHANGELOG.md
6262
tag-name: ${{ github.ref_name }}
63+
64+
- if: steps.tag.outputs.isAlpha == 'false' && steps.tag.outputs.pkgName == 'plugin-rsc'
65+
uses: yyx990803/release-tag@master
66+
env:
67+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
68+
with:
69+
tag_name: ${{ github.ref }}
70+
body: |
71+
Please refer to [CHANGELOG.md](https://github.com/vitejs/vite-plugin-react/blob/${{ github.ref_name }}/packages/${{ steps.tag.outputs.pkgName }}/CHANGELOG.md) for details.

playground/vitest.config.e2e.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { resolve } from 'node:path'
2-
import { defineConfig } from 'vitest/config'
2+
import { defaultExclude, defineConfig } from 'vitest/config'
33

44
const timeout = process.env.PWDEBUG ? Infinity : process.env.CI ? 20_000 : 5_000
55

6+
const isBelowNode20 = +process.versions.node.split('.')[0] < 20
7+
68
export default defineConfig({
79
resolve: {
810
alias: {
@@ -12,6 +14,9 @@ export default defineConfig({
1214
test: {
1315
pool: 'forks',
1416
include: ['./playground/**/*.spec.[tj]s'],
17+
exclude: isBelowNode20
18+
? ['**/__tests__/oxc/**', ...defaultExclude] // plugin-oxc only supports node >= 20
19+
: defaultExclude,
1520
setupFiles: ['./playground/vitestSetup.ts'],
1621
globalSetup: ['./playground/vitestGlobalSetup.ts'],
1722
testTimeout: timeout,

0 commit comments

Comments
 (0)