@reckona/mreact-router 0.0.131 → 0.0.134

package/src/build.ts

@@ -1,6 +1,16 @@
 import { createHash } from "node:crypto";
 import type { Dirent } from "node:fs";
-import { copyFile, cp, mkdir, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
+import {
+  copyFile,
+  cp,
+  lstat,
+  mkdir,
+  readdir,
+  readFile,
+  rm,
+  stat,
+  writeFile,
+} from "node:fs/promises";
 import { builtinModules } from "node:module";
 import { availableParallelism } from "node:os";
 import { dirname, join, relative, resolve, sep } from "node:path";
@@ -77,7 +87,7 @@ import { collectRouteCssFilesFromSources, collectSpecialBoundaryFiles } from "./
 import { existingRouteShellCandidates } from "./route-shells.js";
 import { sourceModuleCandidates } from "./source-modules.js";
 import { collectBuildInferredServerActions } from "./server-action-inference.js";
-import { vitePluginsCacheKey } from "./vite-plugin-cache-key.js";
+import { viteDefineCacheKey, vitePluginsCacheKey } from "./vite-plugin-cache-key.js";
 import { workspacePackageFile } from "./workspace-packages.js";
 import type { PluginOption, UserConfig } from "vite";
 
@@ -380,10 +390,11 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
           }),
         ),
     timingSink === undefined
-      ? buildServerModuleArtifacts({
-          bundleCache: new Map(),
-          clientRouteInferenceCache: serverClientRouteInferenceCache,
-          files,
+        ? buildServerModuleArtifacts({
+            bundleCache: new Map(),
+            clientRouteInferenceCache: serverClientRouteInferenceCache,
+            define: viteDefine,
+            files,
           prebundleServerComponents: buildTargets.includes("node") || shouldBuildAwsLambda,
           project,
           projectRoot: project.projectRoot,
@@ -396,6 +407,7 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
           buildServerModuleArtifacts({
             bundleCache: new Map(),
             clientRouteInferenceCache: serverClientRouteInferenceCache,
+            define: viteDefine,
             files,
             prebundleServerComponents: buildTargets.includes("node") || shouldBuildAwsLambda,
             project,
@@ -501,6 +513,7 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
           appDir: project.routesDir,
           assetBaseUrl: project.assetBaseUrl,
           clientRoutes: clientManifestRoutes,
+          define: viteDefine,
           project,
           routes,
           serverModules,
@@ -512,6 +525,7 @@ export async function buildApp(options: BuildAppOptions): Promise<BuildAppResult
             appDir: project.routesDir,
             assetBaseUrl: project.assetBaseUrl,
             clientRoutes: clientManifestRoutes,
+            define: viteDefine,
             project,
             routes,
             serverModules,
@@ -1210,12 +1224,14 @@ async function collectRuntimeOptionalPackages(options: {
   const queue: Array<{ packageName: string; optional: boolean; startDir: string }> = [
     { packageName: options.packageName, optional: false, startDir: options.projectRoot },
   ];
+  let stoppedAtManifestReadCap = false;
+
+  for (let index = 0; index < queue.length; index += 1) {
+    if (seenPackageJson.size >= maxRuntimePackageManifestReads) {
+      stoppedAtManifestReadCap = true;
+      break;
+    }
 
-  for (
-    let index = 0;
-    index < queue.length && seenPackageJson.size < maxRuntimePackageManifestReads;
-    index += 1
-  ) {
     const item = queue[index];
     if (item === undefined || !isValidRuntimePackageName(item.packageName)) {
       continue;
@@ -1250,6 +1266,17 @@ async function collectRuntimeOptionalPackages(options: {
     }
   }
 
+  if (stoppedAtManifestReadCap) {
+    console.warn(
+      [
+        "MR_RUNTIME_PACKAGE_MANIFEST_SCAN_LIMIT:",
+        `stopped scanning optional runtime package manifests after ${maxRuntimePackageManifestReads} files`,
+        `while collecting transitive optional dependencies for ${options.packageName}.`,
+        "Generated import-policy.json may omit deeper optional runtime packages.",
+      ].join(" "),
+    );
+  }
+
   return [...optionalPackages].sort();
 }
 
@@ -1455,36 +1482,36 @@ function moduleIdForBuildFile(file: string, relativeRoutesDir: string): string {
 }
 
 async function copyPublicAssets(publicDir: string, outDir: string): Promise<void> {
-  try {
-    await cp(publicDir, outDir, { force: true, recursive: true });
-  } catch (error) {
-    if (isNodeError(error) && error.code === "ENOENT") {
-      return;
-    }
-
-    throw error;
+  if (!(await isPublicAssetDirectory(publicDir))) {
+    return;
   }
+
+  await copyPublicAssetsInner(publicDir, "", outDir);
 }
 
 async function collectPublicAssetPaths(publicDir: string): Promise<string[]> {
+  if (!(await isPublicAssetDirectory(publicDir))) {
+    return [];
+  }
+
+  const paths: string[] = [];
+  await collectPublicAssetPathsInner(publicDir, "", paths);
+
+  return paths.sort();
+}
+
+async function isPublicAssetDirectory(publicDir: string): Promise<boolean> {
   try {
-    const info = await stat(publicDir);
+    const info = await lstat(publicDir);
 
-    if (!info.isDirectory()) {
-      return [];
-    }
+    return info.isDirectory();
   } catch (error) {
     if (isNodeError(error) && error.code === "ENOENT") {
-      return [];
+      return false;
     }
 
     throw error;
   }
-
-  const paths: string[] = [];
-  await collectPublicAssetPathsInner(publicDir, "", paths);
-
-  return paths.sort();
 }
 
 async function copyAppFileConventionAssets(appDir: string, outDir: string): Promise<string[]> {
@@ -1529,6 +1556,11 @@ async function collectPublicAssetPathsInner(
 
   for (const entry of entries) {
     const relativePath = relativeDir === "" ? entry.name : `${relativeDir}/${entry.name}`;
+    const publicPath = `/${relativePath}`;
+
+    if (isReservedPublicAssetPath(publicPath)) {
+      continue;
+    }
 
     if (entry.isDirectory()) {
       await collectPublicAssetPathsInner(publicDir, relativePath, paths);
@@ -1536,11 +1568,42 @@ async function collectPublicAssetPathsInner(
     }
 
     if (entry.isFile()) {
-      paths.push(`/${relativePath}`);
+      paths.push(publicPath);
     }
   }
 }
 
+async function copyPublicAssetsInner(
+  publicDir: string,
+  relativeDir: string,
+  outDir: string,
+): Promise<void> {
+  const entries = await readdir(join(publicDir, relativeDir), { withFileTypes: true });
+
+  for (const entry of entries) {
+    const relativePath = relativeDir === "" ? entry.name : `${relativeDir}/${entry.name}`;
+
+    if (isReservedPublicAssetPath(`/${relativePath}`)) {
+      continue;
+    }
+
+    if (entry.isDirectory()) {
+      await copyPublicAssetsInner(publicDir, relativePath, outDir);
+      continue;
+    }
+
+    if (entry.isFile()) {
+      const destination = join(outDir, relativePath);
+      await mkdir(dirname(destination), { recursive: true });
+      await copyFile(join(publicDir, relativePath), destination);
+    }
+  }
+}
+
+function isReservedPublicAssetPath(pathname: string): boolean {
+  return pathname === "/_mreact" || pathname.startsWith("/_mreact/");
+}
+
 function isNodeError(error: unknown): error is NodeJS.ErrnoException {
   return error instanceof Error && "code" in error;
 }
@@ -1549,6 +1612,7 @@ async function prerenderStaticRoutes(options: {
   appDir: string;
   assetBaseUrl?: string | undefined;
   clientRoutes: readonly ClientRouteManifestEntry[];
+  define?: UserConfig["define"] | undefined;
   project: ResolvedAppRouterProject;
   routes: readonly AppRoute[];
   serverModules: Record<string, BuiltServerModuleArtifact>;
@@ -1560,6 +1624,11 @@ async function prerenderStaticRoutes(options: {
       route.client && route.script !== undefined ? [[route.path, route.script]] : [],
     ),
   );
+  const clientStyles = new Map(
+    options.clientRoutes.flatMap((route) =>
+      route.css !== undefined && route.css.length > 0 ? [[route.path, route.css]] : [],
+    ),
+  );
   const prerendered: Record<string, BuiltPrerenderedRoute> = {};
   const importPolicy = {
     allowedPackages: await readDeclaredProjectPackages(options.project.projectRoot),
@@ -1589,6 +1658,8 @@ async function prerenderStaticRoutes(options: {
           appDir: options.appDir,
           assetBaseUrl: options.assetBaseUrl,
           clientScripts,
+          clientStyles,
+          define: options.define,
           importPolicy,
           request: new Request(`http://mreact.local${pathname}`),
           serverModules: serverModuleMap,
@@ -1680,6 +1751,7 @@ async function buildServerModuleArtifacts(options: {
   bundleCache: Map<string, Promise<RouterBundleOutput>>;
   cacheDir?: string | undefined;
   clientRouteInferenceCache: ClientRouteInferenceCache;
+  define?: UserConfig["define"] | undefined;
   files: Record<string, string>;
   prebundleServerComponents: boolean;
   project: ResolvedAppRouterProject;
@@ -1770,6 +1842,7 @@ async function buildServerModuleArtifacts(options: {
           cacheDir: options.cacheDir,
           entries: requestBatchEntries,
           importPolicy: requestModuleImportPolicy,
+          define: options.define,
           vitePlugins: options.vitePlugins,
         })
       : new Map<string, string>();
@@ -1797,6 +1870,7 @@ async function buildServerModuleArtifacts(options: {
               code: stripRouteLoaderOnlyExports(source, absoluteFile),
               filename: absoluteFile,
               importPolicy: requestModuleImportPolicy,
+              define: options.define,
               vitePlugins: options.vitePlugins,
             }));
           artifact.loader = {
@@ -1816,6 +1890,7 @@ async function buildServerModuleArtifacts(options: {
               filename: absoluteFile,
               importPolicy: requestModuleImportPolicy,
               label: "Metadata",
+              define: options.define,
               vitePlugins: options.vitePlugins,
             }));
           artifact.routeMetadata = {
@@ -1837,6 +1912,7 @@ async function buildServerModuleArtifacts(options: {
                 cacheDir: options.cacheDir,
                 filename: absoluteFile,
                 importPolicy: requestModuleImportPolicy,
+                define: options.define,
                 routeKind: route?.kind,
                 source,
                 vitePlugins: options.vitePlugins,
@@ -1952,6 +2028,7 @@ async function buildServerModuleArtifacts(options: {
                       clientRouteInferenceCache: options.clientRouteInferenceCache,
                       code: output.code,
                       filename: absoluteFile,
+                      define: options.define,
                       root: options.projectRoot,
                       serverOutput,
                       vitePlugins: options.vitePlugins,
@@ -1988,6 +2065,7 @@ async function buildServerModuleArtifacts(options: {
 async function buildServerComponentBundleArtifactCode(options: {
   clientRouteInferenceCache: ClientRouteInferenceCache;
   code: string;
+  define?: UserConfig["define"] | undefined;
   filename: string;
   root?: string | undefined;
   serverOutput: ServerOutputMode;
@@ -1995,11 +2073,13 @@ async function buildServerComponentBundleArtifactCode(options: {
 }): Promise<string> {
   return await bundleAppRouterSourceModule({
     code: options.code,
+    define: options.define,
     label: `server-component:${options.filename}`,
     resolveDir: dirname(options.filename),
     root: options.root,
     serverSourceTransform: {
       clientRouteInferenceCache: options.clientRouteInferenceCache,
+      define: options.define,
       dev: false,
       serverOutput: options.serverOutput,
       vitePlugins: options.vitePlugins,
@@ -2138,6 +2218,7 @@ async function buildRequestModuleArtifactCode(options: {
   appDir: string;
   bundleCache: Map<string, Promise<RouterBundleOutput>>;
   cacheDir?: string | undefined;
+  define?: UserConfig["define"] | undefined;
   filename: string;
   importPolicy: AppRouterImportPolicy;
   routeKind?: AppRoute["kind"] | undefined;
@@ -2148,6 +2229,7 @@ async function buildRequestModuleArtifactCode(options: {
     return await bundleMiddlewareModuleCode({
       appDir: options.appDir,
       code: options.source,
+      define: options.define,
       file: options.filename,
       importPolicy: options.importPolicy,
       vitePlugins: options.vitePlugins,
@@ -2157,6 +2239,7 @@ async function buildRequestModuleArtifactCode(options: {
   if (options.routeKind === "server" || options.routeKind === "metadata") {
     return await bundleAppRouterSourceModule({
       code: options.source,
+      define: options.define,
       label: `server-route:${options.filename}`,
       plugins: [fileImportMetaUrlPlugin()],
       resolveDir: dirname(options.filename),
@@ -2171,6 +2254,7 @@ async function buildRequestModuleArtifactCode(options: {
     bundleCache: options.bundleCache,
     cacheDir: options.cacheDir,
     code: stripRouteRequestOnlyExports(options.source, options.filename),
+    define: options.define,
     filename: options.filename,
     importPolicy: options.importPolicy,
     vitePlugins: options.vitePlugins,
@@ -2182,6 +2266,7 @@ async function bundleRouteLoaderModuleCode(options: {
   bundleCache?: Map<string, Promise<RouterBundleOutput>> | undefined;
   cacheDir?: string | undefined;
   code: string;
+  define?: UserConfig["define"] | undefined;
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -2196,6 +2281,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
   appDir: string;
   bundleCache?: Map<string, Promise<RouterBundleOutput>> | undefined;
   cacheDir?: string | undefined;
+  define?: UserConfig["define"] | undefined;
   entries: readonly RouteRequestModuleBatchEntry[];
   importPolicy?: AppRouterImportPolicy | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -2218,6 +2304,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
           bundleCache: options.bundleCache,
           cacheDir: options.cacheDir,
           code: entry.code,
+          define: options.define,
           filename: entry.filename,
           importPolicy: options.importPolicy,
           label: entry.label,
@@ -2242,6 +2329,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
       name: namesByKey.get(entry.key) ?? hashText(entry.key).slice(0, 8),
     })),
     entryFileNames: "request/[name].js",
+    define: options.define,
     platform: "node",
     plugins: [
       fileImportMetaUrlPlugin(),
@@ -2267,6 +2355,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
             bundleCache: options.bundleCache,
             cacheDir: options.cacheDir,
             code: entry.code,
+            define: options.define,
             filename: entry.filename,
             importPolicy: options.importPolicy,
             label: entry.label,
@@ -2295,6 +2384,7 @@ async function bundleRouteRequestModuleBatchCode(options: {
 export async function __bundleRouteRequestModuleBatchForTests(options: {
   appDir: string;
   cacheDir?: string | undefined;
+  define?: UserConfig["define"] | undefined;
   entries: readonly RouteRequestModuleBatchEntry[];
   importPolicy?: AppRouterImportPolicy | undefined;
   vitePlugins?: readonly PluginOption[] | undefined;
@@ -2303,6 +2393,7 @@ export async function __bundleRouteRequestModuleBatchForTests(options: {
     await bundleRouteRequestModuleBatchCode({
       appDir: options.appDir,
       cacheDir: options.cacheDir,
+      define: options.define,
       entries: options.entries,
       importPolicy: options.importPolicy,
       vitePlugins: options.vitePlugins,
@@ -2315,6 +2406,7 @@ async function bundleRouteRequestModuleCode(options: {
   bundleCache?: Map<string, Promise<RouterBundleOutput>> | undefined;
   cacheDir?: string | undefined;
   code: string;
+  define?: UserConfig["define"] | undefined;
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   label: "Loader" | "Metadata";
@@ -2325,6 +2417,7 @@ async function bundleRouteRequestModuleCode(options: {
     cacheDir: options.cacheDir,
     cacheKey: routeRequestBundleCacheKey(options),
     code: options.code,
+    define: options.define,
     filename: options.filename,
     platform: "node",
     root: options.importPolicy?.projectRoot,
@@ -2350,6 +2443,7 @@ async function bundleRouteRequestModuleCode(options: {
 function routeRequestBundleCacheKey(options: {
   appDir: string;
   code: string;
+  define?: UserConfig["define"] | undefined;
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   label: "Loader" | "Metadata";
@@ -2375,6 +2469,7 @@ function routeRequestBundleCacheKey(options: {
     label: options.label,
     platform: "node",
     target: "es2022",
+    viteDefine: viteDefineCacheKey(options.define),
     vitePlugins: vitePluginsCacheKey(options.vitePlugins),
   });
 }
@@ -3540,7 +3635,12 @@ function cloudflareHydrationMarkerParts(props) {
 }
 
 function escapeScriptJson(json) {
-  return json.replaceAll("<", "\\\\u003c");
+  return json
+    .replaceAll("&", "\\\\u0026")
+    .replaceAll("<", "\\\\u003c")
+    .replaceAll(">", "\\\\u003e")
+    .replaceAll("\\u2028", "\\\\u2028")
+    .replaceAll("\\u2029", "\\\\u2029");
 }
 
 function cloudflareRouteIdForPath(path) {
@@ -4387,6 +4487,11 @@ interface ClientStyleManifestEntry {
   file: string;
 }
 
+interface RouteCssAssetBatch {
+  assets: string[];
+  css: string[];
+}
+
 async function writeClientRouteBundles(options: {
   appDir: string;
   assetBaseUrl?: string | undefined;
@@ -4414,6 +4519,7 @@ async function writeClientRouteBundles(options: {
   );
   const routeCssAssets = await writeRouteCssAssetBatches({
     appDir: options.appDir,
+    assetBaseUrl: options.assetBaseUrl,
     cacheDir: options.cacheDir,
     clientDir: options.clientDir,
     pageRoutes,
@@ -4423,6 +4529,7 @@ async function writeClientRouteBundles(options: {
   });
   const specialCssAssets = await writeSpecialRouteCssAssetBatches({
     appDir: options.appDir,
+    assetBaseUrl: options.assetBaseUrl,
     cacheDir: options.cacheDir,
     clientDir: options.clientDir,
     projectRoot: options.projectRoot,
@@ -4437,7 +4544,7 @@ async function writeClientRouteBundles(options: {
         };
       }
 
-      const css = routeCssAssets.get(route.file) ?? [];
+      const css = routeCssAssets.byRoute.get(route.file) ?? [];
       const source = buildSourceAnalysisForFile(
         options.sourceAnalysis,
         options.projectRoot,
@@ -4510,9 +4617,9 @@ async function writeClientRouteBundles(options: {
 
   if (clientEntries.length === 0) {
     return {
-      assets: [],
+      assets: [...routeCssAssets.assets, ...specialCssAssets.assets].sort(),
       routes: entries.flatMap((entry) => ("manifest" in entry ? [entry.manifest] : [])),
-      styles: specialCssAssets,
+      styles: specialCssAssets.styles,
     };
   }
 
@@ -4578,7 +4685,10 @@ async function writeClientRouteBundles(options: {
     await writeFile(join(options.clientDir, asset.fileName), source);
   }
 
-  const generatedAssets = new Set<string>();
+  const generatedAssets = new Set<string>([
+    ...routeCssAssets.assets,
+    ...specialCssAssets.assets,
+  ]);
 
   for (const chunk of output.chunks) {
     generatedAssets.add(chunk.fileName);
@@ -4632,18 +4742,19 @@ async function writeClientRouteBundles(options: {
   return {
     assets: Array.from(generatedAssets).sort(),
     routes,
-    styles: specialCssAssets,
+    styles: specialCssAssets.styles,
   };
 }
 
 async function writeSpecialRouteCssAssetBatches(options: {
   appDir: string;
+  assetBaseUrl?: string | undefined;
   cacheDir?: string | undefined;
   clientDir: string;
   projectRoot: string;
   sourceAnalysis: BuildSourceAnalysisScope;
   vitePlugins?: readonly PluginOption[] | undefined;
-}): Promise<ClientStyleManifestEntry[]> {
+}): Promise<{ assets: string[]; styles: ClientStyleManifestEntry[] }> {
   const boundaryFiles = await collectSpecialBoundaryFiles(options.appDir);
   const entries = await mapWithBuildConcurrency(boundaryFiles, async (file) => {
     const cssFiles = await collectRouteCssFilesFromSources({
@@ -4658,7 +4769,8 @@ async function writeSpecialRouteCssAssetBatches(options: {
       return undefined;
     }
 
-    const css = await writeRouteCssAssetsForFiles({
+    const batch = await writeRouteCssAssetsForFiles({
+      assetBaseUrl: options.assetBaseUrl,
       cacheDir: options.cacheDir,
       clientDir: options.clientDir,
       cssFiles,
@@ -4668,17 +4780,23 @@ async function writeSpecialRouteCssAssetBatches(options: {
       vitePlugins: options.vitePlugins,
     });
 
-    return css.length === 0
+    return batch.css.length === 0
       ? undefined
       : ({
-          css,
-          file: relative(options.appDir, file).split(sep).join("/"),
-        } satisfies ClientStyleManifestEntry);
+          assets: batch.assets,
+          style: {
+            css: batch.css,
+            file: relative(options.appDir, file).split(sep).join("/"),
+          } satisfies ClientStyleManifestEntry,
+        });
   });
 
-  return entries
-    .filter((entry): entry is ClientStyleManifestEntry => entry !== undefined)
-    .sort((left, right) => left.file.localeCompare(right.file));
+  return {
+    assets: entries.flatMap((entry) => entry?.assets ?? []).sort(),
+    styles: entries
+      .flatMap((entry) => (entry === undefined ? [] : [entry.style]))
+      .sort((left, right) => left.file.localeCompare(right.file)),
+  };
 }
 
 function specialBoundaryRouteId(appDir: string, file: string): string {
@@ -4693,13 +4811,14 @@ function specialBoundaryRouteId(appDir: string, file: string): string {
 
 async function writeRouteCssAssetBatches(options: {
   appDir: string;
+  assetBaseUrl?: string | undefined;
   cacheDir?: string | undefined;
   clientDir: string;
   pageRoutes: readonly (AppRoute & { kind: "page" })[];
   projectRoot: string;
   sourceAnalysis: BuildSourceAnalysisScope;
   vitePlugins?: readonly PluginOption[] | undefined;
-}): Promise<Map<string, string[]>> {
+}): Promise<{ assets: string[]; byRoute: Map<string, string[]> }> {
   const cssInputs = await mapWithBuildConcurrency(options.pageRoutes, async (route) => {
     const cssFiles = await collectRouteCssFilesFromSources({
       appDir: options.appDir,
@@ -4734,6 +4853,7 @@ async function writeRouteCssAssetBatches(options: {
       [
         key,
         await writeRouteCssAssetsForFiles({
+          assetBaseUrl: options.assetBaseUrl,
           cacheDir: options.cacheDir,
           clientDir: options.clientDir,
           cssFiles: group.cssFiles,
@@ -4746,19 +4866,26 @@ async function writeRouteCssAssetBatches(options: {
   );
   const cssByGroup = new Map(writtenGroups);
   const cssByRoute = new Map<string, string[]>();
+  const assets = new Set<string>();
 
   for (const [key, group] of groups) {
-    const css = cssByGroup.get(key) ?? [];
+    const batch = cssByGroup.get(key);
+    const css = batch?.css ?? [];
+
+    for (const asset of batch?.assets ?? []) {
+      assets.add(asset);
+    }
 
     for (const routeFile of group.routeFiles) {
       cssByRoute.set(routeFile, css);
     }
   }
 
-  return cssByRoute;
+  return { assets: [...assets].sort(), byRoute: cssByRoute };
 }
 
 async function writeRouteCssAssetsForFiles(options: {
+  assetBaseUrl?: string | undefined;
   cacheDir?: string | undefined;
   clientDir: string;
   cssFiles: readonly string[];
@@ -4766,10 +4893,10 @@ async function writeRouteCssAssetsForFiles(options: {
   projectRoot: string;
   routeIds: readonly string[];
   vitePlugins?: readonly PluginOption[] | undefined;
-}): Promise<string[]> {
+}): Promise<RouteCssAssetBatch> {
   const cssFiles = [...options.cssFiles];
   if (cssFiles.length === 0) {
-    return [];
+    return { assets: [], css: [] };
   }
 
   const code = [
@@ -4777,6 +4904,7 @@ async function writeRouteCssAssetsForFiles(options: {
     "export default undefined;",
   ].join("\n");
   const output = await bundleRouterModule({
+    base: options.assetBaseUrl ?? "/_mreact/client/",
     cacheDir: options.cacheDir,
     code,
     filename: options.pageFile,
@@ -4786,6 +4914,8 @@ async function writeRouteCssAssetsForFiles(options: {
     vitePlugins: options.vitePlugins,
   });
   const cssAssets = (output.assets ?? []).filter((asset) => asset.fileName.endsWith(".css"));
+  const nonCssAssets = (output.assets ?? []).filter((asset) => !asset.fileName.endsWith(".css"));
+  const writtenAssets: string[] = [];
   const written: string[] = [];
   const routeStem =
     options.routeIds.length === 1
@@ -4803,7 +4933,16 @@ async function writeRouteCssAssetsForFiles(options: {
     written.push(cssFile);
   }
 
-  return written;
+  for (const asset of nonCssAssets) {
+    await mkdir(dirname(join(options.clientDir, asset.fileName)), { recursive: true });
+    await writeFile(
+      join(options.clientDir, asset.fileName),
+      typeof asset.source === "string" ? asset.source : Buffer.from(asset.source),
+    );
+    writtenAssets.push(asset.fileName);
+  }
+
+  return { assets: writtenAssets.sort(), css: written };
 }
 
 function applyClientSourceMapReference(options: {
@@ -5079,7 +5218,13 @@ async function copyCloudflarePagesPublicAssets(options: {
   publicAssets: readonly string[];
 }): Promise<void> {
   for (const asset of options.publicAssets) {
-    if (!asset.startsWith("/") || asset.startsWith("//") || asset.includes("..")) {
+    if (
+      !asset.startsWith("/") ||
+      asset.startsWith("//") ||
+      asset.includes("..") ||
+      asset === "/_mreact" ||
+      asset.startsWith("/_mreact/")
+    ) {
       continue;
     }
 
@@ -5234,7 +5379,10 @@ async function collectBuildFiles(
 }
 
 function isProductionBuildIgnoredSourceFile(relativeFile: string): boolean {
-  return /(?:^|[/\\])[^/\\]+\.(?:spec|test)\.[cm]?[jt]sx?$/u.test(relativeFile);
+  return (
+    /(?:^|[/\\])__tests__(?:[/\\]|$)/u.test(relativeFile) ||
+    /(?:^|[/\\])[^/\\]+\.(?:spec|test)\.[cm]?[jt]sx?$/u.test(relativeFile)
+  );
 }
 
 function isAppFileConventionAsset(file: string, appDir: string): boolean {