@reckona/mreact-router 0.0.74 → 0.0.76

package/README.md

@@ -48,7 +48,7 @@ removal after `0.1.0`.
 
 Production client source maps are disabled by default. Set `clientSourceMaps: "linked"` to emit public `.js.map` files beside route scripts and include `sourceMappingURL` comments, or set `clientSourceMaps: "hidden"` to emit upload-only maps under `.mreact/source-maps/client/` without exposing them in the client manifest. The CLI accepts the same modes with `mreact-router build --client-source-maps=hidden`, `linked`, or `none`.
 
-`mreact-router dev` reads the same config, preserves route-agnostic Vite plugins and CSS settings, and uses `server.port` from `vite.config.ts` when `PORT` is not set. This keeps Vite CSS transforms, Playwright `webServer` setups, and local dev commands on the same configured port.
+`mreact-router dev` reads the same config, preserves route-agnostic Vite plugins and CSS settings, and uses `server.port` from `vite.config.ts` when neither `--port` nor `PORT` is set. Use `mreact-router dev --port 15174` for one-off E2E or local port overrides without creating a separate Vite config. This keeps Vite CSS transforms, Playwright `webServer` setups, and local dev commands on the same configured port.
 
 For TypeScript projects that type-check route modules directly, include the
 app-router global declarations so route files can use `<Slot />` without a
@@ -291,6 +291,8 @@ MREACT_ROUTER_LOG=requests mreact-router dev
 
 Each line includes method, path, status, duration, and runtime. Query strings, headers, and request bodies are intentionally omitted.
 
+Built Node output binds to `127.0.0.1` by default. Use `mreact-router start .mreact --host 0.0.0.0 --host-policy=strict` or `HOST=0.0.0.0 MREACT_ROUTER_HOST_POLICY=strict mreact-router start .mreact` inside containers behind explicit port publishing or a reverse proxy. This bind address is separate from Host header trust; configure `--allowed-hosts`, `MREACT_ROUTER_ALLOWED_HOSTS`, or `hostPolicy` for public deployments.
+
 Use `mreact-router --help`, `mreact-router help build`, or command-level help such as `mreact-router build --help` to inspect supported commands, build targets, and generated artifacts.
 
 Server-only pages can opt into the lightweight navigation runtime without becoming hydrated client routes:
@@ -307,7 +309,11 @@ export default function Page() {
 
 The build manifest records this separately from `client: true`, emits a shared navigation runtime asset, prefetches client route scripts when present, and falls back to `x-mreact-navigation: 1` HTML prefetches for server-only targets.
 
-For Cloudflare Workers, `mreact-router build --target=cloudflare` emits `.mreact/cloudflare/worker.mjs`, `.mreact/cloudflare/route-modules.mjs`, and per-route module chunks for non-prerendered and dynamic App Router pages plus `route.ts` server routes and metadata conventions, so deployments do not need a hand-written Worker entrypoint or Vite-only `import.meta.glob()` transforms. User Vite plugins from the project config are forwarded into router bundle builds after the `mreact-router` plugin itself is removed, so MDX-style syntax transforms and custom content loaders can participate in server, client, Cloudflare, and prerender bundles. Client assets, route stylesheet assets imported by pages/layouts/templates, and copied public assets are served only when they appear in the generated manifest allow-list. Dynamic routes resolve modules through a build-time registry keyed by `route.file`, not by constructing module ids from request input. Generated Cloudflare route modules preserve app-router layout/template shells and named slots for both string and `stream = true` pages, including route-local `<Await>` boundaries and local server-component imports. Generated Cloudflare server route modules dispatch method exports such as `GET`, `POST`, and `ALL` with decoded dynamic params plus `context.env`, `context.context`, `context.request`, and `context.route`, so handlers can use Worker bindings directly. The Cloudflare adapter marks streamed HTML with `Cache-Control: no-transform` and `Content-Encoding: identity` so Workers compression does not gzip-buffer the first shell before placeholders can paint. Pass `onResponse` to add cross-cutting response headers to rendered, static, asset, reload, not-found, and error responses. If a generated Cloudflare route module cannot produce the `data-mreact-route-id` marker contract required by client navigation, the adapter returns a reload signal for `x-mreact-navigation: 1` requests so the browser performs a normal document navigation without first buffering the full HTML response.
+For Cloudflare Workers, `mreact-router build --target=cloudflare` emits `.mreact/cloudflare/worker.mjs`, `.mreact/cloudflare/route-modules.mjs`, and per-route module chunks for non-prerendered and dynamic App Router pages plus `route.ts` server routes and metadata conventions, so deployments do not need a hand-written Worker entrypoint or Vite-only `import.meta.glob()` transforms. Deploy that output with a Worker config whose `main` is `.mreact/cloudflare/worker.mjs` and whose `ASSETS` binding points at `.mreact/client`.
+
+For Cloudflare Pages advanced mode, run `mreact-router package cloudflare-pages --from .mreact --out .mreact/pages` after `mreact-router build --target=cloudflare`, then deploy with `wrangler pages deploy .mreact/pages`. The package command creates a Pages output directory with bundled `_worker.js`, `_mreact/client/*` static route assets, root public assets, and `mreact-cloudflare-pages-artifact.json`. Pages provides the `ASSETS` binding to `_worker.js`; mreact's generated worker reads that binding and serves only manifest-listed route assets and public files. The package step bundles the generated Worker entry, route registry, route chunks, and router adapter code, so application deploy scripts do not need to copy `worker.mjs` manually or decide whether Wrangler should bundle package imports.
+
+User Vite plugins from the project config are forwarded into router bundle builds after the `mreact-router` plugin itself is removed, so MDX-style syntax transforms and custom content loaders can participate in server, client, Cloudflare, and prerender bundles. Client assets, route stylesheet assets imported by pages/layouts/templates, and copied public assets are served only when they appear in the generated manifest allow-list. Dynamic routes resolve modules through a build-time registry keyed by `route.file`, not by constructing module ids from request input. Generated Cloudflare route modules preserve app-router layout/template shells and named slots for both string and `stream = true` pages, including route-local `<Await>` boundaries and local server-component imports. Generated Cloudflare server route modules dispatch method exports such as `GET`, `POST`, and `ALL` with decoded dynamic params plus `context.env`, `context.context`, `context.request`, and `context.route`, so handlers can use Worker bindings directly. The Cloudflare adapter marks streamed HTML with `Cache-Control: no-transform` and `Content-Encoding: identity` so Workers compression does not gzip-buffer the first shell before placeholders can paint. Pass `onResponse` to add cross-cutting response headers to rendered, static, asset, reload, not-found, and error responses. If a generated Cloudflare route module cannot produce the `data-mreact-route-id` marker contract required by client navigation, the adapter returns a reload signal for `x-mreact-navigation: 1` requests so the browser performs a normal document navigation without first buffering the full HTML response.
 
 For AWS Lambda, use `createPreloadedAwsLambdaRequestHandler()` with API Gateway
 HTTP API v2 or Lambda Function URL payload format 2.0:

package/dist/build.d.ts

@@ -26,10 +26,24 @@ export interface AwsLambdaArtifactManifest {
     totalBytes: number;
     version: 1;
 }
+export interface CloudflarePagesArtifactManifest {
+    files: Array<{
+        bytes: number;
+        path: string;
+    }>;
+    runtime: "cloudflare-pages";
+    totalBytes: number;
+    version: 1;
+    worker: "_worker.js";
+}
 export interface PackageAwsLambdaArtifactOptions {
     fromDir: string;
     outDir: string;
 }
+export interface PackageCloudflarePagesArtifactOptions {
+    fromDir: string;
+    outDir: string;
+}
 export interface BuiltServerManifest {
     allowedSourceDirs?: readonly string[];
     assetBaseUrl?: string;
@@ -96,4 +110,5 @@ export interface BuiltPrerenderedRoute {
 }
 export declare function buildApp(options: BuildAppOptions): Promise<BuildAppResult>;
 export declare function packageAwsLambdaArtifact(options: PackageAwsLambdaArtifactOptions): Promise<AwsLambdaArtifactManifest>;
+export declare function packageCloudflarePagesArtifact(options: PackageCloudflarePagesArtifactOptions): Promise<CloudflarePagesArtifactManifest>;
 //# sourceMappingURL=build.d.ts.map

package/dist/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"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"}

package/dist/build.js

@@ -1,7 +1,7 @@
 import { createHash } from "node:crypto";
 import { copyFile, cp, mkdir, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { builtinModules } from "node:module";
-import { dirname, join, relative, sep } from "node:path";
+import { dirname, join, relative, resolve, sep } from "node:path";
 import { collectStaticImportReferences, collectTopLevelValueExportNames, formatDiagnostic, hasModuleDirective, transform, } from "@reckona/mreact-compiler";
 import { transformCompilerModuleContext } from "@reckona/mreact-compiler/internal";
 import { buildClientRouteBatchOutput, buildNavigationRuntimeBundle, clientScriptForPath, compilerModuleContextForSource, collectClientRouteReferences, createClientRouteInferenceCache, detectClientNavigationHint, detectNavigationRuntimeHint, formatClientRouteInferenceDiagnostic, inferClientRouteModule, routeIdForPath, } from "./client.js";
@@ -65,7 +65,7 @@ export async function buildApp(options) {
         routes,
         vitePlugins,
     });
-    const generatedImportPolicy = buildGeneratedImportPolicy({
+    const generatedImportPolicy = await buildGeneratedImportPolicy({
         files,
         projectRoot: project.projectRoot,
         routes,
@@ -257,15 +257,18 @@ const frameworkRuntimePackages = new Set([
     "@reckona/mreact-router",
     "@reckona/mreact-server",
 ]);
-function buildGeneratedImportPolicy(options) {
+const maxRuntimePackageManifestReads = 1000;
+async function buildGeneratedImportPolicy(options) {
     const routePackages = new Map();
     const allPackages = new Set();
     const relativeRoutesDir = relative(options.projectRoot, options.routesDir);
+    const packageJsonLookupCache = new Map();
     for (const route of options.routes) {
         const file = relative(options.projectRoot, route.file);
-        const packages = collectRuntimePackagesForFile({
+        const packages = await collectRuntimePackagesForFile({
             file,
             files: options.files,
+            packageJsonLookupCache,
             projectRoot: options.projectRoot,
             seen: new Set(),
         });
@@ -280,9 +283,10 @@ function buildGeneratedImportPolicy(options) {
         .map((file) => (relativeRoutesDir === "" ? file : `${relativeRoutesDir}/${file}`))
         .find((file) => options.files[file] !== undefined);
     if (middlewareFile !== undefined) {
-        const packages = collectRuntimePackagesForFile({
+        const packages = await collectRuntimePackagesForFile({
             file: middlewareFile,
             files: options.files,
+            packageJsonLookupCache,
             projectRoot: options.projectRoot,
             seen: new Set(),
         });
@@ -299,7 +303,7 @@ function buildGeneratedImportPolicy(options) {
         version: 1,
     };
 }
-function collectRuntimePackagesForFile(options) {
+async function collectRuntimePackagesForFile(options) {
     if (options.seen.has(options.file)) {
         return [];
     }
@@ -319,14 +323,22 @@ function collectRuntimePackagesForFile(options) {
         filename: join(options.projectRoot, options.file),
     })) {
         if (isRuntimePackageSpecifier(reference.source)) {
-            packages.add(runtimePackageNameForSpecifier(reference.source));
+            const packageName = runtimePackageNameForSpecifier(reference.source);
+            packages.add(packageName);
+            for (const optionalPackageName of await collectRuntimeOptionalPackages({
+                packageJsonLookupCache: options.packageJsonLookupCache,
+                packageName,
+                projectRoot: options.projectRoot,
+            })) {
+                packages.add(optionalPackageName);
+            }
             continue;
         }
         const localFile = resolveBuildLocalSourceImport(options.files, options.file, reference.source);
         if (localFile === undefined) {
             continue;
         }
-        for (const packageName of collectRuntimePackagesForFile({
+        for (const packageName of await collectRuntimePackagesForFile({
             ...options,
             file: localFile,
         })) {
@@ -336,12 +348,99 @@ function collectRuntimePackagesForFile(options) {
     options.seen.delete(options.file);
     return [...packages].sort();
 }
+async function collectRuntimeOptionalPackages(options) {
+    const optionalPackages = new Set();
+    const seenPackageJson = new Set();
+    const queue = [
+        { packageName: options.packageName, optional: false, startDir: options.projectRoot },
+    ];
+    for (let index = 0; index < queue.length && seenPackageJson.size < maxRuntimePackageManifestReads; index += 1) {
+        const item = queue[index];
+        if (item === undefined || !isValidRuntimePackageName(item.packageName)) {
+            continue;
+        }
+        const manifest = await readRuntimePackageManifest({
+            cache: options.packageJsonLookupCache,
+            packageName: item.packageName,
+            startDir: item.startDir,
+        });
+        if (manifest === undefined || seenPackageJson.has(manifest.packageJsonPath)) {
+            continue;
+        }
+        seenPackageJson.add(manifest.packageJsonPath);
+        if (item.optional && isRuntimePackageName(item.packageName)) {
+            optionalPackages.add(item.packageName);
+        }
+        const packageDir = dirname(manifest.packageJsonPath);
+        for (const dependencyName of Object.keys(manifest.dependencies ?? {})) {
+            if (isValidRuntimePackageName(dependencyName)) {
+                queue.push({ packageName: dependencyName, optional: false, startDir: packageDir });
+            }
+        }
+        for (const optionalDependencyName of Object.keys(manifest.optionalDependencies ?? {})) {
+            if (isValidRuntimePackageName(optionalDependencyName)) {
+                queue.push({ packageName: optionalDependencyName, optional: true, startDir: packageDir });
+            }
+        }
+    }
+    return [...optionalPackages].sort();
+}
+async function readRuntimePackageManifest(options) {
+    const key = `${options.startDir}\0${options.packageName}`;
+    const cached = options.cache.get(key);
+    const manifest = cached ??
+        findRuntimePackageJson(options.packageName, options.startDir).then(async (packageJsonPath) => {
+            if (packageJsonPath === undefined) {
+                return undefined;
+            }
+            try {
+                const json = JSON.parse(await readFile(packageJsonPath, "utf8"));
+                return { ...json, packageJsonPath };
+            }
+            catch {
+                return undefined;
+            }
+        });
+    if (cached === undefined) {
+        options.cache.set(key, manifest);
+    }
+    return (await manifest);
+}
+async function findRuntimePackageJson(packageName, startDir) {
+    if (!isValidRuntimePackageName(packageName)) {
+        return undefined;
+    }
+    let current = startDir;
+    while (true) {
+        const candidate = join(current, "node_modules", ...packageName.split("/"), "package.json");
+        try {
+            if ((await stat(candidate)).isFile()) {
+                return candidate;
+            }
+        }
+        catch {
+            // Keep walking toward the filesystem root.
+        }
+        const parent = dirname(current);
+        if (parent === current) {
+            return undefined;
+        }
+        current = parent;
+    }
+}
 function isRuntimePackageSpecifier(specifier) {
     if (specifier.startsWith(".") || specifier.startsWith("/") || /^[A-Za-z][A-Za-z0-9+.-]*:/.test(specifier)) {
         return false;
     }
     const packageName = runtimePackageNameForSpecifier(specifier);
-    return !nodeBuiltinPackages.has(specifier) && !frameworkRuntimePackages.has(packageName);
+    return !nodeBuiltinPackages.has(specifier) && isRuntimePackageName(packageName);
+}
+function isRuntimePackageName(packageName) {
+    return !frameworkRuntimePackages.has(packageName);
+}
+function isValidRuntimePackageName(packageName) {
+    return (/^(?:@[a-z0-9][a-z0-9._~-]*\/)?[a-z0-9][a-z0-9._~-]*$/u.test(packageName) &&
+        !packageName.includes(".."));
 }
 function runtimePackageNameForSpecifier(specifier) {
     if (!specifier.startsWith("@")) {
@@ -1680,6 +1779,10 @@ function cloudflareWorkspaceRuntimePlugin() {
         ["@reckona/mreact-compat/scheduler", packageFile("react-compat", "@reckona/mreact-compat", "scheduler")],
         ["@reckona/mreact-query", packageFile("query", "@reckona/mreact-query", "index")],
         ["@reckona/mreact-reactive-core", packageFile("reactive-core", "@reckona/mreact-reactive-core", "index")],
+        [
+            "@reckona/mreact-router/adapters/cloudflare",
+            packageFile("router", "@reckona/mreact-router", "adapters/cloudflare"),
+        ],
         ["@reckona/mreact-router/link", routerLinkPath],
         ["@reckona/mreact-router/runtime-state", routerRuntimeStatePath],
         ["@reckona/mreact-router/session", packageFile("router", "@reckona/mreact-router", "session")],
@@ -1997,7 +2100,7 @@ export async function packageAwsLambdaArtifact(options) {
         outDir: options.outDir,
     });
     await writeFile(join(options.outDir, "mreact-handler.mjs"), awsLambdaHandlerSource(".mreact"));
-    const files = await collectAwsLambdaArtifactFiles(options.outDir, "");
+    const files = await collectArtifactFiles(options.outDir, "");
     const manifest = {
         files,
         handler: "mreact-handler.handler",
@@ -2008,6 +2111,48 @@ export async function packageAwsLambdaArtifact(options) {
     await writeFile(join(options.outDir, "mreact-lambda-artifact.json"), JSON.stringify(manifest, null, 2));
     return manifest;
 }
+export async function packageCloudflarePagesArtifact(options) {
+    const clientManifestPath = join(options.fromDir, "client", "manifest.json");
+    const workerPath = join(options.fromDir, "cloudflare", "worker.mjs");
+    await assertRequiredBuildFile(clientManifestPath);
+    await assertRequiredBuildFile(workerPath);
+    await assertRequiredBuildFile(join(options.fromDir, "cloudflare", "route-modules.mjs"));
+    assertPackageOutputDoesNotReplaceBuildOutput(options);
+    const clientManifest = JSON.parse(await readFile(clientManifestPath, "utf8"));
+    await rm(options.outDir, { force: true, recursive: true });
+    await mkdir(options.outDir, { recursive: true });
+    await cp(join(options.fromDir, "client"), join(options.outDir, "_mreact", "client"), {
+        force: true,
+        recursive: true,
+    });
+    await copyCloudflarePagesPublicAssets({
+        clientDir: join(options.fromDir, "client"),
+        outDir: options.outDir,
+        publicAssets: clientManifest.publicAssets ?? [],
+    });
+    const bundledWorker = await bundleRouterModule({
+        code: await readFile(workerPath, "utf8"),
+        filename: workerPath,
+        minify: true,
+        modulePreload: false,
+        outfile: "_worker.js",
+        platform: "browser",
+        plugins: [cloudflareWorkspaceRuntimePlugin()],
+        preserveExports: true,
+        target: "es2022",
+    });
+    await writeFile(join(options.outDir, "_worker.js"), bundledWorker.code);
+    const files = await collectArtifactFiles(options.outDir, "");
+    const manifest = {
+        files,
+        runtime: "cloudflare-pages",
+        totalBytes: files.reduce((total, file) => total + file.bytes, 0),
+        version: 1,
+        worker: "_worker.js",
+    };
+    await writeFile(join(options.outDir, "mreact-cloudflare-pages-artifact.json"), JSON.stringify(manifest, null, 2));
+    return manifest;
+}
 async function assertRequiredBuildFile(path) {
     try {
         const info = await stat(path);
@@ -2020,6 +2165,21 @@ async function assertRequiredBuildFile(path) {
     }
     throw new Error(`Missing required mreact build artifact: ${path}`);
 }
+function assertPackageOutputDoesNotReplaceBuildOutput(options) {
+    if (resolve(options.fromDir) === resolve(options.outDir)) {
+        throw new Error("Package output directory must be different from the mreact build output directory.");
+    }
+}
+async function copyCloudflarePagesPublicAssets(options) {
+    for (const asset of options.publicAssets) {
+        if (!asset.startsWith("/") || asset.startsWith("//") || asset.includes("..")) {
+            continue;
+        }
+        const relativeAsset = asset.slice(1);
+        await mkdir(dirname(join(options.outDir, relativeAsset)), { recursive: true });
+        await copyFile(join(options.clientDir, relativeAsset), join(options.outDir, relativeAsset));
+    }
+}
 async function copyAwsLambdaProjectMetadata(options) {
     for (const file of [
         "package.json",
@@ -2039,14 +2199,14 @@ async function copyAwsLambdaProjectMetadata(options) {
         }
     }
 }
-async function collectAwsLambdaArtifactFiles(rootDir, relativeDir) {
+async function collectArtifactFiles(rootDir, relativeDir) {
     const entries = await readdir(join(rootDir, relativeDir), { withFileTypes: true });
     const files = [];
     for (const entry of entries) {
         const relativePath = relativeDir === "" ? entry.name : `${relativeDir}/${entry.name}`;
         const absolutePath = join(rootDir, relativePath);
         if (entry.isDirectory()) {
-            files.push(...(await collectAwsLambdaArtifactFiles(rootDir, relativePath)));
+            files.push(...(await collectArtifactFiles(rootDir, relativePath)));
             continue;
         }
         if (entry.isFile()) {