@solcreek/adapter-creek 0.2.1 → 0.2.3

package/dist/build.js

@@ -340,8 +340,19 @@ export async function handleBuild(ctx) {
     // exposes these per-output as `output.assets` (the result of file tracing).
     // We embed them in __USER_FILES so the fs shim can serve them in workerd.
     const userFiles = await collectUserFiles(ctx.outputs, ctx.distDir, ctx.projectDir);
-    if (Object.keys(userFiles).length > 0) {
-        console.log(`  [Creek Adapter] ${Object.keys(userFiles).length} user data files embedded`);
+    const userFilePaths = Object.keys(userFiles).sort();
+    if (userFilePaths.length > 0) {
+        // List the paths: these are non-code files your routes read at runtime
+        // (file-traced from your code), embedded so the workerd fs shim can serve
+        // them. Listing them lets you spot anything unexpected (e.g. a stray .env).
+        console.log(`  [Creek Adapter] ${userFilePaths.length} user data files embedded (files read at runtime via fs):`);
+        const SHOWN = 30;
+        for (const p of userFilePaths.slice(0, SHOWN)) {
+            console.log(`    - ${p}`);
+        }
+        if (userFilePaths.length > SHOWN) {
+            console.log(`    ... and ${userFilePaths.length - SHOWN} more`);
+        }
     }
     // Step 4: Generate worker entry
     console.log("  [Creek Adapter] Scanning external modules...");

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solcreek/adapter-creek",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Next.js deployment adapter for Creek (Cloudflare Workers)",
   "type": "module",
   "main": "./dist/index.js",