@reckona/mreact-router 0.0.75 → 0.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-router",
-  "version": "0.0.75",
+  "version": "0.0.77",
   "description": "File-system app router, SSR, actions, and deployment adapters for mreact.",
   "keywords": [
     "jsx",
@@ -105,20 +105,20 @@
   },
   "dependencies": {
     "typescript": "^6.0.3",
-    "@reckona/mreact": "0.0.75",
-    "@reckona/mreact-compat": "0.0.75",
-    "@reckona/mreact-compiler": "0.0.75",
-    "@reckona/mreact-devtools": "0.0.75",
-    "@reckona/mreact-reactive-core": "0.0.75",
-    "@reckona/mreact-query": "0.0.75",
-    "@reckona/mreact-reactive-dom": "0.0.75",
-    "@reckona/mreact-server": "0.0.75",
-    "@reckona/mreact-shared": "0.0.75"
+    "@reckona/mreact": "0.0.77",
+    "@reckona/mreact-devtools": "0.0.77",
+    "@reckona/mreact-compat": "0.0.77",
+    "@reckona/mreact-query": "0.0.77",
+    "@reckona/mreact-compiler": "0.0.77",
+    "@reckona/mreact-reactive-core": "0.0.77",
+    "@reckona/mreact-reactive-dom": "0.0.77",
+    "@reckona/mreact-server": "0.0.77",
+    "@reckona/mreact-shared": "0.0.77"
   },
   "peerDependencies": {
     "vite": ">=8 <9"
   },
   "optionalDependencies": {
-    "@reckona/mreact-router-native": "0.0.75"
+    "@reckona/mreact-router-native": "0.0.77"
   }
 }

package/src/actions.ts

@@ -176,6 +176,11 @@ export async function prepareRouteServerActions(options: {
   pageFile: string;
   request?: Request | undefined;
 }): Promise<PreparedRouteActions> {
+  if (options.formActionReferences !== undefined && options.formActionReferences.length === 0) {
+    replaceInferredServerActionReferences(options.appDir, options.pageFile, new Map());
+    return { code: options.code, hasFormActions: false };
+  }
+
   if (!hasFormActionCandidate(options.code, options.pageFile)) {
     replaceInferredServerActionReferences(options.appDir, options.pageFile, new Map());
     return { code: options.code, hasFormActions: false };

package/src/build.ts

@@ -2,7 +2,7 @@ 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 { builtinModules } from "node:module";
-import { dirname, join, relative, sep } from "node:path";
+import { dirname, join, relative, resolve, sep } from "node:path";
 import {
   collectStaticImportReferences,
   collectTopLevelValueExportNames,
@@ -100,11 +100,24 @@ export interface AwsLambdaArtifactManifest {
   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;
@@ -2473,6 +2486,10 @@ function cloudflareWorkspaceRuntimePlugin(): RouterCompatPlugin {
     ["@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")],
@@ -2913,7 +2930,7 @@ export async function packageAwsLambdaArtifact(
   });
   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",
@@ -2930,6 +2947,63 @@ export async function packageAwsLambdaArtifact(
   return manifest;
 }
 
+export async function packageCloudflarePagesArtifact(
+  options: PackageCloudflarePagesArtifactOptions,
+): Promise<CloudflarePagesArtifactManifest> {
+  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")) as {
+    publicAssets?: readonly string[] | undefined;
+  };
+
+  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",
+  } satisfies CloudflarePagesArtifactManifest;
+
+  await writeFile(
+    join(options.outDir, "mreact-cloudflare-pages-artifact.json"),
+    JSON.stringify(manifest, null, 2),
+  );
+
+  return manifest;
+}
+
 async function assertRequiredBuildFile(path: string): Promise<void> {
   try {
     const info = await stat(path);
@@ -2943,6 +3017,31 @@ async function assertRequiredBuildFile(path: string): Promise<void> {
   throw new Error(`Missing required mreact build artifact: ${path}`);
 }
 
+function assertPackageOutputDoesNotReplaceBuildOutput(options: {
+  fromDir: string;
+  outDir: string;
+}): void {
+  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: {
+  clientDir: string;
+  outDir: string;
+  publicAssets: readonly string[];
+}): Promise<void> {
+  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: {
   fromDir: string;
   outDir: string;
@@ -2965,7 +3064,7 @@ async function copyAwsLambdaProjectMetadata(options: {
   }
 }
 
-async function collectAwsLambdaArtifactFiles(
+async function collectArtifactFiles(
   rootDir: string,
   relativeDir: string,
 ): Promise<Array<{ bytes: number; path: string }>> {
@@ -2977,7 +3076,7 @@ async function collectAwsLambdaArtifactFiles(
     const absolutePath = join(rootDir, relativePath);
 
     if (entry.isDirectory()) {
-      files.push(...(await collectAwsLambdaArtifactFiles(rootDir, relativePath)));
+      files.push(...(await collectArtifactFiles(rootDir, relativePath)));
       continue;
     }
 

package/src/bundle-pipeline.ts

@@ -14,6 +14,7 @@ export interface RouterBundleOptions {
   define?: Record<string, string> | undefined;
   filename: string;
   minify?: boolean | undefined;
+  modulePreload?: boolean | undefined;
   outfile?: string | undefined;
   platform: "browser" | "node";
   preserveExports?: boolean | undefined;
@@ -157,6 +158,7 @@ export async function bundleRouterModule(options: RouterBundleOptions): Promise<
           }
         : false,
       minify: options.minify === true,
+      modulePreload: options.modulePreload ?? true,
       sourcemap: options.sourceMap === true,
       ssr: options.platform === "node",
       target: options.target ?? "es2022",

package/src/cli-options.ts

@@ -18,6 +18,7 @@ export interface ParsedCliArguments {
   hostPolicy?: RequestHostPolicy | undefined;
   log?: CliRequestLogMode | undefined;
   out?: string | undefined;
+  port?: number | undefined;
   routeArg?: string | undefined;
   target?: CliBuildTarget | undefined;
 }
@@ -47,6 +48,17 @@ export function parseCliArguments(argv: readonly string[]): ParsedCliArguments {
       continue;
     }
 
+    if (value === "--port") {
+      parsed.port = parseCliPort(readOptionValue(argv, index, "port"));
+      index += 1;
+      continue;
+    }
+
+    if (value.startsWith("--port=")) {
+      parsed.port = parseCliPort(value.slice("--port=".length));
+      continue;
+    }
+
     if (value === "--host") {
       parsed.host = readOptionValue(argv, index, "host");
       index += 1;
@@ -171,17 +183,22 @@ export function formatCliHelp(command?: string | undefined): string {
 
   if (command === "package") {
     return [
-      "Usage: mreact-router package aws-lambda [options]",
+      "Usage: mreact-router package <target> [options]",
+      "",
+      "Package generated build output into a deployable artifact directory.",
       "",
-      "Package generated build output into a minimal AWS Lambda asset directory.",
+      "Targets:",
+      "  aws-lambda        Minimal AWS Lambda asset directory.",
+      "  cloudflare-pages  Cloudflare Pages advanced mode output with _worker.js.",
       "",
       "Options:",
-      "  --from <dir>    Build output directory. Default: .mreact",
-      "  --out <dir>     Lambda asset output directory. Default: .lambda",
-      "  -h, --help      Show this help message.",
+      "  --from <dir>      Build output directory. Default: .mreact",
+      "  --out <dir>       Output directory. Defaults to .lambda for aws-lambda and .mreact/pages for cloudflare-pages.",
+      "  -h, --help        Show this help message.",
       "",
-      "Example:",
+      "Examples:",
       "  mreact-router package aws-lambda --from .mreact --out .lambda",
+      "  mreact-router package cloudflare-pages --from .mreact --out .mreact/pages",
     ].join("\n");
   }
 
@@ -217,8 +234,12 @@ export function formatCliHelp(command?: string | undefined): string {
       "Start the mreact app router development server.",
       "",
       "Options:",
+      "  --port <port>  TCP port. Overrides PORT and vite.config.ts server.port.",
       "  --log=requests  Print request summaries.",
       "  -h, --help      Show this help message.",
+      "",
+      "Environment:",
+      "  PORT            TCP port when --port is not set.",
     ].join("\n");
   }
 
@@ -232,6 +253,8 @@ export function formatCliHelp(command?: string | undefined): string {
     "  start [outDir]                            Serve built Node output.",
     "  package aws-lambda --from .mreact --out .lambda",
     "                                           Package a minimal AWS Lambda asset directory.",
+    "  package cloudflare-pages --from .mreact --out .mreact/pages",
+    "                                           Package Cloudflare Pages advanced mode output.",
     "  help [command]                            Show help.",
     "",
     "Options:",
@@ -284,6 +307,19 @@ export function resolveCliHost(
   return envValue === undefined || envValue === "" ? "127.0.0.1" : envValue;
 }
 
+export function resolveCliDevPort(
+  flagValue: number | undefined,
+  env: { PORT?: string | undefined },
+  viteConfigPort: number | undefined,
+): number | undefined {
+  if (flagValue !== undefined) {
+    return flagValue;
+  }
+
+  const envValue = env.PORT;
+  return envValue === undefined || envValue === "" ? viteConfigPort : parseCliPort(envValue);
+}
+
 export function resolveCliHostPolicy(
   flagValue: RequestHostPolicy | undefined,
   env: { MREACT_ROUTER_HOST_POLICY?: string | undefined },
@@ -331,6 +367,16 @@ function parseCliRequestLogMode(value: string): CliRequestLogMode {
   throw new Error(`Unsupported log mode ${JSON.stringify(value)}. Expected "requests".`);
 }
 
+function parseCliPort(value: string): number {
+  const port = Number(value);
+
+  if (Number.isInteger(port) && port >= 0 && port <= 65535) {
+    return port;
+  }
+
+  throw new Error(`Unsupported port ${JSON.stringify(value)}. Expected an integer from 0 to 65535.`);
+}
+
 function parseCliHostPolicy(value: string): RequestHostPolicy {
   if (value === "strict" || value === "trusted-proxy") {
     return value;

package/src/cli.ts

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
 import { resolve } from "node:path";
-import { buildApp, packageAwsLambdaArtifact } from "./build.js";
+import { buildApp, packageAwsLambdaArtifact, packageCloudflarePagesArtifact } from "./build.js";
 import {
   buildTargetsFromCliTarget,
   createCliRequestLogger,
   formatCliHelp,
   parseCliArguments,
   resolveCliAllowedHosts,
+  resolveCliDevPort,
   resolveCliHost,
   resolveCliHostPolicy,
   resolveCliRequestLogMode,
@@ -54,18 +55,27 @@ if (parsed !== undefined) {
         });
         console.log(`Built ${result.routes.length} routes.`);
       } else if (command === "package") {
-        if (routeArg !== "aws-lambda") {
+        if (routeArg === "aws-lambda") {
+          const manifest = await packageAwsLambdaArtifact({
+            fromDir: resolve(parsed.from ?? ".mreact"),
+            outDir: resolve(parsed.out ?? ".lambda"),
+          });
+          console.log(
+            `Packaged AWS Lambda artifact with ${manifest.files.length} files (${manifest.totalBytes} bytes).`,
+          );
+        } else if (routeArg === "cloudflare-pages") {
+          const manifest = await packageCloudflarePagesArtifact({
+            fromDir: resolve(parsed.from ?? ".mreact"),
+            outDir: resolve(parsed.out ?? ".mreact/pages"),
+          });
+          console.log(
+            `Packaged Cloudflare Pages artifact with ${manifest.files.length} files (${manifest.totalBytes} bytes).`,
+          );
+        } else {
           throw new Error(
-            `Unsupported package target ${JSON.stringify(routeArg)}. Expected "aws-lambda".`,
+            `Unsupported package target ${JSON.stringify(routeArg)}. Expected "aws-lambda" or "cloudflare-pages".`,
           );
         }
-        const manifest = await packageAwsLambdaArtifact({
-          fromDir: resolve(parsed.from ?? ".mreact"),
-          outDir: resolve(parsed.out ?? ".lambda"),
-        });
-        console.log(
-          `Packaged AWS Lambda artifact with ${manifest.files.length} files (${manifest.totalBytes} bytes).`,
-        );
       } else if (command === "dev") {
         const loaded =
           routeArg === undefined
@@ -74,7 +84,7 @@ if (parsed !== undefined) {
         const server = await startDevServer({
           ...loaded.project,
           logger,
-          port: process.env.PORT === undefined ? loaded.serverPort : Number(process.env.PORT),
+          port: resolveCliDevPort(parsed.port, process.env, loaded.serverPort),
           viteConfig: loaded.viteConfig,
         });
         console.log(`mreact app router ready at ${server.url}`);

package/src/index.ts

@@ -1,4 +1,4 @@
-export { buildApp, packageAwsLambdaArtifact } from "./build.js";
+export { buildApp, packageAwsLambdaArtifact, packageCloudflarePagesArtifact } from "./build.js";
 export { assetHref, assetPreloadLinks } from "./assets.js";
 export { cacheControl, createMemoryRouteCache, revalidatePath } from "./cache.js";
 export { deleteCookie, parseCookieHeader, serializeCookie, setCookie } from "./cookies.js";
@@ -74,7 +74,9 @@ export type {
   BuildAppOptions,
   BuildAppResult,
   BuiltImportPolicyArtifact,
+  CloudflarePagesArtifactManifest,
   PackageAwsLambdaArtifactOptions,
+  PackageCloudflarePagesArtifactOptions,
 } from "./build.js";
 export type {
   InferLoaderData,