@react-router/dev 0.0.0-experimental-8265d95da → 0.0.0-experimental-1b459f580

package/dist/cli/index.js

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

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

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

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-8265d95da
+ * @react-router/dev v0.0.0-experimental-1b459f580
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2403,14 +2403,27 @@ var getPublicModulePathForEntry = (ctx, viteManifest, entryFilePath) => {
   let entryChunk = resolveChunk(ctx, viteManifest, entryFilePath);
   return entryChunk ? `${ctx.publicPath}${entryChunk.file}` : void 0;
 };
-var getReactRouterManifestBuildAssets = (ctx, viteManifest, entryFilePath, prependedAssetFilePaths = []) => {
+var getCssCodeSplitDisabledFile = (ctx, viteConfig, viteManifest) => {
+  if (viteConfig.build.cssCodeSplit) {
+    return null;
+  }
+  let cssFile = viteManifest["style.css"]?.file;
+  invariant(
+    cssFile,
+    "Expected `style.css` to be present in Vite manifest when `build.cssCodeSplit` is disabled"
+  );
+  return `${ctx.publicPath}${cssFile}`;
+};
+var getClientEntryChunk = (ctx, viteManifest) => {
+  let filePath = ctx.entryClientFilePath;
+  let chunk = resolveChunk(ctx, viteManifest, filePath);
+  invariant(chunk, `Chunk not found: ${filePath}`);
+  return chunk;
+};
+var getReactRouterManifestBuildAssets = (ctx, viteConfig, viteManifest, entryFilePath, route) => {
   let entryChunk = resolveChunk(ctx, viteManifest, entryFilePath);
-  invariant(entryChunk, "Chunk not found");
-  let prependedAssetChunks = prependedAssetFilePaths.map((filePath) => {
-    let chunk = resolveChunk(ctx, viteManifest, filePath);
-    invariant(chunk, "Chunk not found");
-    return chunk;
-  });
+  invariant(entryChunk, `Chunk not found: ${entryFilePath}`);
+  let isRootRoute = Boolean(route && route.parentId === void 0);
   let routeModuleChunks = routeChunkNames.map(
     (routeChunkName) => resolveChunk(
       ctx,
@@ -2418,19 +2431,31 @@ var getReactRouterManifestBuildAssets = (ctx, viteManifest, entryFilePath, prepe
       getRouteChunkModuleId(entryFilePath.split("?")[0], routeChunkName)
     )
   ).filter(isNonNullable);
-  let chunks = resolveDependantChunks(viteManifest, [
-    ...prependedAssetChunks,
-    entryChunk,
-    ...routeModuleChunks
-  ]);
+  let chunks = resolveDependantChunks(
+    viteManifest,
+    [
+      // If this is the root route, we also need to include assets from the
+      // client entry file as this is a common way for consumers to import
+      // global reset styles, etc.
+      isRootRoute ? getClientEntryChunk(ctx, viteManifest) : null,
+      entryChunk,
+      routeModuleChunks
+    ].flat(1).filter(isNonNullable)
+  );
   return {
     module: `${ctx.publicPath}${entryChunk.file}`,
     imports: dedupe(chunks.flatMap((e) => e.imports ?? [])).map((imported) => {
       return `${ctx.publicPath}${viteManifest[imported].file}`;
     }) ?? [],
-    css: dedupe(chunks.flatMap((e) => e.css ?? [])).map((href) => {
-      return `${ctx.publicPath}${href}`;
-    }) ?? []
+    css: dedupe(
+      [
+        // If CSS code splitting is disabled, Vite includes a singular 'style.css' asset
+        // in the manifest that isn't tied to any route file. If we want to render these
+        // styles correctly, we need to include them in the root route.
+        isRootRoute ? getCssCodeSplitDisabledFile(ctx, viteConfig, viteManifest) : null,
+        chunks.flatMap((e) => e.css ?? []).map((href) => `${ctx.publicPath}${href}`)
+      ].flat(1).filter(isNonNullable)
+    )
   };
 };
 function resolveDependantChunks(viteManifest, entryChunks) {
@@ -2744,16 +2769,19 @@ var reactRouterVitePlugin = () => {
     return sriManifest;
   };
   let generateReactRouterManifestsForBuild = async ({
+    viteConfig: viteConfig2,
     routeIds
   }) => {
-    invariant(viteConfig);
+    invariant(viteConfig2);
     let viteManifest = await loadViteManifest(
       getClientBuildDirectory(ctx.reactRouterConfig)
     );
     let entry = getReactRouterManifestBuildAssets(
       ctx,
+      viteConfig2,
       viteManifest,
-      ctx.entryClientFilePath
+      ctx.entryClientFilePath,
+      null
     );
     let browserRoutes = {};
     let serverRoutes = {};
@@ -2765,7 +2793,6 @@ var reactRouterVitePlugin = () => {
     for (let route of Object.values(ctx.reactRouterConfig.routes)) {
       let routeFile = path5.join(ctx.reactRouterConfig.appDirectory, route.file);
       let sourceExports = routeManifestExports[route.id];
-      let isRootRoute = route.parentId === void 0;
       let hasClientAction = sourceExports.includes("clientAction");
       let hasClientLoader = sourceExports.includes("clientLoader");
       let hasClientMiddleware = sourceExports.includes(
@@ -2804,12 +2831,10 @@ var reactRouterVitePlugin = () => {
         hasErrorBoundary: sourceExports.includes("ErrorBoundary"),
         ...getReactRouterManifestBuildAssets(
           ctx,
+          viteConfig2,
           viteManifest,
           `${routeFile}${BUILD_CLIENT_ROUTE_QUERY_STRING}`,
-          // If this is the root route, we also need to include assets from the
-          // client entry file as this is a common way for consumers to import
-          // global reset styles, etc.
-          isRootRoute ? [ctx.entryClientFilePath] : []
+          route
         ),
         clientActionModule: hasRouteChunkByExportName.clientAction ? getPublicModulePathForEntry(
           ctx,
@@ -2840,7 +2865,7 @@ var reactRouterVitePlugin = () => {
     let fingerprintedValues = { entry, routes: browserRoutes };
     let version = getHash(JSON.stringify(fingerprintedValues), 8);
     let manifestPath = path5.posix.join(
-      viteConfig.build.assetsDir,
+      viteConfig2.build.assetsDir,
       `manifest-${version}.js`
     );
     let url2 = `${ctx.publicPath}${manifestPath}`;
@@ -3610,7 +3635,9 @@ var reactRouterVitePlugin = () => {
           }
           case virtual.serverManifest.resolvedId: {
             let routeIds = getServerBundleRouteIds(this, ctx);
+            invariant(viteConfig);
             let reactRouterManifest = viteCommand === "build" ? (await generateReactRouterManifestsForBuild({
+              viteConfig,
               routeIds
             })).reactRouterServerManifest : await getReactRouterManifestForDev();
             if (!ctx.reactRouterConfig.ssr) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-8265d95da",
+  "version": "0.0.0-experimental-1b459f580",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -60,6 +60,7 @@
     }
   },
   "dependencies": {
+    "isbot": "^5.1.11",
     "@babel/core": "^7.27.7",
     "@babel/generator": "^7.27.5",
     "@babel/parser": "^7.27.7",
@@ -85,7 +86,7 @@
     "tinyglobby": "^0.2.14",
     "valibot": "^0.41.0",
     "vite-node": "^3.2.2",
-    "@react-router/node": "0.0.0-experimental-8265d95da"
+    "@react-router/node": "0.0.0-experimental-1b459f580"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -108,16 +109,16 @@
     "typescript": "^5.1.6",
     "vite": "^6.1.0",
     "wireit": "0.14.9",
-    "wrangler": "^4.2.0",
-    "@react-router/serve": "0.0.0-experimental-8265d95da",
-    "react-router": "^0.0.0-experimental-8265d95da"
+    "wrangler": "^4.23.0",
+    "react-router": "^0.0.0-experimental-1b459f580",
+    "@react-router/serve": "0.0.0-experimental-1b459f580"
   },
   "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-8265d95da",
-    "react-router": "^0.0.0-experimental-8265d95da"
+    "@react-router/serve": "^0.0.0-experimental-1b459f580",
+    "react-router": "^0.0.0-experimental-1b459f580"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {