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
2 changes: 1 addition & 1 deletion integration/helpers/rsc-vite-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@vanilla-extract/css": "^1.17.4",
"@vanilla-extract/vite-plugin": "^5.1.1",
"@vitejs/plugin-react": "^4.5.2",
"@vitejs/plugin-rsc": "0.4.24",
"@vitejs/plugin-rsc": "0.4.25",
"cross-env": "^7.0.3",
"typescript": "^5.1.6",
"vite": "^6.2.0",
Expand Down
2 changes: 1 addition & 1 deletion integration/helpers/rsc-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"typecheck": "tsc"
},
"devDependencies": {
"@vitejs/plugin-rsc": "0.4.24",
"@vitejs/plugin-rsc": "0.4.25",
"@types/express": "^5.0.0",
"@types/node": "^22.13.1",
"@types/react": "^19.1.8",
Expand Down
33 changes: 7 additions & 26 deletions integration/vite-css-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -551,15 +551,6 @@ async function hmrWorkflow({
file: "styles-bundled.css",
selector: "#css-bundled",
},
// TODO: Fix HMR for CSS Modules in server-first routes in RSC Framework mode
...(routeBase === "rsc-server-first-route"
? []
: ([
{
file: "styles.module.css",
selector: "#css-modules",
},
] as const)),
{
file: "styles-postcss-linked.css",
selector: "#css-postcss-linked",
Expand All @@ -568,13 +559,15 @@ async function hmrWorkflow({
file: "styles-vanilla-global.css.ts",
selector: "#css-vanilla-global",
},
// TODO: Fix HMR for locally scoped Vanilla Extract styles in RSC
// Framework mode. May require changes to the RSC plugin, or Vanilla
// Extract. Userland workaround for now:
// https://github.com/pawelblaszczyk5/vite-rsc-experiments/blob/643649f2e6562c859d9612126bfc3a183e03c7b5/apps/vanilla-extract/vite.config.ts
...(templateName.includes("rsc")
// TODO: Fix HMR for CSS Modules and locally scoped Vanilla Extract in
// server-first routes in RSC Framework mode
...(routeBase === "rsc-server-first-route"
? []
: ([
{
file: "styles.module.css",
selector: "#css-modules",
},
{
file: "styles-vanilla-local.css.ts",
selector: "#css-vanilla-local",
Expand All @@ -594,18 +587,6 @@ async function hmrWorkflow({
`CSS update for ${routeFile}`,
).toHaveCSS("padding", NEW_PADDING);

// TODO: Fix state preservation when changing these styles in RSC
// Framework mode. This appears to be a deeper HMR issue with
// changing non-React modules imported by the route.
if (
templateName.includes("rsc") &&
(file === "styles.module.css" ||
file === "styles-postcss-linked.css" ||
file === "styles-vanilla-global.css.ts")
) {
continue;
}

// Ensure CSS updates were handled by HMR
await expect(input, `State preservation for ${routeFile}`).toHaveValue(
routeFile,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@babel/types": "^7.27.7",
"@npmcli/package-json": "^4.0.1",
"@react-router/node": "workspace:*",
"@vitejs/plugin-rsc": "0.4.24",
"@vitejs/plugin-rsc": "0.4.25",
"arg": "^5.0.1",
"babel-dead-code-elimination": "^1.0.6",
"chokidar": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@vitejs/plugin-react": "^4.5.2",
"@vitejs/plugin-rsc": "0.4.24",
"@vitejs/plugin-rsc": "0.4.25",
"cross-env": "^7.0.3",
"remark-frontmatter": "^5.0.0",
"remark-mdx-frontmatter": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion playground/rsc-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@vitejs/plugin-react": "^4.5.2",
"@vitejs/plugin-rsc": "0.4.24",
"@vitejs/plugin-rsc": "0.4.25",
"cross-env": "^7.0.3",
"typescript": "^5.1.6",
"vite": "^6.2.0"
Expand Down
28 changes: 14 additions & 14 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading