@solcreek/cli 0.4.24 → 0.4.26

package/dist/utils/nextjs.js

@@ -39,15 +39,40 @@ function semverGte(version, target) {
         return aMin > bMin;
     return aPat >= bPat;
 }
+/**
+ * Read the installed adapter version from the package.json above a resolved
+ * adapter entry path (.../adapter-creek/dist/index.js).
+ */
+function adapterVersionAt(entryPath) {
+    let dir = dirname(entryPath);
+    for (let i = 0; i < 3; i++) {
+        const pkgPath = join(dir, "package.json");
+        if (existsSync(pkgPath)) {
+            try {
+                const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+                if (pkg.name === ADAPTER_PKG)
+                    return pkg.version ?? null;
+            }
+            catch {
+                return null;
+            }
+        }
+        dir = dirname(dir);
+    }
+    return null;
+}
 /**
  * Resolve @solcreek/adapter-creek from any reachable location.
  *
  * Tries, in order: the CLI's own install (monorepo workspace / global
  * install alongside the adapter), the project's own node_modules, then the
- * lazy-installed copy under .creek/node_modules. Returns the adapter entry
- * path (for NEXT_ADAPTER_PATH), or null if not installed anywhere.
+ * lazy-installed copy under .creek/node_modules. Copies older than
+ * `minVersion` are skipped — adapter < 0.2.1 cannot resolve its cache
+ * handler from the .creek lazy install, so a stale cached copy must not
+ * shadow a fixed one. Returns the adapter entry path (for
+ * NEXT_ADAPTER_PATH), or null if no acceptable copy is installed.
  */
-function resolveAdapterPath(cwd) {
+function resolveAdapterPath(cwd, minVersion) {
     const bases = [import.meta.url];
     if (cwd) {
         // createRequire walks node_modules up from the base file's directory;
@@ -57,7 +82,13 @@ function resolveAdapterPath(cwd) {
     }
     for (const base of bases) {
         try {
-            return createRequire(base).resolve("@solcreek/adapter-creek");
+            const entry = createRequire(base).resolve(ADAPTER_PKG);
+            if (minVersion) {
+                const version = adapterVersionAt(entry);
+                if (!version || !semverGte(version, minVersion))
+                    continue;
+            }
+            return entry;
         }
         catch {
             // try next base
@@ -148,7 +179,13 @@ const CREEK_DIR = ".creek";
 const OPENNEXT_PKG = "@opennextjs/cloudflare";
 const OPENNEXT_VERSION = "^1.18.0";
 const ADAPTER_PKG = "@solcreek/adapter-creek";
-const ADAPTER_VERSION = "^0.2.0";
+const ADAPTER_VERSION = "^0.2.2";
+// Adapter < 0.2.2 resolves its dependencies against paths that don't exist
+// under the .creek lazy install (0.2.0: the cache handler; 0.2.1: the
+// wrangler bin) — npm hoists them to the top of the tree, so the adapter's
+// guessed nested paths fail every Next.js build. Installs below this are
+// re-installed, not reused.
+const ADAPTER_MIN_VERSION = "0.2.2";
 /**
  * Merge a dependency into .creek/package.json without clobbering deps that
  * a previous install (adapter or opennext) may have already written.
@@ -178,7 +215,11 @@ function installCreekDep(creekDir, pkg, version) {
     mkdirSync(creekDir, { recursive: true });
     upsertCreekDep(creekDir, pkg, version);
     try {
-        execSync("npm install --no-audit --no-fund --ignore-scripts --no-optional", {
+        // No --no-optional: the adapter bundles the worker with wrangler, whose
+        // workerd dependency ships its platform binary (@cloudflare/workerd-*)
+        // as an optionalDependency. Omitting optionals fails the build with
+        // "package could not be found, and is needed by workerd".
+        execSync("npm install --no-audit --no-fund --ignore-scripts", {
             cwd: creekDir,
             stdio: "pipe",
         });
@@ -199,15 +240,20 @@ function installCreekDep(creekDir, pkg, version) {
  * CLI dependency that every `npx creek` user would pay for.
  */
 function ensureAdapter(cwd) {
-    const existing = resolveAdapterPath(cwd);
+    const existing = resolveAdapterPath(cwd, ADAPTER_MIN_VERSION);
     if (existing)
         return existing;
-    consola.start(`  Installing ${ADAPTER_PKG} (one-time setup)...`);
+    // Distinguish "not installed" from "only stale copies" for the message;
+    // either way the fix is the same install into .creek.
+    const stale = resolveAdapterPath(cwd) !== null;
+    consola.start(stale
+        ? `  Updating ${ADAPTER_PKG} to >= ${ADAPTER_MIN_VERSION} (older versions cannot build)...`
+        : `  Installing ${ADAPTER_PKG} (one-time setup)...`);
     if (!installCreekDep(join(cwd, CREEK_DIR), ADAPTER_PKG, ADAPTER_VERSION)) {
         consola.warn(`  Could not install ${ADAPTER_PKG}`);
         return null;
     }
-    const resolved = resolveAdapterPath(cwd);
+    const resolved = resolveAdapterPath(cwd, ADAPTER_MIN_VERSION);
     if (resolved)
         consola.success(`  ${ADAPTER_PKG} installed`);
     return resolved;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solcreek/cli",
-  "version": "0.4.24",
+  "version": "0.4.26",
   "description": "CLI for the Creek deployment platform",
   "type": "module",
   "main": "./dist/index.js",