@reckona/mreact-router 0.0.132 → 0.0.135

package/dist/build.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-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";
@@ -21,7 +21,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";
 const nativeEscapeTransform = {
     batchImportName: "escapeHtmlBatch",
@@ -133,6 +133,7 @@ export async function buildApp(options) {
             ? buildServerModuleArtifacts({
                 bundleCache: new Map(),
                 clientRouteInferenceCache: serverClientRouteInferenceCache,
+                define: viteDefine,
                 files,
                 prebundleServerComponents: buildTargets.includes("node") || shouldBuildAwsLambda,
                 project,
@@ -145,6 +146,7 @@ export async function buildApp(options) {
             : timeBuildPhase(timingSink, "serverModules", () => buildServerModuleArtifacts({
                 bundleCache: new Map(),
                 clientRouteInferenceCache: serverClientRouteInferenceCache,
+                define: viteDefine,
                 files,
                 prebundleServerComponents: buildTargets.includes("node") || shouldBuildAwsLambda,
                 project,
@@ -225,6 +227,7 @@ export async function buildApp(options) {
             appDir: project.routesDir,
             assetBaseUrl: project.assetBaseUrl,
             clientRoutes: clientManifestRoutes,
+            define: viteDefine,
             project,
             routes,
             serverModules,
@@ -235,6 +238,7 @@ export async function buildApp(options) {
             appDir: project.routesDir,
             assetBaseUrl: project.assetBaseUrl,
             clientRoutes: clientManifestRoutes,
+            define: viteDefine,
             project,
             routes,
             serverModules,
@@ -712,7 +716,12 @@ async function collectRuntimeOptionalPackages(options) {
     const queue = [
         { packageName: options.packageName, optional: false, startDir: options.projectRoot },
     ];
-    for (let index = 0; index < queue.length && seenPackageJson.size < maxRuntimePackageManifestReads; index += 1) {
+    let stoppedAtManifestReadCap = false;
+    for (let index = 0; index < queue.length; index += 1) {
+        if (seenPackageJson.size >= maxRuntimePackageManifestReads) {
+            stoppedAtManifestReadCap = true;
+            break;
+        }
         const item = queue[index];
         if (item === undefined || !isValidRuntimePackageName(item.packageName)) {
             continue;
@@ -741,6 +750,14 @@ 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();
 }
 async function readRuntimePackageManifest(options) {
@@ -880,32 +897,30 @@ function moduleIdForBuildFile(file, relativeRoutesDir) {
     return relativeRoutesDir === "" ? file : file.slice(relativeRoutesDir.length + 1);
 }
 async function copyPublicAssets(publicDir, outDir) {
-    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) {
+    if (!(await isPublicAssetDirectory(publicDir))) {
+        return [];
+    }
+    const paths = [];
+    await collectPublicAssetPathsInner(publicDir, "", paths);
+    return paths.sort();
+}
+async function isPublicAssetDirectory(publicDir) {
     try {
-        const info = await stat(publicDir);
-        if (!info.isDirectory()) {
-            return [];
-        }
+        const info = await lstat(publicDir);
+        return info.isDirectory();
     }
     catch (error) {
         if (isNodeError(error) && error.code === "ENOENT") {
-            return [];
+            return false;
         }
         throw error;
     }
-    const paths = [];
-    await collectPublicAssetPathsInner(publicDir, "", paths);
-    return paths.sort();
 }
 async function copyAppFileConventionAssets(appDir, outDir) {
     let entries;
@@ -938,20 +953,46 @@ async function collectPublicAssetPathsInner(publicDir, relativeDir, paths) {
     const entries = await readdir(join(publicDir, relativeDir), { withFileTypes: true });
     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);
             continue;
         }
         if (entry.isFile()) {
-            paths.push(`/${relativePath}`);
+            paths.push(publicPath);
         }
     }
 }
+async function copyPublicAssetsInner(publicDir, relativeDir, outDir) {
+    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) {
+    return pathname === "/_mreact" || pathname.startsWith("/_mreact/");
+}
 function isNodeError(error) {
     return error instanceof Error && "code" in error;
 }
 async function prerenderStaticRoutes(options) {
     const clientScripts = new Map(options.clientRoutes.flatMap((route) => 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 = {};
     const importPolicy = {
         allowedPackages: await readDeclaredProjectPackages(options.project.projectRoot),
@@ -974,6 +1015,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,
@@ -1105,6 +1148,7 @@ async function buildServerModuleArtifacts(options) {
             cacheDir: options.cacheDir,
             entries: requestBatchEntries,
             importPolicy: requestModuleImportPolicy,
+            define: options.define,
             vitePlugins: options.vitePlugins,
         })
         : new Map();
@@ -1125,6 +1169,7 @@ async function buildServerModuleArtifacts(options) {
                         code: stripRouteLoaderOnlyExports(source, absoluteFile),
                         filename: absoluteFile,
                         importPolicy: requestModuleImportPolicy,
+                        define: options.define,
                         vitePlugins: options.vitePlugins,
                     }));
                 artifact.loader = {
@@ -1142,6 +1187,7 @@ async function buildServerModuleArtifacts(options) {
                         filename: absoluteFile,
                         importPolicy: requestModuleImportPolicy,
                         label: "Metadata",
+                        define: options.define,
                         vitePlugins: options.vitePlugins,
                     }));
                 artifact.routeMetadata = {
@@ -1159,6 +1205,7 @@ async function buildServerModuleArtifacts(options) {
                             cacheDir: options.cacheDir,
                             filename: absoluteFile,
                             importPolicy: requestModuleImportPolicy,
+                            define: options.define,
                             routeKind: route?.kind,
                             source,
                             vitePlugins: options.vitePlugins,
@@ -1246,6 +1293,7 @@ async function buildServerModuleArtifacts(options) {
                                 clientRouteInferenceCache: options.clientRouteInferenceCache,
                                 code: output.code,
                                 filename: absoluteFile,
+                                define: options.define,
                                 root: options.projectRoot,
                                 serverOutput,
                                 vitePlugins: options.vitePlugins,
@@ -1275,11 +1323,13 @@ async function buildServerModuleArtifacts(options) {
 async function buildServerComponentBundleArtifactCode(options) {
     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,
@@ -1377,6 +1427,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,
@@ -1385,6 +1436,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),
@@ -1398,6 +1450,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,
@@ -1426,6 +1479,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,
@@ -1447,6 +1501,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(),
@@ -1467,6 +1522,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,
@@ -1489,6 +1545,7 @@ export async function __bundleRouteRequestModuleBatchForTests(options) {
     return Object.fromEntries(await bundleRouteRequestModuleBatchCode({
         appDir: options.appDir,
         cacheDir: options.cacheDir,
+        define: options.define,
         entries: options.entries,
         importPolicy: options.importPolicy,
         vitePlugins: options.vitePlugins,
@@ -1500,6 +1557,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,
@@ -1538,6 +1596,7 @@ function routeRequestBundleCacheKey(options) {
         label: options.label,
         platform: "node",
         target: "es2022",
+        viteDefine: viteDefineCacheKey(options.define),
         vitePlugins: vitePluginsCacheKey(options.vitePlugins),
     });
 }
@@ -2420,7 +2479,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) {
@@ -3066,6 +3130,7 @@ async function writeClientRouteBundles(options) {
     const pageRoutes = options.routes.filter((route) => route.kind === "page");
     const routeCssAssets = await writeRouteCssAssetBatches({
         appDir: options.appDir,
+        assetBaseUrl: options.assetBaseUrl,
         cacheDir: options.cacheDir,
         clientDir: options.clientDir,
         pageRoutes,
@@ -3075,6 +3140,7 @@ async function writeClientRouteBundles(options) {
     });
     const specialCssAssets = await writeSpecialRouteCssAssetBatches({
         appDir: options.appDir,
+        assetBaseUrl: options.assetBaseUrl,
         cacheDir: options.cacheDir,
         clientDir: options.clientDir,
         projectRoot: options.projectRoot,
@@ -3087,7 +3153,7 @@ async function writeClientRouteBundles(options) {
                 manifest: { path: route.path, kind: route.kind, client: false },
             };
         }
-        const css = routeCssAssets.get(route.file) ?? [];
+        const css = routeCssAssets.byRoute.get(route.file) ?? [];
         const source = buildSourceAnalysisForFile(options.sourceAnalysis, options.projectRoot, route.file)?.source;
         if (source === undefined) {
             return {
@@ -3147,9 +3213,9 @@ async function writeClientRouteBundles(options) {
     const clientEntries = entries.filter((entry) => "build" in entry);
     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,
         };
     }
     let output;
@@ -3195,7 +3261,10 @@ async function writeClientRouteBundles(options) {
         await mkdir(dirname(join(options.clientDir, asset.fileName)), { recursive: true });
         await writeFile(join(options.clientDir, asset.fileName), source);
     }
-    const generatedAssets = new Set();
+    const generatedAssets = new Set([
+        ...routeCssAssets.assets,
+        ...specialCssAssets.assets,
+    ]);
     for (const chunk of output.chunks) {
         generatedAssets.add(chunk.fileName);
         if (options.sourceMaps === "linked" && chunk.map !== undefined) {
@@ -3241,7 +3310,7 @@ async function writeClientRouteBundles(options) {
     return {
         assets: Array.from(generatedAssets).sort(),
         routes,
-        styles: specialCssAssets,
+        styles: specialCssAssets.styles,
     };
 }
 async function writeSpecialRouteCssAssetBatches(options) {
@@ -3256,7 +3325,8 @@ async function writeSpecialRouteCssAssetBatches(options) {
         if (cssFiles.length === 0) {
             return undefined;
         }
-        const css = await writeRouteCssAssetsForFiles({
+        const batch = await writeRouteCssAssetsForFiles({
+            assetBaseUrl: options.assetBaseUrl,
             cacheDir: options.cacheDir,
             clientDir: options.clientDir,
             cssFiles,
@@ -3265,16 +3335,22 @@ async function writeSpecialRouteCssAssetBatches(options) {
             routeIds: [specialBoundaryRouteId(options.appDir, file)],
             vitePlugins: options.vitePlugins,
         });
-        return css.length === 0
+        return batch.css.length === 0
             ? undefined
-            : {
-                css,
-                file: relative(options.appDir, file).split(sep).join("/"),
-            };
+            : ({
+                assets: batch.assets,
+                style: {
+                    css: batch.css,
+                    file: relative(options.appDir, file).split(sep).join("/"),
+                },
+            });
     });
-    return entries
-        .filter((entry) => 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, file) {
     const relativeFile = relative(appDir, file).split(sep);
@@ -3308,6 +3384,7 @@ async function writeRouteCssAssetBatches(options) {
     const writtenGroups = await mapWithBuildConcurrency([...groups.entries()], async ([key, group]) => [
         key,
         await writeRouteCssAssetsForFiles({
+            assetBaseUrl: options.assetBaseUrl,
             cacheDir: options.cacheDir,
             clientDir: options.clientDir,
             cssFiles: group.cssFiles,
@@ -3319,24 +3396,30 @@ async function writeRouteCssAssetBatches(options) {
     ]);
     const cssByGroup = new Map(writtenGroups);
     const cssByRoute = new Map();
+    const assets = new Set();
     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) {
     const cssFiles = [...options.cssFiles];
     if (cssFiles.length === 0) {
-        return [];
+        return { assets: [], css: [] };
     }
     const code = [
         ...cssFiles.map((file) => `import ${JSON.stringify(file)};`),
         "export default undefined;",
     ].join("\n");
     const output = await bundleRouterModule({
+        base: options.assetBaseUrl ?? "/_mreact/client/",
         cacheDir: options.cacheDir,
         code,
         filename: options.pageFile,
@@ -3346,6 +3429,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 = [];
     const written = [];
     const routeStem = options.routeIds.length === 1
         ? (options.routeIds[0] ?? "index")
@@ -3358,7 +3443,12 @@ async function writeRouteCssAssetsForFiles(options) {
         await writeFile(join(options.clientDir, cssFile), source);
         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) {
     const sourceMappingUrlPattern = /\n?\/\/# sourceMappingURL=route\.js\.map\s*$/;
@@ -3552,7 +3642,11 @@ function assertPackageOutputDoesNotReplaceBuildOutput(options) {
 }
 async function copyCloudflarePagesPublicAssets(options) {
     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;
         }
         const relativeAsset = asset.slice(1);
@@ -3658,7 +3752,8 @@ async function collectBuildFiles(projectRoot, allowedSourceDirs, appDir) {
     return files;
 }
 function isProductionBuildIgnoredSourceFile(relativeFile) {
-    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, appDir) {
     const relativeFile = relative(appDir, file);