@react-router/dev 0.0.0-experimental-df9e1151a → 0.0.0-experimental-f9e19c91c

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-df9e1151a
+ * @react-router/dev v0.0.0-experimental-f9e19c91c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-df9e1151a
+ * @react-router/dev v0.0.0-experimental-f9e19c91c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-df9e1151a
+ * @react-router/dev v0.0.0-experimental-f9e19c91c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-df9e1151a
+ * @react-router/dev v0.0.0-experimental-f9e19c91c
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-df9e1151a
+ * @react-router/dev v0.0.0-experimental-f9e19c91c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4789,13 +4789,13 @@ async function getBuildManifest({
   if (!serverBundles) {
     return { routes };
   }
-  let { normalizePath: normalizePath2 } = await import("vite");
+  let { normalizePath } = await import("vite");
   let serverBuildDirectory = getServerBuildDirectory(reactRouterConfig);
   let resolvedAppDirectory = path6.resolve(rootDirectory, appDirectory);
   let rootRelativeRoutes = Object.fromEntries(
     Object.entries(routes).map(([id, route]) => {
       let filePath = path6.join(resolvedAppDirectory, route.file);
-      let rootRelativeFilePath = normalizePath2(
+      let rootRelativeFilePath = normalizePath(
         path6.relative(rootDirectory, filePath)
       );
       return [id, { ...route, file: rootRelativeFilePath }];
@@ -4837,7 +4837,7 @@ async function getBuildManifest({
       buildManifest.routeIdToServerBundleId[route.id] = serverBundleId;
       buildManifest.serverBundles[serverBundleId] ??= {
         id: serverBundleId,
-        file: normalizePath2(
+        file: normalizePath(
           path6.join(
             path6.relative(
               rootDirectory,
@@ -5034,7 +5034,6 @@ async function asyncFlatten(arr) {
 }
 
 // vite/rsc/plugin.ts
-var Vite = __toESM(require("vite"));
 var import_es_module_lexer3 = require("es-module-lexer");
 var Path5 = __toESM(require("pathe"));
 var babel2 = __toESM(require("@babel/core"));
@@ -5373,6 +5372,9 @@ function isRootRouteFile({
 
 // vite/rsc/plugin.ts
 function reactRouterRSCVitePlugin() {
+  let runningWithinTheReactRouterMonoRepo = Boolean(
+    arguments && arguments.length === 1 && typeof arguments[0] === "object" && arguments[0] && "__runningWithinTheReactRouterMonoRepo" in arguments[0] && arguments[0].__runningWithinTheReactRouterMonoRepo === true
+  );
   let configLoader;
   let typegenWatcherPromise;
   let viteCommand;
@@ -5445,6 +5447,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
         entries = await resolveRSCEntryFiles({
           reactRouterConfig: config
         });
+        let viteNormalizePath = (await import("vite")).normalizePath;
         return {
           resolve: {
             dedupe: [
@@ -5459,7 +5462,11 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               "react-router",
               "react-router/dom",
               "react-router/internal/react-server-client",
-              ...hasDependency({ name: "react-router-dom", rootDirectory }) ? ["react-router-dom"] : []
+              ...hasDependency({ name: "react-router-dom", rootDirectory }) ? ["react-router-dom"] : [],
+              ...hasDependency({
+                name: "react-server-dom-webpack",
+                rootDirectory
+              }) ? ["react-server-dom-webpack"] : []
             ]
           },
           optimizeDeps: {
@@ -5478,10 +5485,17 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               "react/jsx-runtime",
               "react/jsx-dev-runtime",
               "react-dom",
-              "react-server-dom-webpack",
+              ...hasDependency({
+                name: "react-server-dom-webpack",
+                rootDirectory
+              }) ? ["react-server-dom-webpack"] : [],
+              ...runningWithinTheReactRouterMonoRepo ? [] : [
+                "react-router",
+                "react-router/dom",
+                "react-router/internal/react-server-client"
+              ],
               "react-router > cookie",
-              "react-router > set-cookie-parser",
-              "react-router/internal/react-server-client"
+              "react-router > set-cookie-parser"
             ]
           },
           esbuild: {
@@ -5497,7 +5511,7 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
                   },
                   output: {
                     manualChunks(id) {
-                      const normalized = Vite.normalizePath(id);
+                      const normalized = viteNormalizePath(id);
                       if (normalized.includes("node_modules/react/") || normalized.includes("node_modules/react-dom/") || normalized.includes(
                         "node_modules/react-server-dom-webpack/"
                       ) || normalized.includes("node_modules/@vitejs/plugin-rsc/")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-df9e1151a",
+  "version": "0.0.0-experimental-f9e19c91c",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -48,6 +48,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "cli/**",
         "config/**",
         "module-sync-enabled/**",
@@ -91,7 +92,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.2.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-df9e1151a"
+    "@react-router/node": "0.0.0-experimental-f9e19c91c"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -115,17 +116,17 @@
     "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "react-router": "^0.0.0-experimental-df9e1151a",
-    "@react-router/serve": "0.0.0-experimental-df9e1151a"
+    "@react-router/serve": "0.0.0-experimental-f9e19c91c",
+    "react-router": "^0.0.0-experimental-f9e19c91c"
   },
   "peerDependencies": {
     "@vitejs/plugin-rsc": "~0.5.6",
-    "react-server-dom-webpack": "*",
+    "react-server-dom-webpack": "^19.2.2",
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0 || ^7.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-df9e1151a",
-    "react-router": "^0.0.0-experimental-df9e1151a"
+    "@react-router/serve": "^0.0.0-experimental-f9e19c91c",
+    "react-router": "^0.0.0-experimental-f9e19c91c"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {