@react-router/dev 0.0.0-experimental-235eba2 → 0.0.0-experimental-8265d95da

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-235eba2
+ * @react-router/dev v0.0.0-experimental-8265d95da
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -743,7 +743,7 @@ var init_config = __esm({
       });
       return o;
     };
-    entryExts = [".js", ".jsx", ".ts", ".tsx"];
+    entryExts = [".js", ".jsx", ".ts", ".tsx", ".mjs", ".mts"];
   }
 });
 
@@ -1495,10 +1495,6 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   );
   let { moduleSyncEnabled } = await import(`file:///${path6.join(packageRoot, "module-sync-enabled/index.mjs")}`);
   let vite2 = getVite();
-  let viteServerConditions = [
-    ...vite2.defaultServerConditions ?? [],
-    ...moduleSyncEnabled ? ["module-sync"] : []
-  ];
   function getBaseOptions({
     viteUserConfig
   }) {
@@ -1530,15 +1526,24 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   function getBaseServerOptions({
     viteUserConfig
   }) {
-    let conditions = viteCommand === "build" ? viteServerConditions : ["development", ...viteServerConditions];
+    let maybeModuleSyncConditions = [
+      ...moduleSyncEnabled ? ["module-sync"] : []
+    ];
+    let maybeDevelopmentConditions = viteCommand === "build" ? [] : ["development"];
+    let maybeDefaultServerConditions = vite2.defaultServerConditions || [];
+    let defaultExternalConditions = ["node"];
+    let baseConditions = [
+      ...maybeDevelopmentConditions,
+      ...maybeModuleSyncConditions
+    ];
     return mergeEnvironmentOptions(getBaseOptions({ viteUserConfig }), {
       resolve: {
         external: (
           // If `unstable_viteEnvironmentApi` is `true`, `resolve.external` is set in the `configEnvironment` hook
           ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? void 0 : ssrExternals
         ),
-        conditions,
-        externalConditions: conditions
+        conditions: [...baseConditions, ...maybeDefaultServerConditions],
+        externalConditions: [...baseConditions, ...defaultExternalConditions]
       },
       build: {
         // We move SSR-only assets to client assets. Note that the

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-235eba2
+ * @react-router/dev v0.0.0-experimental-8265d95da
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-235eba2
+ * @react-router/dev v0.0.0-experimental-8265d95da
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/static/refresh-utils.cjs

@@ -158,8 +158,6 @@ const routeUpdates = new Map();
 window.__reactRouterRouteModuleUpdates = new Map();
 
 import.meta.hot.on("react-router:hmr", async ({ route }) => {
-  window.__reactRouterClearCriticalCss();
-
   if (route) {
     routeUpdates.set(route.id, route);
   }

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-235eba2
+ * @react-router/dev v0.0.0-experimental-8265d95da
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -736,7 +736,7 @@ function omitRoutes(config) {
     routes: {}
   };
 }
-var entryExts = [".js", ".jsx", ".ts", ".tsx"];
+var entryExts = [".js", ".jsx", ".ts", ".tsx", ".mjs", ".mts"];
 function isEntryFile(entryBasename, filename) {
   return entryExts.some((ext) => filename === `${entryBasename}${ext}`);
 }
@@ -803,10 +803,7 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
     name: PLUGIN_NAME,
     config: async (config, configEnv) => {
       await preloadVite();
-      const vite2 = getVite();
-      const serverConditions = [
-        ...vite2.defaultServerConditions ?? []
-      ];
+      const externalConditions = ["node"];
       let configResult = await loadConfig({
         rootDirectory: config.root ?? process.cwd(),
         mode: configEnv.mode
@@ -818,7 +815,7 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
       return {
         ssr: {
           resolve: {
-            externalConditions: [...workerdConditions, ...serverConditions]
+            externalConditions: [...workerdConditions, ...externalConditions]
           }
         }
       };

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-235eba2
+ * @react-router/dev v0.0.0-experimental-8265d95da
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -740,7 +740,7 @@ function omitRoutes(config) {
     routes: {}
   };
 }
-var entryExts = [".js", ".jsx", ".ts", ".tsx"];
+var entryExts = [".js", ".jsx", ".ts", ".tsx", ".mjs", ".mts"];
 function isEntryFile(entryBasename, filename2) {
   return entryExts.some((ext) => filename2 === `${entryBasename}${ext}`);
 }
@@ -4073,7 +4073,7 @@ async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory
     );
   }
   await (0, import_promises2.writeFile)(path5.join(clientBuildDirectory, filename2), html);
-  let prettyDir = path5.relative(process.cwd(), clientBuildDirectory);
+  let prettyDir = path5.relative(viteConfig.root, clientBuildDirectory);
   let prettyPath = path5.join(prettyDir, filename2);
   if (build.prerender.length > 0) {
     viteConfig.logger.info(
@@ -4201,12 +4201,13 @@ async function prerenderData(handler, prerenderPath, onlyRoutes, clientBuildDire
 ${normalizedPath}`
     );
   }
-  let outdir = path5.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path5.join(outdir, ...normalizedPath.split("/"));
+  let outfile = path5.join(clientBuildDirectory, ...normalizedPath.split("/"));
   await (0, import_promises2.mkdir)(path5.dirname(outfile), { recursive: true });
   await (0, import_promises2.writeFile)(outfile, data);
   viteConfig.logger.info(
-    `Prerender (data): ${prerenderPath} -> ${import_picocolors3.default.bold(outfile)}`
+    `Prerender (data): ${prerenderPath} -> ${import_picocolors3.default.bold(
+      path5.relative(viteConfig.root, outfile)
+    )}`
   );
   return data;
 }
@@ -4240,12 +4241,17 @@ async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reac
 ${html}`
     );
   }
-  let outdir = path5.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path5.join(outdir, ...normalizedPath.split("/"), "index.html");
+  let outfile = path5.join(
+    clientBuildDirectory,
+    ...normalizedPath.split("/"),
+    "index.html"
+  );
   await (0, import_promises2.mkdir)(path5.dirname(outfile), { recursive: true });
   await (0, import_promises2.writeFile)(outfile, html);
   viteConfig.logger.info(
-    `Prerender (html): ${prerenderPath} -> ${import_picocolors3.default.bold(outfile)}`
+    `Prerender (html): ${prerenderPath} -> ${import_picocolors3.default.bold(
+      path5.relative(viteConfig.root, outfile)
+    )}`
   );
 }
 async function prerenderResourceRoute(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
@@ -4259,12 +4265,13 @@ async function prerenderResourceRoute(handler, prerenderPath, clientBuildDirecto
 ${content.toString("utf8")}`
     );
   }
-  let outdir = path5.relative(process.cwd(), clientBuildDirectory);
-  let outfile = path5.join(outdir, ...normalizedPath.split("/"));
+  let outfile = path5.join(clientBuildDirectory, ...normalizedPath.split("/"));
   await (0, import_promises2.mkdir)(path5.dirname(outfile), { recursive: true });
   await (0, import_promises2.writeFile)(outfile, content);
   viteConfig.logger.info(
-    `Prerender (resource): ${prerenderPath} -> ${import_picocolors3.default.bold(outfile)}`
+    `Prerender (resource): ${prerenderPath} -> ${import_picocolors3.default.bold(
+      path5.relative(viteConfig.root, outfile)
+    )}`
   );
 }
 async function getPrerenderPaths(prerender, ssr, routes, logWarning = false) {
@@ -4625,10 +4632,6 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   );
   let { moduleSyncEnabled } = await import(`file:///${path5.join(packageRoot, "module-sync-enabled/index.mjs")}`);
   let vite2 = getVite();
-  let viteServerConditions = [
-    ...vite2.defaultServerConditions ?? [],
-    ...moduleSyncEnabled ? ["module-sync"] : []
-  ];
   function getBaseOptions({
     viteUserConfig
   }) {
@@ -4660,15 +4663,24 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   function getBaseServerOptions({
     viteUserConfig
   }) {
-    let conditions = viteCommand === "build" ? viteServerConditions : ["development", ...viteServerConditions];
+    let maybeModuleSyncConditions = [
+      ...moduleSyncEnabled ? ["module-sync"] : []
+    ];
+    let maybeDevelopmentConditions = viteCommand === "build" ? [] : ["development"];
+    let maybeDefaultServerConditions = vite2.defaultServerConditions || [];
+    let defaultExternalConditions = ["node"];
+    let baseConditions = [
+      ...maybeDevelopmentConditions,
+      ...maybeModuleSyncConditions
+    ];
     return mergeEnvironmentOptions(getBaseOptions({ viteUserConfig }), {
       resolve: {
         external: (
           // If `unstable_viteEnvironmentApi` is `true`, `resolve.external` is set in the `configEnvironment` hook
           ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? void 0 : ssrExternals
         ),
-        conditions,
-        externalConditions: conditions
+        conditions: [...baseConditions, ...maybeDefaultServerConditions],
+        externalConditions: [...baseConditions, ...defaultExternalConditions]
       },
       build: {
         // We move SSR-only assets to client assets. Note that the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-235eba2",
+  "version": "0.0.0-experimental-8265d95da",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -84,8 +84,8 @@
     "set-cookie-parser": "^2.6.0",
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
-    "vite-node": "^3.1.4",
-    "@react-router/node": "0.0.0-experimental-235eba2"
+    "vite-node": "^3.2.2",
+    "@react-router/node": "0.0.0-experimental-8265d95da"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -109,15 +109,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.2.0",
-    "react-router": "^0.0.0-experimental-235eba2",
-    "@react-router/serve": "0.0.0-experimental-235eba2"
+    "@react-router/serve": "0.0.0-experimental-8265d95da",
+    "react-router": "^0.0.0-experimental-8265d95da"
   },
   "peerDependencies": {
     "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-235eba2",
-    "react-router": "^0.0.0-experimental-235eba2"
+    "@react-router/serve": "^0.0.0-experimental-8265d95da",
+    "react-router": "^0.0.0-experimental-8265d95da"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {