@takazudo/zfb-adapter-cloudflare 3.1.0 → 4.0.0

package/dist/build.d.ts

@@ -49,7 +49,7 @@ export interface EmitWorkerOutput {
  * more copied Wasm assets in `outdir`):
  *
  *   _worker.js       — Worker entry point (`main` in wrangler.toml)
- *   _zfb_inner.mjs   — the input bundle, copied verbatim
+ *   _zfb_inner.mjs   — the input bundle, minus any trailing external `sourceMappingURL` comment
  *   <asset>.wasm     — each bundle-relative Wasm input, copied by basename
  *   .assetsignore    — excludes every generated JavaScript and Wasm basename
  *                      from the asset upload so they are only reachable

package/dist/build.js

@@ -27,7 +27,7 @@ export const WORKER_WRAPPER_SOURCE = _wrapper;
  * more copied Wasm assets in `outdir`):
  *
  *   _worker.js       — Worker entry point (`main` in wrangler.toml)
- *   _zfb_inner.mjs   — the input bundle, copied verbatim
+ *   _zfb_inner.mjs   — the input bundle, minus any trailing external `sourceMappingURL` comment
  *   <asset>.wasm     — each bundle-relative Wasm input, copied by basename
  *   .assetsignore    — excludes every generated JavaScript and Wasm basename
  *                      from the asset upload so they are only reachable

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;AACzE,uEAAuE;AACvE,gEAAgE;AAChE,OAAO,EAAE,UAAU,IAAI,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE9D;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAW,QAAkB,CAAC;AAyChE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;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,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,mBAAmB,EAAE,qBAAqB;KAC3C,CAA8B,CAAC;AAClC,CAAC","sourcesContent":["// `@takazudo/zfb-adapter-cloudflare/build` — Node-only build helpers.\n//\n// This sub-entry is intentionally **not** imported by the Workers-runtime\n// entry (`./`). Code in this module may freely use Node built-ins\n// (`node:fs`, `node:path`, …) because it only ever runs in a Node 22+\n// build environment, never inside a Cloudflare Worker isolate.\n//\n// The `./` entry (`src/index.ts`) exports only Workers-runtime-safe code\n// (AsyncLocalStorage helpers) that can be bundled into the worker.\n\n// @ts-expect-error worker-wrapper.mjs has no declaration file; the export\n// shape is narrowed explicitly below.\nimport { WORKER_WRAPPER_SOURCE as _wrapper } from \"./worker-wrapper.mjs\";\n// @ts-expect-error emit-worker.mjs has no declaration file; the export\n// shape is narrowed via EmitWorkerInput/EmitWorkerOutput below.\nimport { emitWorker as _emitWorker } from \"./emit-worker.mjs\";\n\n/**\n * The wrapper source written to `_worker.js`. Imported from the single\n * canonical `.mjs` file so `src/build.ts` and `bin/cli.mjs` always stay\n * in sync without any duplication.\n */\nexport const WORKER_WRAPPER_SOURCE: string = _wrapper as string;\n\n/**\n * Inputs to [`emitWorker`].\n */\nexport interface EmitWorkerInput {\n  /**\n   * Absolute path to the input ESM bundle produced by `zfb-build`. The\n   * bundle must export a Workers-shaped `default { fetch: (request) =>\n   * Promise<Response> }` (this is the contract `zfb_build::bundler`\n   * pins). The file is copied verbatim next to the emitted wrapper so\n   * relative imports inside it keep resolving.\n   */\n  readonly inputBundlePath: string;\n  /**\n   * Absolute path to the output directory. The emitter creates it if\n   * missing and writes `_worker.js`, `_zfb_inner.mjs` (the copied input\n   * bundle), copied Wasm assets, and `.assetsignore` into it. The ignore\n   * file protects every generated JavaScript and Wasm basename from the\n   * public asset upload.\n   */\n  readonly outdir: string;\n  /**\n   * Wasm modules emitted beside the input bundle. Relative paths resolve from\n   * the input bundle's directory and each module is copied into the Worker\n   * package under its basename, then added to `.assetsignore` so it remains a\n   * Worker module rather than a public static asset.\n   */\n  readonly assets?: readonly string[];\n}\n\n/**\n * Output paths the emitter produced. Returned for callers that want to\n * log them (the Rust orchestrator surfaces them in build output).\n */\nexport interface EmitWorkerOutput {\n  readonly workerPath: string;\n  readonly innerBundlePath: string;\n  readonly assetsIgnorePath: string;\n}\n\n/**\n * Emit a Cloudflare Workers Static Assets `_worker.js` that wraps the zfb\n * input bundle. Cloudflare Pages advanced mode is unverified.\n *\n * Output shape (two generated JavaScript files, `.assetsignore`, and zero or\n * more copied Wasm assets in `outdir`):\n *\n *   _worker.js       — Worker entry point (`main` in wrangler.toml)\n *   _zfb_inner.mjs   — the input bundle, copied verbatim\n *   <asset>.wasm     — each bundle-relative Wasm input, copied by basename\n *   .assetsignore    — excludes every generated JavaScript and Wasm basename\n *                      from the asset upload so they are only reachable\n *                      through the Worker's module graph\n *\n * The wrapper imports the inner bundle via the relative path\n * `./_zfb_inner.mjs`. Workerd's Module loader resolves relative ESM\n * imports inside the `_worker.js` directory, so this layout works\n * without re-bundling.\n *\n * Why two bundle files instead of one: re-bundling here would require a\n * second esbuild pass and would force the adapter to ship its own\n * esbuild binary slot. The two-file layout keeps the adapter\n * dependency-free at runtime — it is just `node:fs` glue.\n */\nexport async function emitWorker(input: EmitWorkerInput): Promise<EmitWorkerOutput> {\n  return _emitWorker({\n    inputBundlePath: input.inputBundlePath,\n    outdir: input.outdir,\n    assets: input.assets,\n    workerWrapperSource: WORKER_WRAPPER_SOURCE,\n  }) as Promise<EmitWorkerOutput>;\n}\n"]}
+{"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;AAyChE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;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,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,mBAAmB,EAAE,qBAAqB;KAC3C,CAA8B,CAAC;AAClC,CAAC","sourcesContent":["// `@takazudo/zfb-adapter-cloudflare/build` — Node-only build helpers.\n//\n// This sub-entry is intentionally **not** imported by the Workers-runtime\n// entry (`./`). Code in this module may freely use Node built-ins\n// (`node:fs`, `node:path`, …) because it only ever runs in a Node 22+\n// build environment, never inside a Cloudflare Worker isolate.\n//\n// The `./` entry (`src/index.ts`) exports only Workers-runtime-safe code\n// (AsyncLocalStorage helpers) that can be bundled into the worker.\n\n// @ts-expect-error worker-wrapper.mjs has no declaration file; the export\n// shape is narrowed explicitly below.\nimport { WORKER_WRAPPER_SOURCE as _wrapper } from \"./worker-wrapper.mjs\";\n// @ts-expect-error emit-worker.mjs has no declaration file; the export\n// shape is narrowed via EmitWorkerInput/EmitWorkerOutput below.\nimport { emitWorker as _emitWorker } from \"./emit-worker.mjs\";\n\n/**\n * The wrapper source written to `_worker.js`. Imported from the single\n * canonical `.mjs` file so `src/build.ts` and `bin/cli.mjs` always stay\n * in sync without any duplication.\n */\nexport const WORKER_WRAPPER_SOURCE: string = _wrapper as string;\n\n/**\n * Inputs to [`emitWorker`].\n */\nexport interface EmitWorkerInput {\n  /**\n   * Absolute path to the input ESM bundle produced by `zfb-build`. The\n   * bundle must export a Workers-shaped `default { fetch: (request) =>\n   * Promise<Response> }` (this is the contract `zfb_build::bundler`\n   * pins). The file is copied verbatim next to the emitted wrapper so\n   * relative imports inside it keep resolving.\n   */\n  readonly inputBundlePath: string;\n  /**\n   * Absolute path to the output directory. The emitter creates it if\n   * missing and writes `_worker.js`, `_zfb_inner.mjs` (the copied input\n   * bundle), copied Wasm assets, and `.assetsignore` into it. The ignore\n   * file protects every generated JavaScript and Wasm basename from the\n   * public asset upload.\n   */\n  readonly outdir: string;\n  /**\n   * Wasm modules emitted beside the input bundle. Relative paths resolve from\n   * the input bundle's directory and each module is copied into the Worker\n   * package under its basename, then added to `.assetsignore` so it remains a\n   * Worker module rather than a public static asset.\n   */\n  readonly assets?: readonly string[];\n}\n\n/**\n * Output paths the emitter produced. Returned for callers that want to\n * log them (the Rust orchestrator surfaces them in build output).\n */\nexport interface EmitWorkerOutput {\n  readonly workerPath: string;\n  readonly innerBundlePath: string;\n  readonly assetsIgnorePath: string;\n}\n\n/**\n * Emit a Cloudflare Workers Static Assets `_worker.js` that wraps the zfb\n * input bundle. Cloudflare Pages advanced mode is unverified.\n *\n * Output shape (two generated JavaScript files, `.assetsignore`, and zero or\n * more copied Wasm assets in `outdir`):\n *\n *   _worker.js       — Worker entry point (`main` in wrangler.toml)\n *   _zfb_inner.mjs   — the input bundle, minus any trailing external `sourceMappingURL` comment\n *   <asset>.wasm     — each bundle-relative Wasm input, copied by basename\n *   .assetsignore    — excludes every generated JavaScript and Wasm basename\n *                      from the asset upload so they are only reachable\n *                      through the Worker's module graph\n *\n * The wrapper imports the inner bundle via the relative path\n * `./_zfb_inner.mjs`. Workerd's Module loader resolves relative ESM\n * imports inside the `_worker.js` directory, so this layout works\n * without re-bundling.\n *\n * Why two bundle files instead of one: re-bundling here would require a\n * second esbuild pass and would force the adapter to ship its own\n * esbuild binary slot. The two-file layout keeps the adapter\n * dependency-free at runtime — it is just `node:fs` glue.\n */\nexport async function emitWorker(input: EmitWorkerInput): Promise<EmitWorkerOutput> {\n  return _emitWorker({\n    inputBundlePath: input.inputBundlePath,\n    outdir: input.outdir,\n    assets: input.assets,\n    workerWrapperSource: WORKER_WRAPPER_SOURCE,\n  }) as Promise<EmitWorkerOutput>;\n}\n"]}

package/dist/emit-worker.mjs

@@ -70,6 +70,21 @@ async function resolveAssets(inputBundlePath, assetPaths) {
   return resolvedAssets;
 }
 
+// The adapter never emits source maps (they are not published and would leak
+// local source paths), so a trailing external `sourceMappingURL` reference in
+// the copied bundle would dangle and make source-map-aware tools (Vite Workers
+// integration) fail with ENOENT. Inline `data:` maps are self-contained and kept.
+const TRAILING_EXTERNAL_SOURCE_MAP =
+  /(?:\r?\n)?[ \t]*\/\/[#@][ \t]*sourceMappingURL=(?!data:)\S*\s*$/;
+
+export function stripDanglingSourceMapReference(source) {
+  const stripped = source.replace(TRAILING_EXTERNAL_SOURCE_MAP, "");
+  if (stripped === source) {
+    return source;
+  }
+  return stripped.endsWith("\n") || stripped.length === 0 ? stripped : stripped + "\n";
+}
+
 async function pathExists(path) {
   try {
     await lstat(path);
@@ -112,7 +127,8 @@ function mergeAssetsIgnore(existing, requiredEntries) {
  * more copied Wasm assets in `outdir`):
  *
  *   _worker.js       — Worker entry point (`main` in wrangler.toml)
- *   _zfb_inner.mjs   — the input bundle, copied verbatim
+ *   _zfb_inner.mjs   — the input bundle, copied with any trailing external
+ *                      `sourceMappingURL` comment removed (no map is emitted)
  *   <asset>.wasm     — each bundle-relative Wasm input, copied by basename
  *   .assetsignore    — excludes every generated JavaScript and Wasm basename
  *                      from the asset upload
@@ -136,7 +152,8 @@ export async function emitWorker({ inputBundlePath, outdir, assets = [], workerW
   }
 
   const innerBundlePath = join(outdirAbs, "_zfb_inner.mjs");
-  await copyFile(inputAbs, innerBundlePath);
+  const inputSource = await readFile(inputAbs, "utf8");
+  await writeFile(innerBundlePath, stripDanglingSourceMapReference(inputSource), "utf8");
 
   const workerPath = join(outdirAbs, "_worker.js");
   await writeFile(workerPath, workerWrapperSource, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takazudo/zfb-adapter-cloudflare",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "private": false,
   "type": "module",
   "description": "Content-site engine on the web's Request/Response model — prerender to static HTML, serve on Cloudflare Workers, or run as a local content server inside your app. One Rust binary. Cloudflare adapter: Workers Static Assets (Pages-compatible).",
@@ -59,14 +59,16 @@
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
-    "typescript": "^5.9.0",
-    "vitest": "^2.1.9"
+    "typescript": "7.0.2",
+    "typescript-5.9": "npm:typescript@5.9.3",
+    "typescript-6.0": "npm:typescript@6.0.3",
+    "vite-plus": "1.0.0"
   },
   "scripts": {
     "build": "tsc && cp src/worker-wrapper.mjs dist/worker-wrapper.mjs && cp src/emit-worker.mjs dist/emit-worker.mjs",
-    "test": "pnpm typecheck:consumer && vitest run && pnpm test:packed-types",
+    "test": "pnpm typecheck:consumer && vp test run && pnpm test:packed-types",
     "test:packed-types": "pnpm build && node scripts/check-packed-types.mjs",
-    "test:watch": "vitest",
+    "test:watch": "vp test",
     "typecheck": "tsc --noEmit && pnpm typecheck:consumer",
     "typecheck:consumer": "tsc --project tsconfig.consumer.json --noEmit"
   }

package/src/emit-worker.mjs

@@ -70,6 +70,21 @@ async function resolveAssets(inputBundlePath, assetPaths) {
   return resolvedAssets;
 }
 
+// The adapter never emits source maps (they are not published and would leak
+// local source paths), so a trailing external `sourceMappingURL` reference in
+// the copied bundle would dangle and make source-map-aware tools (Vite Workers
+// integration) fail with ENOENT. Inline `data:` maps are self-contained and kept.
+const TRAILING_EXTERNAL_SOURCE_MAP =
+  /(?:\r?\n)?[ \t]*\/\/[#@][ \t]*sourceMappingURL=(?!data:)\S*\s*$/;
+
+export function stripDanglingSourceMapReference(source) {
+  const stripped = source.replace(TRAILING_EXTERNAL_SOURCE_MAP, "");
+  if (stripped === source) {
+    return source;
+  }
+  return stripped.endsWith("\n") || stripped.length === 0 ? stripped : stripped + "\n";
+}
+
 async function pathExists(path) {
   try {
     await lstat(path);
@@ -112,7 +127,8 @@ function mergeAssetsIgnore(existing, requiredEntries) {
  * more copied Wasm assets in `outdir`):
  *
  *   _worker.js       — Worker entry point (`main` in wrangler.toml)
- *   _zfb_inner.mjs   — the input bundle, copied verbatim
+ *   _zfb_inner.mjs   — the input bundle, copied with any trailing external
+ *                      `sourceMappingURL` comment removed (no map is emitted)
  *   <asset>.wasm     — each bundle-relative Wasm input, copied by basename
  *   .assetsignore    — excludes every generated JavaScript and Wasm basename
  *                      from the asset upload
@@ -136,7 +152,8 @@ export async function emitWorker({ inputBundlePath, outdir, assets = [], workerW
   }
 
   const innerBundlePath = join(outdirAbs, "_zfb_inner.mjs");
-  await copyFile(inputAbs, innerBundlePath);
+  const inputSource = await readFile(inputAbs, "utf8");
+  await writeFile(innerBundlePath, stripDanglingSourceMapReference(inputSource), "utf8");
 
   const workerPath = join(outdirAbs, "_worker.js");
   await writeFile(workerPath, workerWrapperSource, "utf8");