@takazudo/zfb-adapter-cloudflare 0.1.0-next.7 → 0.1.0-next.70

package/bin/cli.mjs

@@ -15,9 +15,8 @@
 // no TypeScript loader required) so there is a single source of truth.
 // invariant: no runtime npm deps — see SECURITY-DEPS.md
 
-import { copyFile, mkdir, writeFile } from "node:fs/promises";
 import { realpathSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // ---------------------------------------------------------------------------
@@ -27,18 +26,14 @@ import { fileURLToPath } from "node:url";
 import { WORKER_WRAPPER_SOURCE } from "../src/worker-wrapper.mjs";
 export { WORKER_WRAPPER_SOURCE };
 
-export async function emitWorker({ inputBundlePath, outdir }) {
-  const outdirAbs = resolve(outdir);
-  const inputAbs = resolve(inputBundlePath);
-
-  await mkdir(outdirAbs, { recursive: true });
-  const innerBundlePath = join(outdirAbs, "_zfb_inner.mjs");
-  await copyFile(inputAbs, innerBundlePath);
+// ---------------------------------------------------------------------------
+// emitWorker — shared implementation, no runtime npm deps.
+// ---------------------------------------------------------------------------
 
-  const workerPath = join(outdirAbs, "_worker.js");
-  await writeFile(workerPath, WORKER_WRAPPER_SOURCE, "utf8");
+import { emitWorker as _emitWorker } from "../src/emit-worker.mjs";
 
-  return { workerPath, innerBundlePath };
+export async function emitWorker({ inputBundlePath, outdir }) {
+  return _emitWorker({ inputBundlePath, outdir, workerWrapperSource: WORKER_WRAPPER_SOURCE });
 }
 
 // ---------------------------------------------------------------------------

package/dist/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAcA;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAA2B,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAelF"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAA2B,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAMlF"}

package/dist/build.js

@@ -10,6 +10,9 @@
 // @ts-expect-error worker-wrapper.mjs has no declaration file; the export
 // shape is narrowed explicitly below.
 import { WORKER_WRAPPER_SOURCE as _wrapper } from "./worker-wrapper.mjs";
+// @ts-expect-error emit-worker.mjs has no declaration file; the export
+// shape is narrowed via EmitWorkerInput/EmitWorkerOutput below.
+import { emitWorker as _emitWorker } from "./emit-worker.mjs";
 /**
  * The wrapper source written to `_worker.js`. Imported from the single
  * canonical `.mjs` file so `src/build.ts` and `bin/cli.mjs` always stay
@@ -35,15 +38,10 @@ export const WORKER_WRAPPER_SOURCE = _wrapper;
  * runtime — it is just `node:fs` glue.
  */
 export async function emitWorker(input) {
-    const { mkdir, copyFile, writeFile } = await import("node:fs/promises");
-    const { resolve, join } = await import("node:path");
-    const outdir = resolve(input.outdir);
-    const inputBundle = resolve(input.inputBundlePath);
-    await mkdir(outdir, { recursive: true });
-    const innerBundlePath = join(outdir, "_zfb_inner.mjs");
-    await copyFile(inputBundle, innerBundlePath);
-    const workerPath = join(outdir, "_worker.js");
-    await writeFile(workerPath, WORKER_WRAPPER_SOURCE, "utf8");
-    return { workerPath, innerBundlePath };
+    return _emitWorker({
+        inputBundlePath: input.inputBundlePath,
+        outdir: input.outdir,
+        workerWrapperSource: WORKER_WRAPPER_SOURCE,
+    });
 }
 //# sourceMappingURL=build.js.map

package/dist/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,0EAA0E;AAC1E,kEAAkE;AAClE,sEAAsE;AACtE,+DAA+D;AAC/D,EAAE;AACF,yEAAyE;AACzE,mEAAmE;AAEnE,0EAA0E;AAC1E,sCAAsC;AACtC,OAAO,EAAE,qBAAqB,IAAI,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEzE;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAW,QAAkB,CAAC;AA+BhE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,KAAsB;IACrD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACxE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAEnD,MAAM,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACvD,MAAM,QAAQ,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAE7C,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAC9C,MAAM,SAAS,CAAC,UAAU,EAAE,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAE3D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,CAAC;AACzC,CAAC"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../src/build.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,0EAA0E;AAC1E,kEAAkE;AAClE,sEAAsE;AACtE,+DAA+D;AAC/D,EAAE;AACF,yEAAyE;AACzE,mEAAmE;AAEnE,0EAA0E;AAC1E,sCAAsC;AACtC,OAAO,EAAE,qBAAqB,IAAI,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACzE,uEAAuE;AACvE,gEAAgE;AAChE,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAW,QAAkB,CAAC;AA+BhE;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,KAAsB;IACrD,OAAO,WAAW,CAAC;QACjB,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,mBAAmB,EAAE,qBAAqB;KAC3C,CAA8B,CAAC;AAClC,CAAC"}

package/dist/emit-worker.mjs

@@ -0,0 +1,38 @@
+// Shared, dependency-free implementation of `emitWorker`.
+//
+// Kept as a plain `.mjs` module (no TypeScript) so it can be imported from
+// both the typed TypeScript surface (`src/build.ts`) and the dependency-free
+// CLI binary (`bin/cli.mjs`) without needing a TypeScript loader.
+//
+// Do NOT duplicate this logic elsewhere. The two consumers always stay in
+// sync by importing from here.
+//
+// invariant: no runtime npm deps — see SECURITY-DEPS.md
+
+import { copyFile, mkdir, writeFile } from "node:fs/promises";
+import { join, resolve } from "node:path";
+
+/**
+ * Emit a Cloudflare Pages `_worker.js` that wraps the zfb input bundle.
+ *
+ * Output shape (two files in `outdir`):
+ *
+ *   _worker.js       — entry imported by Cloudflare Pages advanced mode
+ *   _zfb_inner.mjs   — the input bundle, copied verbatim
+ *
+ * @param {{ inputBundlePath: string; outdir: string; workerWrapperSource: string }} input
+ * @returns {Promise<{ workerPath: string; innerBundlePath: string }>}
+ */
+export async function emitWorker({ inputBundlePath, outdir, workerWrapperSource }) {
+  const outdirAbs = resolve(outdir);
+  const inputAbs = resolve(inputBundlePath);
+
+  await mkdir(outdirAbs, { recursive: true });
+  const innerBundlePath = join(outdirAbs, "_zfb_inner.mjs");
+  await copyFile(inputAbs, innerBundlePath);
+
+  const workerPath = join(outdirAbs, "_worker.js");
+  await writeFile(workerPath, workerWrapperSource, "utf8");
+
+  return { workerPath, innerBundlePath };
+}

package/dist/worker-wrapper.mjs

@@ -31,8 +31,7 @@ export const WORKER_WRAPPER_SOURCE = `// AUTO-GENERATED by @takazudo/zfb-adapter
 //     islands-…">). If we let the inner Hono router handle them first,
 //     it would dynamic-SSR the page WITHOUT the prod head injection
 //     (which is a build-time post-process, not a runtime concern), and
-//     islands would never hydrate. See zfb#XXX (filed by Wave 10 of
-//     the zudo-doc#1355 zfb-pipeline-gaps epic).
+//     islands would never hydrate.
 //   - On 404 from ASSETS, fall through to the inner zfb worker. This is
 //     where genuinely dynamic routes (\`prerender = false\`, e.g.
 //     \`pages/api/*.tsx\`) are served.
@@ -68,6 +67,16 @@ function isAssetProbeMethod(method) {
 export default {
   async fetch(request, env, ctx) {
     if (isAssetProbeMethod(request.method) && canDelegateToAssets(env)) {
+      // Trade-off: every GET/HEAD request that matches a prerendered route pays
+      // the cost of one env.ASSETS.fetch() round-trip before the inner worker
+      // sees it.  The upside is that CF Pages' asset server handles trailing-
+      // slash canonicalisation (e.g. /docs/foo → 308 → /docs/foo/) and serves
+      // the build-time head-injected HTML with the hashed <link>/<script> tags.
+      // If we skipped this probe, prerendered routes would be dynamic-SSR'd by
+      // the inner Hono router without the prod head injection, and islands would
+      // never hydrate.  For purely dynamic apps (prerender=false everywhere) the
+      // extra round-trip is pure overhead; splitting the wrapper into two
+      // variants is the accepted future escape hatch for that case.
       const assetResponse = await env.ASSETS.fetch(request);
       if (assetResponse.status !== 404) {
         return assetResponse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takazudo/zfb-adapter-cloudflare",
-  "version": "0.1.0-next.7",
+  "version": "0.1.0-next.70",
   "private": false,
   "type": "module",
   "description": "Rust-built static-site engine for Astro and Next.js users — millisecond rebuilds, single binary. Cloudflare Pages adapter.",
@@ -44,6 +44,7 @@
     "dist",
     "bin",
     "src/worker-wrapper.mjs",
+    "src/emit-worker.mjs",
     "README.md",
     "CHANGELOG.md",
     "LICENSE"
@@ -61,7 +62,7 @@
     "vitest": "^2.1.9"
   },
   "scripts": {
-    "build": "tsc && cp src/worker-wrapper.mjs dist/worker-wrapper.mjs",
+    "build": "tsc && cp src/worker-wrapper.mjs dist/worker-wrapper.mjs && cp src/emit-worker.mjs dist/emit-worker.mjs",
     "test": "vitest run",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit"

package/src/emit-worker.mjs

@@ -0,0 +1,38 @@
+// Shared, dependency-free implementation of `emitWorker`.
+//
+// Kept as a plain `.mjs` module (no TypeScript) so it can be imported from
+// both the typed TypeScript surface (`src/build.ts`) and the dependency-free
+// CLI binary (`bin/cli.mjs`) without needing a TypeScript loader.
+//
+// Do NOT duplicate this logic elsewhere. The two consumers always stay in
+// sync by importing from here.
+//
+// invariant: no runtime npm deps — see SECURITY-DEPS.md
+
+import { copyFile, mkdir, writeFile } from "node:fs/promises";
+import { join, resolve } from "node:path";
+
+/**
+ * Emit a Cloudflare Pages `_worker.js` that wraps the zfb input bundle.
+ *
+ * Output shape (two files in `outdir`):
+ *
+ *   _worker.js       — entry imported by Cloudflare Pages advanced mode
+ *   _zfb_inner.mjs   — the input bundle, copied verbatim
+ *
+ * @param {{ inputBundlePath: string; outdir: string; workerWrapperSource: string }} input
+ * @returns {Promise<{ workerPath: string; innerBundlePath: string }>}
+ */
+export async function emitWorker({ inputBundlePath, outdir, workerWrapperSource }) {
+  const outdirAbs = resolve(outdir);
+  const inputAbs = resolve(inputBundlePath);
+
+  await mkdir(outdirAbs, { recursive: true });
+  const innerBundlePath = join(outdirAbs, "_zfb_inner.mjs");
+  await copyFile(inputAbs, innerBundlePath);
+
+  const workerPath = join(outdirAbs, "_worker.js");
+  await writeFile(workerPath, workerWrapperSource, "utf8");
+
+  return { workerPath, innerBundlePath };
+}

package/src/worker-wrapper.mjs

@@ -31,8 +31,7 @@ export const WORKER_WRAPPER_SOURCE = `// AUTO-GENERATED by @takazudo/zfb-adapter
 //     islands-…">). If we let the inner Hono router handle them first,
 //     it would dynamic-SSR the page WITHOUT the prod head injection
 //     (which is a build-time post-process, not a runtime concern), and
-//     islands would never hydrate. See zfb#XXX (filed by Wave 10 of
-//     the zudo-doc#1355 zfb-pipeline-gaps epic).
+//     islands would never hydrate.
 //   - On 404 from ASSETS, fall through to the inner zfb worker. This is
 //     where genuinely dynamic routes (\`prerender = false\`, e.g.
 //     \`pages/api/*.tsx\`) are served.
@@ -68,6 +67,16 @@ function isAssetProbeMethod(method) {
 export default {
   async fetch(request, env, ctx) {
     if (isAssetProbeMethod(request.method) && canDelegateToAssets(env)) {
+      // Trade-off: every GET/HEAD request that matches a prerendered route pays
+      // the cost of one env.ASSETS.fetch() round-trip before the inner worker
+      // sees it.  The upside is that CF Pages' asset server handles trailing-
+      // slash canonicalisation (e.g. /docs/foo → 308 → /docs/foo/) and serves
+      // the build-time head-injected HTML with the hashed <link>/<script> tags.
+      // If we skipped this probe, prerendered routes would be dynamic-SSR'd by
+      // the inner Hono router without the prod head injection, and islands would
+      // never hydrate.  For purely dynamic apps (prerender=false everywhere) the
+      // extra round-trip is pure overhead; splitting the wrapper into two
+      // variants is the accepted future escape hatch for that case.
       const assetResponse = await env.ASSETS.fetch(request);
       if (assetResponse.status !== 404) {
         return assetResponse;