Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-rsc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: pnpm/action-setup@91ab88e2619ed1f46221f0ba42d1492c02baf788 # v6.0.6
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
- uses: actions/setup-node@v6
with:
node-version: 24
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v6
- uses: pnpm/action-setup@91ab88e2619ed1f46221f0ba42d1492c02baf788 # v6.0.6
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
- uses: actions/setup-node@v6
with:
node-version: 24
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v6

- name: Install pnpm
uses: pnpm/action-setup@91ab88e2619ed1f46221f0ba42d1492c02baf788 # v6.0.6
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8

- name: Set node version to ${{ matrix.node_version }}
uses: actions/setup-node@v6
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
fetch-depth: 0

- name: Install pnpm
uses: pnpm/action-setup@91ab88e2619ed1f46221f0ba42d1492c02baf788 # v6.0.6
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8

- name: Set node version to 24
uses: actions/setup-node@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- uses: actions/checkout@v6
- uses: pnpm/action-setup@91ab88e2619ed1f46221f0ba42d1492c02baf788 # v6.0.6
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
- uses: actions/setup-node@v6
with:
node-version: 24
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v6

- name: Install pnpm
uses: pnpm/action-setup@91ab88e2619ed1f46221f0ba42d1492c02baf788 # v6.0.6
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8

- name: Set node version
uses: actions/setup-node@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/checkout@v6

- name: Install pnpm
uses: pnpm/action-setup@91ab88e2619ed1f46221f0ba42d1492c02baf788 # v6.0.6
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8

- uses: actions/setup-node@v6
with:
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@
"devDependencies": {
"@eslint/js": "^9.39.4",
"@types/fs-extra": "^11.0.4",
"@types/node": "^24.12.3",
"@vitejs/release-scripts": "^1.7.0",
"@types/node": "^24.12.4",
"@vitejs/release-scripts": "^1.7.1",
"eslint": "^9.39.4",
"eslint-plugin-import-x": "^4.16.2",
"eslint-plugin-n": "^17.24.0",
"eslint-plugin-regexp": "^3.1.0",
"fs-extra": "^11.3.5",
"globals": "^17.6.0",
"lint-staged": "^16.4.0",
"oxfmt": "^0.48.0",
"oxfmt": "^0.50.0",
"picocolors": "^1.1.1",
"playwright-chromium": "^1.59.1",
"playwright-chromium": "^1.60.0",
"simple-git-hooks": "^2.13.1",
"typescript": "^6.0.3",
"typescript-eslint": "^8.59.2",
"vite": "^8.0.11",
"typescript-eslint": "^8.59.4",
"vite": "^8.0.13",
"vite-plugin-inspect": "^11.3.3",
"vitest": "^4.1.5"
"vitest": "^4.1.6"
},
"simple-git-hooks": {
"pre-commit": "pnpm exec lint-staged --concurrent false"
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"./refresh-runtime": "./refresh-runtime.js"
},
"dependencies": {
"@rolldown/pluginutils": "^1.0.0"
"@rolldown/pluginutils": "^1.0.1"
},
"peerDependencies": {
"vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/plugin-react-swc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
"test": "playwright test"
},
"dependencies": {
"@rolldown/pluginutils": "^1.0.0",
"@rolldown/pluginutils": "^1.0.1",
"@swc/core": "^1.15.11"
},
"devDependencies": {
"@playwright/test": "^1.59.1",
"@playwright/test": "^1.60.0",
"@types/fs-extra": "^11.0.4",
"@types/node": "^24.12.3",
"@types/node": "^24.12.4",
"@vitejs/react-common": "workspace:*",
"fs-extra": "^11.3.5",
"prettier": "^3.0.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/plugin-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@
"test-unit": "vitest run"
},
"dependencies": {
"@rolldown/pluginutils": "^1.0.0"
"@rolldown/pluginutils": "^1.0.1"
},
"devDependencies": {
"@babel/core": "8.0.0-rc.4",
"@babel/core": "8.0.0-rc.5",
"@rolldown/plugin-babel": "^0.2.3",
"@vitejs/react-common": "workspace:*",
"babel-plugin-react-compiler": "^1.0.0",
"react": "^19.2.6",
"react-dom": "^19.2.6",
"rolldown": "^1.0.0",
"rolldown": "^1.0.1",
"tsdown": "^0.22.0",
"vite": "^8.0.11"
"vite": "^8.0.13"
},
"peerDependencies": {
"@rolldown/plugin-babel": "^0.1.7 || ^0.2.0",
Expand Down
6 changes: 6 additions & 0 deletions packages/plugin-rsc/e2e/basic.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@
`/* color: rgb(0, 165, 255); */`,
),
)
await expect(page.locator('.test-style-server')).toHaveCSS(

Check failure on line 909 in packages/plugin-rsc/e2e/basic.test.ts

View workflow job for this annotation

GitHub Actions / test-rsc (ubuntu-latest / chromium)

[chromium] › e2e/basic.test.ts:892:5 › dev-default › css hmr server

1) [chromium] › e2e/basic.test.ts:892:5 › dev-default › css hmr server ─────────────────────────── Error: expect(locator).toHaveCSS(expected) failed Locator: locator('.test-style-server') Expected: "rgb(0, 0, 0)" Received: "rgb(0, 165, 255)" Timeout: 5000ms Call log: - Expect "toHaveCSS" with timeout 5000ms - waiting for locator('.test-style-server') 14 × locator resolved to <div class="test-style-server">test-style-server</div> - unexpected value "rgb(0, 165, 255)" 907 | ), 908 | ) > 909 | await expect(page.locator('.test-style-server')).toHaveCSS( | ^ 910 | 'color', 911 | 'rgb(0, 0, 0)', 912 | ) at /home/runner/work/vite-plugin-react/vite-plugin-react/packages/plugin-rsc/e2e/basic.test.ts:909:56

Check failure on line 909 in packages/plugin-rsc/e2e/basic.test.ts

View workflow job for this annotation

GitHub Actions / test-rsc (ubuntu-latest / chromium) (react-canary)

[chromium] › e2e/basic.test.ts:892:5 › dev-default › css hmr server

1) [chromium] › e2e/basic.test.ts:892:5 › dev-default › css hmr server ─────────────────────────── Error: expect(locator).toHaveCSS(expected) failed Locator: locator('.test-style-server') Expected: "rgb(0, 0, 0)" Received: "rgb(0, 165, 255)" Timeout: 5000ms Call log: - Expect "toHaveCSS" with timeout 5000ms - waiting for locator('.test-style-server') 14 × locator resolved to <div class="test-style-server">test-style-server</div> - unexpected value "rgb(0, 165, 255)" 907 | ), 908 | ) > 909 | await expect(page.locator('.test-style-server')).toHaveCSS( | ^ 910 | 'color', 911 | 'rgb(0, 0, 0)', 912 | ) at /home/runner/work/vite-plugin-react/vite-plugin-react/packages/plugin-rsc/e2e/basic.test.ts:909:56
'color',
'rgb(0, 0, 0)',
)
Expand Down Expand Up @@ -1031,6 +1031,10 @@
'color',
'rgb(0, 0, 0)',
)
// wait longer for multiple edits
// resetting too fast seems to miss hmr update for fast machine
// (ubuntu / chromium on CI since playwright 1.60.0)
await page.waitForTimeout(100)
editor.reset()
await expect(page.getByTestId('css-module-client')).toHaveCSS(
'color',
Expand Down Expand Up @@ -1058,6 +1062,7 @@
'color',
'rgb(0, 0, 0)',
)
await page.waitForTimeout(100)
editor.reset()
await expect(page.getByTestId('css-module-server')).toHaveCSS(
'color',
Expand Down Expand Up @@ -1118,6 +1123,7 @@
await expect(serverCard).toHaveCSS('color', 'rgb(0, 0, 0)')
await expect(clientCard).toHaveCSS('color', 'rgb(0, 0, 0)')

await page.waitForTimeout(100)
editor.reset()
await expect(serverCard).toHaveCSS('color', 'rgb(255, 165, 0)')
await expect(clientCard).toHaveCSS('color', 'rgb(255, 165, 0)')
Expand Down Expand Up @@ -1151,7 +1157,7 @@
'rgb(0, 165, 255)',
)
editor.reset()
await expect(page.locator('.test-style-url-server')).toHaveCSS(

Check failure on line 1160 in packages/plugin-rsc/e2e/basic.test.ts

View workflow job for this annotation

GitHub Actions / test-rsc (ubuntu-latest / chromium) (react-canary)

[chromium] › e2e/basic.test.ts:1149:5 › dev-default › css url server hmr

2) [chromium] › e2e/basic.test.ts:1149:5 › dev-default › css url server hmr ────────────────────── Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: expect(locator).toHaveCSS(expected) failed Locator: locator('.test-style-url-server') Expected: "rgb(255, 165, 0)" Received: "rgb(0, 165, 255)" Timeout: 5000ms Call log: - Expect "toHaveCSS" with timeout 5000ms - waiting for locator('.test-style-url-server') 14 × locator resolved to <div class="test-style-url-server">test-style-url-server</div> - unexpected value "rgb(0, 165, 255)" 1158 | ) 1159 | editor.reset() > 1160 | await expect(page.locator('.test-style-url-server')).toHaveCSS( | ^ 1161 | 'color', 1162 | 'rgb(255, 165, 0)', 1163 | ) at /home/runner/work/vite-plugin-react/vite-plugin-react/packages/plugin-rsc/e2e/basic.test.ts:1160:60

Check failure on line 1160 in packages/plugin-rsc/e2e/basic.test.ts

View workflow job for this annotation

GitHub Actions / test-rsc (ubuntu-latest / chromium) (react-canary)

[chromium] › e2e/basic.test.ts:1149:5 › dev-default › css url server hmr

2) [chromium] › e2e/basic.test.ts:1149:5 › dev-default › css url server hmr ────────────────────── Error: expect(locator).toHaveCSS(expected) failed Locator: locator('.test-style-url-server') Expected: "rgb(255, 165, 0)" Received: "rgb(0, 165, 255)" Timeout: 5000ms Call log: - Expect "toHaveCSS" with timeout 5000ms - waiting for locator('.test-style-url-server') 14 × locator resolved to <div class="test-style-url-server">test-style-url-server</div> - unexpected value "rgb(0, 165, 255)" 1158 | ) 1159 | editor.reset() > 1160 | await expect(page.locator('.test-style-url-server')).toHaveCSS( | ^ 1161 | 'color', 1162 | 'rgb(255, 165, 0)', 1163 | ) at /home/runner/work/vite-plugin-react/vite-plugin-react/packages/plugin-rsc/e2e/basic.test.ts:1160:60
'color',
'rgb(255, 165, 0)',
)
Expand Down
1 change: 1 addition & 0 deletions packages/plugin-rsc/e2e/starter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ export function defineStarterTest(
)
await expect(card).toHaveCSS('background-color', 'rgb(255, 0, 200)')

await page.waitForTimeout(100)
editor.reset()
await expect(card).not.toHaveCSS('background-color', 'rgb(255, 0, 200)')
})
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-rsc/examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"@vitejs/test-dep-transitive-use-sync-external-store": "file:./test-dep/transitive-use-sync-external-store",
"rsc-html-stream": "^0.0.7",
"tailwindcss": "^4.3.0",
"vite": "^8.0.11",
"wrangler": "^4.90.0"
"vite": "^8.0.13",
"wrangler": "^4.92.0"
},
"stackblitz": {
"installDependencies": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-rsc/examples/browser-mode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "latest",
"@vitejs/plugin-rsc": "latest",
"vite": "^8.0.11",
"vite": "^8.0.13",
"vite-dev-rpc": "^1.1.0"
}
}
2 changes: 1 addition & 1 deletion packages/plugin-rsc/examples/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "latest",
"@vitejs/plugin-rsc": "latest",
"vite": "^8.0.11",
"vite": "^8.0.13",
"vite-dev-rpc": "^1.1.0"
}
}
2 changes: 1 addition & 1 deletion packages/plugin-rsc/examples/no-ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "latest",
"@vitejs/plugin-rsc": "latest",
"vite": "^8.0.11"
"vite": "^8.0.13"
}
}
8 changes: 4 additions & 4 deletions packages/plugin-rsc/examples/react-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
"dependencies": {
"react": "^19.2.6",
"react-dom": "^19.2.6",
"react-router": "7.15.0"
"react-router": "7.15.1"
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.36.3",
"@cloudflare/vite-plugin": "^1.37.1",
"@tailwindcss/typography": "^0.5.19",
"@tailwindcss/vite": "^4.3.0",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "latest",
"@vitejs/plugin-rsc": "latest",
"tailwindcss": "^4.3.0",
"vite": "^8.0.11",
"wrangler": "^4.90.0"
"vite": "^8.0.13",
"wrangler": "^4.92.0"
}
}
2 changes: 1 addition & 1 deletion packages/plugin-rsc/examples/ssg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"@vitejs/plugin-react": "latest",
"@vitejs/plugin-rsc": "latest",
"rsc-html-stream": "^0.0.7",
"vite": "^8.0.11"
"vite": "^8.0.13"
}
}
6 changes: 3 additions & 3 deletions packages/plugin-rsc/examples/starter-extra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"react-dom": "^19.2.6"
},
"devDependencies": {
"@cloudflare/vite-plugin": "^1.36.3",
"@cloudflare/vite-plugin": "^1.37.1",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "latest",
"@vitejs/plugin-rsc": "latest",
"rsc-html-stream": "^0.0.7",
"vite": "^8.0.11",
"wrangler": "^4.90.0"
"vite": "^8.0.13",
"wrangler": "^4.92.0"
}
}
2 changes: 1 addition & 1 deletion packages/plugin-rsc/examples/starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"@vitejs/plugin-react": "latest",
"@vitejs/plugin-rsc": "latest",
"rsc-html-stream": "^0.0.7",
"vite": "^8.0.11"
"vite": "^8.0.13"
}
}
6 changes: 3 additions & 3 deletions packages/plugin-rsc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"prepack": "tsdown"
},
"dependencies": {
"@rolldown/pluginutils": "^1.0.0",
"@rolldown/pluginutils": "^1.0.1",
"es-module-lexer": "^2.1.0",
"estree-walker": "^3.0.3",
"magic-string": "^0.30.21",
Expand All @@ -50,10 +50,10 @@
},
"devDependencies": {
"@hiogawa/utils": "^1.7.0",
"@playwright/test": "^1.59.1",
"@playwright/test": "^1.60.0",
"@tsconfig/strictest": "^2.0.8",
"@types/estree": "^1.0.9",
"@types/node": "^24.12.3",
"@types/node": "^24.12.4",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "workspace:*",
Expand Down
Loading
Loading