@react-router/dev 0.0.0-experimental-6f53aff26 → 0.0.0-experimental-22117d3a9

package/dist/cli/index.js

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

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-6f53aff26
+ * @react-router/dev v0.0.0-experimental-22117d3a9
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-6f53aff26
+ * @react-router/dev v0.0.0-experimental-22117d3a9
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-6f53aff26
+ * @react-router/dev v0.0.0-experimental-22117d3a9
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-6f53aff26
+ * @react-router/dev v0.0.0-experimental-22117d3a9
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4789,13 +4789,13 @@ async function getBuildManifest({
   if (!serverBundles) {
     return { routes };
   }
-  let { normalizePath } = await import("vite");
+  let { normalizePath: normalizePath2 } = 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 = normalizePath(
+      let rootRelativeFilePath = normalizePath2(
         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: normalizePath(
+        file: normalizePath2(
           path6.join(
             path6.relative(
               rootDirectory,
@@ -5034,6 +5034,7 @@ 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"));
@@ -5449,11 +5450,15 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
             dedupe: [
               // https://react.dev/warnings/invalid-hook-call-warning#duplicate-react
               "react",
+              "react/jsx-runtime",
+              "react/jsx-dev-runtime",
               "react-dom",
+              "react-dom/client",
               // Avoid router duplicates since mismatching routers cause `Error:
               // You must render this element inside a <Remix> element`.
               "react-router",
               "react-router/dom",
+              "react-router/internal/react-server-client",
               ...hasDependency({ name: "react-router-dom", rootDirectory }) ? ["react-router-dom"] : []
             ]
           },
@@ -5473,7 +5478,9 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
               "react/jsx-runtime",
               "react/jsx-dev-runtime",
               "react-dom",
-              "react-dom/client",
+              "react-server-dom-webpack",
+              "react-router > cookie",
+              "react-router > set-cookie-parser",
               "react-router/internal/react-server-client"
             ]
           },
@@ -5487,15 +5494,22 @@ ${errors.map((x) => ` - ${x}`).join("\n")}
                 rollupOptions: {
                   input: {
                     index: entries.client
+                  },
+                  output: {
+                    manualChunks(id) {
+                      const normalized = Vite.normalizePath(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/")) {
+                        return "react";
+                      }
+                      if (normalized.includes("node_modules/react-router/")) {
+                        return "router";
+                      }
+                    }
                   }
                 },
                 outDir: (0, import_pathe6.join)(config.buildDirectory, "client")
-              },
-              optimizeDeps: {
-                include: [
-                  "react-router > cookie",
-                  "react-router > set-cookie-parser"
-                ]
               }
             },
             rsc: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-6f53aff26",
+  "version": "0.0.0-experimental-22117d3a9",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -91,7 +91,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^1.2.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-6f53aff26"
+    "@react-router/node": "0.0.0-experimental-22117d3a9"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -105,26 +105,27 @@
     "@types/node": "^20.0.0",
     "@types/npmcli__package-json": "^4.0.0",
     "@types/semver": "^7.7.0",
-    "@vitejs/plugin-rsc": "0.4.30",
+    "@vitejs/plugin-rsc": "~0.5.6",
     "esbuild-register": "^3.6.0",
     "execa": "5.1.1",
     "express": "^4.19.2",
     "fast-glob": "3.2.11",
     "tsup": "^8.3.0",
-    "typescript": "^5.1.6",
+    "typescript": "^5.4.5",
     "vite": "^6.3.0",
     "wireit": "0.14.9",
     "wrangler": "^4.23.0",
-    "@react-router/serve": "0.0.0-experimental-6f53aff26",
-    "react-router": "^0.0.0-experimental-6f53aff26"
+    "@react-router/serve": "0.0.0-experimental-22117d3a9",
+    "react-router": "^0.0.0-experimental-22117d3a9"
   },
   "peerDependencies": {
-    "@vitejs/plugin-rsc": "*",
+    "@vitejs/plugin-rsc": "~0.5.6",
+    "react-server-dom-webpack": "canary",
     "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-6f53aff26",
-    "react-router": "^0.0.0-experimental-6f53aff26"
+    "@react-router/serve": "^0.0.0-experimental-22117d3a9",
+    "react-router": "^0.0.0-experimental-22117d3a9"
   },
   "peerDependenciesMeta": {
     "@vitejs/plugin-rsc": {