Skip to content

Commit a906e00

Browse files
committed
Merge branch 'dev' into markdalgleish/rsc-framework-mode
2 parents 15bae11 + b6b8a79 commit a906e00

File tree

7 files changed

+37
-19
lines changed

7 files changed

+37
-19
lines changed

integration/helpers/rsc-vite-framework/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@vanilla-extract/css": "^1.17.4",
2222
"@vanilla-extract/vite-plugin": "^5.1.1",
2323
"@vitejs/plugin-react": "^4.5.2",
24-
"@vitejs/plugin-rsc": "0.4.26",
24+
"@vitejs/plugin-rsc": "0.4.30",
2525
"cross-env": "^7.0.3",
2626
"typescript": "^5.1.6",
2727
"vite": "^6.2.0",

integration/helpers/rsc-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"typecheck": "tsc"
1111
},
1212
"devDependencies": {
13-
"@vitejs/plugin-rsc": "0.4.26",
13+
"@vitejs/plugin-rsc": "0.4.30",
1414
"@types/express": "^5.0.0",
1515
"@types/node": "^22.13.1",
1616
"@types/react": "^19.1.8",

packages/react-router-dev/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"@types/npmcli__package-json": "^4.0.0",
106106
"@types/set-cookie-parser": "^2.4.1",
107107
"@types/semver": "^7.7.0",
108-
"@vitejs/plugin-rsc": "0.4.26",
108+
"@vitejs/plugin-rsc": "0.4.30",
109109
"esbuild-register": "^3.6.0",
110110
"execa": "5.1.1",
111111
"express": "^4.19.2",

packages/react-router-dev/vite/rsc/plugin.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,24 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
280280
await configLoader.close();
281281
},
282282
},
283+
(() => {
284+
let logged = false;
285+
function logExperimentalNotice() {
286+
if (logged) return;
287+
logged = true;
288+
logger.info(
289+
colors.yellow(
290+
`${viteCommand === "serve" ? " " : ""}🧪 Using React Router's RSC Framework Mode (experimental)`,
291+
),
292+
);
293+
}
294+
return {
295+
name: "react-router/rsc/log-experimental-notice",
296+
sharedDuringBuild: true,
297+
buildStart: logExperimentalNotice,
298+
configureServer: logExperimentalNotice,
299+
};
300+
})(),
283301
{
284302
name: "react-router/rsc/typegen",
285303
async config(viteUserConfig, { command, mode }) {

playground/rsc-vite-framework/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@types/node": "^22.13.1",
2121
"@types/react": "^19.1.8",
2222
"@types/react-dom": "^19.1.6",
23-
"@vitejs/plugin-rsc": "0.4.26",
23+
"@vitejs/plugin-rsc": "0.4.30",
2424
"cross-env": "^7.0.3",
2525
"remark-frontmatter": "^5.0.0",
2626
"remark-mdx-frontmatter": "^5.2.0",

playground/rsc-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@types/react": "^19.1.8",
1616
"@types/react-dom": "^19.1.6",
1717
"@vitejs/plugin-react": "^4.5.2",
18-
"@vitejs/plugin-rsc": "0.4.26",
18+
"@vitejs/plugin-rsc": "0.4.30",
1919
"cross-env": "^7.0.3",
2020
"typescript": "^5.1.6",
2121
"vite": "^6.2.0"

pnpm-lock.yaml

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)