@solcreek/adapter-creek 0.2.0 → 0.2.2

package/dist/bundler.d.ts

@@ -7,6 +7,21 @@
  * This works with both webpack and Turbopack output — wrangler handles
  * the custom chunk format that plain esbuild cannot follow.
  */
+/**
+ * Resolve wrangler's CLI entry script through Node module resolution.
+ *
+ * Never guess `<adapterDir>/node_modules/.bin/wrangler`: npm hoists
+ * wrangler to the top of the install tree (under the Creek CLI's lazy
+ * install that's `.creek/node_modules/.bin`), so the nested path only
+ * exists when hoisting is defeated by a version conflict. Resolving
+ * `wrangler/package.json` and reading its `bin` field finds the real
+ * entry under npm hoisting, pnpm's virtual store, and link installs
+ * alike — and running it with process.execPath sidesteps `.bin` shell
+ * shims entirely (which also don't exist as POSIX scripts on Windows).
+ *
+ * Exported for tests.
+ */
+export declare function resolveWranglerEntry(requireFn: Pick<NodeRequire, "resolve">): Promise<string>;
 export interface BundleOptions {
     workerSource: string;
     outputDir: string;

package/dist/bundler.js

@@ -9,8 +9,32 @@
  */
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
-import { execSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import { builtinModules, createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
+/**
+ * Resolve wrangler's CLI entry script through Node module resolution.
+ *
+ * Never guess `<adapterDir>/node_modules/.bin/wrangler`: npm hoists
+ * wrangler to the top of the install tree (under the Creek CLI's lazy
+ * install that's `.creek/node_modules/.bin`), so the nested path only
+ * exists when hoisting is defeated by a version conflict. Resolving
+ * `wrangler/package.json` and reading its `bin` field finds the real
+ * entry under npm hoisting, pnpm's virtual store, and link installs
+ * alike — and running it with process.execPath sidesteps `.bin` shell
+ * shims entirely (which also don't exist as POSIX scripts on Windows).
+ *
+ * Exported for tests.
+ */
+export async function resolveWranglerEntry(requireFn) {
+    const pkgPath = requireFn.resolve("wrangler/package.json");
+    const pkg = JSON.parse(await fs.readFile(pkgPath, "utf-8"));
+    const binRel = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.wrangler;
+    if (!binRel) {
+        throw new Error(`wrangler package.json at ${pkgPath} has no usable bin field`);
+    }
+    return path.join(path.dirname(pkgPath), binRel);
+}
 /**
  * Patch Turbopack runtime to inline chunk loading.
  *
@@ -645,8 +669,9 @@ export async function bundleForWorkers(opts) {
         const destPath = path.join(opts.outputDir, destName);
         await fs.copyFile(absPath, destPath);
     }
-    // Resolve adapter paths
-    const adapterDir = path.dirname(path.dirname(new URL(import.meta.url).pathname));
+    // Resolve adapter paths. fileURLToPath, not URL#pathname — the latter
+    // yields "/C:/..." on Windows, which every alias below would inherit.
+    const adapterDir = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
     // Generate wrangler config for the bundle step
     const wranglerConfig = {
         name: "creek-adapter-build",
@@ -778,10 +803,9 @@ export async function bundleForWorkers(opts) {
         }
     }
     const bundleDir = path.join(opts.outputDir, "__bundle");
-    // Resolve wrangler binary from the adapter's own node_modules
-    const wranglerBin = path.join(adapterDir, "node_modules", ".bin", "wrangler");
+    const wranglerEntry = await resolveWranglerEntry(adapterRequire);
     try {
-        execSync(`"${wranglerBin}" deploy --dry-run --outdir "${bundleDir}" --config "${configPath}"`, {
+        execFileSync(process.execPath, [wranglerEntry, "deploy", "--dry-run", "--outdir", bundleDir, "--config", configPath], {
             cwd: path.dirname(opts.distDir),
             stdio: "pipe",
             env: process.env,

package/dist/index.js

@@ -1,17 +1,26 @@
 import * as path from "node:path";
-import { fileURLToPath } from "node:url";
+import { createRequire } from "node:module";
 import { copyFileSync, existsSync } from "node:fs";
 import { applyBaseModifyConfig } from "@solcreek/adapter-next-core";
 import { handleBuild } from "./build.js";
-// Dev-fallback path to the cache handler shipped by @solcreek/adapter-next-core.
-// applyBaseModifyConfig prefers the node_modules-installed copy when one
-// exists (the production path); this resolves the package's own bundled
-// copy as a last resort for the rare case where the adapter is used
-// without `npm install`ing it.
-const coreEntryUrl = new URL("../node_modules/@solcreek/adapter-next-core/dist/cache-handler.js", import.meta.url);
-const fallbackCacheHandlerPath = existsSync(fileURLToPath(coreEntryUrl))
-    ? fileURLToPath(coreEntryUrl)
-    : path.join(process.cwd(), "node_modules", "@solcreek", "adapter-next-core", "dist", "cache-handler.js");
+// Path to the cache handler shipped by @solcreek/adapter-next-core, resolved
+// from THIS module's location — not from the consumer project. The adapter is
+// not always installed in the project's own node_modules: the Creek CLI
+// lazy-installs it into <project>/.creek/node_modules, which is outside the
+// project's require walk. Resolving from import.meta.url walks up from
+// wherever the adapter actually lives, so it finds the dependency under npm
+// hoisting, pnpm's content-addressed store, and the CLI's .creek install
+// alike.
+function resolveCacheHandlerPath() {
+    try {
+        return createRequire(import.meta.url).resolve("@solcreek/adapter-next-core/cache-handler");
+    }
+    catch {
+        // Last resort: assume a flat install in the consumer project.
+        return path.join(process.cwd(), "node_modules", "@solcreek", "adapter-next-core", "dist", "cache-handler.js");
+    }
+}
+const fallbackCacheHandlerPath = resolveCacheHandlerPath();
 function mirrorCacheHandlerIntoProject(cacheHandlerPath) {
     if (!existsSync(cacheHandlerPath))
         return cacheHandlerPath;
@@ -41,9 +50,14 @@ const adapter = {
         // for other phases, so guarding here matches its behaviour.
         if (ctx.phase !== "phase-production-build")
             return baseConfig;
-        const cacheHandlerPath = typeof baseConfig.cacheHandler === "string"
-            ? mirrorCacheHandlerIntoProject(baseConfig.cacheHandler)
-            : mirrorCacheHandlerIntoProject(fallbackCacheHandlerPath);
+        // Keep the mirrored handler anchored to this adapter's dependency tree,
+        // not the consumer project's shared @solcreek/adapter-next-core copy.
+        // For Workers the project-local .solcreek-cache-handler.mjs path is a
+        // bundler sentinel: dynamic imports of that path are redirected to the
+        // inline CreekCacheHandler in worker-entry. If we mirror an arbitrary
+        // project copy here, Node App Page fetch-cache paths can bypass the
+        // Workers-specific runtime cache implementation.
+        const cacheHandlerPath = mirrorCacheHandlerIntoProject(fallbackCacheHandlerPath);
         return {
             ...baseConfig,
             // Next may dynamically import this cache handler on error/404 render

package/dist/worker-entry.js

@@ -2693,6 +2693,10 @@ function __creekValueWithCacheTags(value, tags) {
 function __creekScopedCacheKey(key, ctx, value) {
   const isFetchEntry = ctx?.kind === "FETCH" || value?.kind === "FETCH";
   if (!isFetchEntry) return key;
+  const ctxRuntime = ctx?.runtime;
+  if (ctxRuntime === "edge" || ctxRuntime === "nodejs") {
+    return "__fetch:" + ctxRuntime + ":" + key;
+  }
   try {
     const runtime = __INTERNAL_FETCH_CONTEXT.getStore()?.handlerRuntime;
     if (runtime === "edge" || runtime === "nodejs") {
@@ -3020,12 +3024,18 @@ function __creekOriginalFetchArgs(input, init) {
   }
   if (init && typeof init === "object") {
     const fetchInit = { ...init };
+    const hasOriginalBody = "_ogBody" in fetchInit;
     if ("_ogBody" in fetchInit) {
       fetchInit.body = fetchInit._ogBody;
       delete fetchInit._ogBody;
     }
     delete fetchInit.next;
     delete fetchInit.cache;
+    if (hasOriginalBody && fetchInit.body !== undefined && fetchInit.body !== null) {
+      try {
+        return [new Request(input, fetchInit), undefined];
+      } catch {}
+    }
     return [input, fetchInit];
   }
   return [input, init];
@@ -3128,9 +3138,11 @@ function __creekWrapAppPageFetchCache(patchedFetch) {
     if (!cacheKey) return patchedFetch(input, init);
 
     const tags = Array.isArray(nextConfig?.tags) ? nextConfig.tags : [];
+    const cacheRuntime = store?.handlerRuntime === "edge" ? "edge" : "nodejs";
     const cache = new CreekCacheHandler();
     const cacheCtx = {
       kind: "FETCH",
+      runtime: cacheRuntime,
       revalidate,
       fetchUrl,
       tags,
@@ -8231,7 +8243,7 @@ async function __handleRequestInner(request, env, ctx) {
       try {
         const store = __INTERNAL_FETCH_CONTEXT.getStore();
         if (store) {
-          store.handlerRuntime = handler.runtime;
+          store.handlerRuntime = handler.runtime === "edge" ? "edge" : "nodejs";
           store.handlerType = handler.type;
         }
       } catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solcreek/adapter-creek",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Next.js deployment adapter for Creek (Cloudflare Workers)",
   "type": "module",
   "main": "./dist/index.js",
@@ -46,7 +46,7 @@
   "dependencies": {
     "@next/routing": "16.2.3",
     "@solcreek/adapter-core": "^0.2.0",
-    "@solcreek/adapter-next-core": "^0.1.0",
+    "@solcreek/adapter-next-core": "^0.1.1",
     "sql.js": "^1.14.1",
     "wrangler": "^4.82.2"
   },