@solcreek/cli 0.4.26 → 0.4.28

package/dist/commands/deploy.js

@@ -13,7 +13,7 @@ import { prepareDeployBundle } from "../utils/prepare-bundle.js";
 import { BuildLogEmitter } from "../utils/build-log.js";
 import { isTTY, jsonOutput, resolveJsonMode, globalArgs, shouldAutoConfirm, AUTH_BREADCRUMBS, NO_PROJECT_BREADCRUMBS } from "../utils/output.js";
 import { ensureTosAccepted } from "../utils/tos.js";
-import { hasAdapterOutput } from "../utils/nextjs.js";
+import { hasAdapterOutput, readAdapterCompat } from "../utils/nextjs.js";
 import { isRepoUrl, parseRepoUrl, validateRepoUrl, validateSubpath, RepoUrlError } from "../utils/repo-url.js";
 import { checkGitInstalled, cloneRepo, detectPackageManager, installDependencies, cleanupDir as cleanupCloneDir, GitCloneError } from "../utils/git-clone.js";
 import { CreekdClient, getCreekdUrl } from "../utils/creekd-client.js";
@@ -991,6 +991,14 @@ async function deploySandbox(cwd, skipBuild, jsonMode = false, resolved, tos) {
         section("Deploy");
         consola.start("  Deploying to edge...");
     }
+    // An adapter build records the exact compat it was built against in its
+    // manifest; deploy with that so the worker validates at upload (e.g.
+    // node:http server modules need nodejs_compat + compatibility_date
+    // >= 2025-09-01). Fall back to the resolved config for non-adapter builds.
+    const sandboxAdapterCompat = readAdapterCompat(cwd);
+    const sandboxCompatDate = sandboxAdapterCompat?.compatibilityDate ?? resolved?.compatibilityDate;
+    const sandboxCompatFlags = sandboxAdapterCompat?.compatibilityFlags ??
+        (resolved && resolved.compatibilityFlags.length > 0 ? resolved.compatibilityFlags : undefined);
     try {
         const result = await sandboxDeploy({
             manifest: {
@@ -1006,11 +1014,9 @@ async function deploySandbox(cwd, skipBuild, jsonMode = false, resolved, tos) {
             ...(resolved
                 ? { bindings: resolvedConfigToBindingRequirements(resolved) }
                 : {}),
-            ...(resolved?.compatibilityDate
-                ? { compatibilityDate: resolved.compatibilityDate }
-                : {}),
-            ...(resolved && resolved.compatibilityFlags.length > 0
-                ? { compatibilityFlags: resolved.compatibilityFlags }
+            ...(sandboxCompatDate ? { compatibilityDate: sandboxCompatDate } : {}),
+            ...(sandboxCompatFlags && sandboxCompatFlags.length > 0
+                ? { compatibilityFlags: sandboxCompatFlags }
                 : {}),
         }, { tos });
         const status = await pollSandboxStatus(result.statusUrl);
@@ -1234,6 +1240,16 @@ async function deployAuthenticated(cwd, resolved, token, skipBuild, jsonMode = f
         buildLog.info("bundle", `${fileList.length} assets (${assetSummary(fileList)})`);
         consola.start("  Uploading bundle...");
         const effectiveHasWorker = serverFiles !== undefined;
+        // Prefer the compat the adapter built the worker against (recorded in its
+        // manifest) so the deploy matches the build — node:http server modules
+        // need nodejs_compat + compatibility_date >= 2025-09-01. Falls back to the
+        // resolved config + a framework-aware default for non-adapter builds.
+        const prodAdapterCompat = readAdapterCompat(cwd);
+        const prodCompatDate = prodAdapterCompat?.compatibilityDate ?? resolved.compatibilityDate;
+        const prodCompatFlags = prodAdapterCompat?.compatibilityFlags ??
+            (hasAdapterOutput(cwd)
+                ? ["nodejs_compat"]
+                : ["nodejs_compat", ...resolved.compatibilityFlags.filter((f) => f !== "nodejs_compat")]);
         const bundle = {
             manifest: {
                 assets: fileList,
@@ -1249,15 +1265,8 @@ async function deployAuthenticated(cwd, resolved, token, skipBuild, jsonMode = f
             bindings: resolvedConfigToBindingRequirements(resolved),
             // Pass through wrangler vars and compat settings
             ...(Object.keys(resolved.vars).length > 0 ? { vars: resolved.vars } : {}),
-            ...(resolved.compatibilityDate ? { compatibilityDate: resolved.compatibilityDate } : {}),
-            // nodejs_compat required for Creek runtime (AsyncLocalStorage).
-            // Adapter path uses nodejs_compat_v2 for full Node.js APIs.
-            ...(hasAdapterOutput(cwd)
-                ? { compatibilityFlags: ["nodejs_compat_v2"] }
-                : { compatibilityFlags: [
-                        "nodejs_compat",
-                        ...resolved.compatibilityFlags.filter((f) => f !== "nodejs_compat"),
-                    ] }),
+            ...(prodCompatDate ? { compatibilityDate: prodCompatDate } : {}),
+            compatibilityFlags: prodCompatFlags,
             ...(resolved.cron.length > 0 ? { cron: resolved.cron } : {}),
             ...(resolved.queue ? { queue: true } : {}),
         };

package/dist/utils/nextjs.d.ts

@@ -26,6 +26,18 @@ export declare function getNextVersion(cwd: string): string | null;
 export declare function buildNextjs(cwd: string, isMonorepo: boolean, projectName?: string): void;
 /** Check if the adapter output exists (vs legacy opennext output). */
 export declare function hasAdapterOutput(cwd: string): boolean;
+/**
+ * Read the compat settings the adapter built the worker with from
+ * `.creek/adapter-output/manifest.json`. The worker is validated at upload
+ * against the date/flags it ships with (e.g. node:http server modules need
+ * `nodejs_compat` + compatibility_date >= 2025-09-01), so the deploy must
+ * use exactly what the adapter built against rather than a hardcoded default
+ * that can drift. Returns null when absent/unparseable (caller falls back).
+ */
+export declare function readAdapterCompat(cwd: string): {
+    compatibilityDate?: string;
+    compatibilityFlags?: string[];
+} | null;
 /**
  * Patch the bundled worker to fix opennext's dynamic require issues.
  *
@@ -33,6 +45,22 @@ export declare function hasAdapterOutput(cwd: string): boolean;
  * the Creek adapter handles middleware via typed AdapterOutputs.
  */
 export declare function patchBundledWorker(bundleDir: string, openNextDir: string): void;
+/**
+ * Ensure @prisma/adapter-d1 is resolvable at build time for the zero-change
+ * Prisma-on-D1 swap. adapter-creek aliases `@prisma/adapter-better-sqlite3` to
+ * a PrismaD1-backed shim that imports `@prisma/adapter-d1`; that package is an
+ * OPTIONAL peer of the adapter (not shipped to non-Prisma projects), so it is
+ * lazily installed into .creek only when the project actually uses the
+ * better-sqlite3 Prisma adapter. Installed matching the project's Prisma
+ * version — the adapter packages release in lockstep with @prisma/client, so a
+ * matching driver-adapter interface avoids subtle version skew.
+ *
+ * No-op unless @prisma/adapter-better-sqlite3 is present, or if adapter-d1 is
+ * already resolvable (project dep or a prior .creek install).
+ *
+ * Exported for tests.
+ */
+export declare function ensurePrismaD1(cwd: string): void;
 /**
  * Fix the standalone output path for monorepo builds.
  *

package/dist/utils/nextjs.js

@@ -128,6 +128,7 @@ export function buildNextjs(cwd, isMonorepo, projectName) {
     if (version && semverGte(version, "16.2.3")) {
         const adapterPath = ensureAdapter(cwd);
         if (adapterPath) {
+            ensurePrismaD1(cwd);
             buildWithAdapter(cwd, adapterPath);
             return;
         }
@@ -142,6 +143,31 @@ export function buildNextjs(cwd, isMonorepo, projectName) {
 export function hasAdapterOutput(cwd) {
     return existsSync(join(cwd, ".creek/adapter-output/manifest.json"));
 }
+/**
+ * Read the compat settings the adapter built the worker with from
+ * `.creek/adapter-output/manifest.json`. The worker is validated at upload
+ * against the date/flags it ships with (e.g. node:http server modules need
+ * `nodejs_compat` + compatibility_date >= 2025-09-01), so the deploy must
+ * use exactly what the adapter built against rather than a hardcoded default
+ * that can drift. Returns null when absent/unparseable (caller falls back).
+ */
+export function readAdapterCompat(cwd) {
+    const manifestPath = join(cwd, ".creek/adapter-output/manifest.json");
+    if (!existsSync(manifestPath))
+        return null;
+    try {
+        const m = JSON.parse(readFileSync(manifestPath, "utf-8"));
+        const out = {};
+        if (typeof m.compatibilityDate === "string")
+            out.compatibilityDate = m.compatibilityDate;
+        if (Array.isArray(m.compatibilityFlags))
+            out.compatibilityFlags = m.compatibilityFlags;
+        return out;
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Patch the bundled worker to fix opennext's dynamic require issues.
  *
@@ -180,6 +206,10 @@ const OPENNEXT_PKG = "@opennextjs/cloudflare";
 const OPENNEXT_VERSION = "^1.18.0";
 const ADAPTER_PKG = "@solcreek/adapter-creek";
 const ADAPTER_VERSION = "^0.2.2";
+// Zero-change Prisma-on-D1: the adapter's build-time swap targets this
+// adapter and imports @prisma/adapter-d1 (an optional peer it doesn't ship).
+const PRISMA_BSQLITE_PKG = "@prisma/adapter-better-sqlite3";
+const PRISMA_D1_PKG = "@prisma/adapter-d1";
 // 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
@@ -258,6 +288,56 @@ function ensureAdapter(cwd) {
         consola.success(`  ${ADAPTER_PKG} installed`);
     return resolved;
 }
+/**
+ * Ensure @prisma/adapter-d1 is resolvable at build time for the zero-change
+ * Prisma-on-D1 swap. adapter-creek aliases `@prisma/adapter-better-sqlite3` to
+ * a PrismaD1-backed shim that imports `@prisma/adapter-d1`; that package is an
+ * OPTIONAL peer of the adapter (not shipped to non-Prisma projects), so it is
+ * lazily installed into .creek only when the project actually uses the
+ * better-sqlite3 Prisma adapter. Installed matching the project's Prisma
+ * version — the adapter packages release in lockstep with @prisma/client, so a
+ * matching driver-adapter interface avoids subtle version skew.
+ *
+ * No-op unless @prisma/adapter-better-sqlite3 is present, or if adapter-d1 is
+ * already resolvable (project dep or a prior .creek install).
+ *
+ * Exported for tests.
+ */
+export function ensurePrismaD1(cwd) {
+    const projectRequire = createRequire(join(cwd, "noop.js"));
+    try {
+        projectRequire.resolve(PRISMA_BSQLITE_PKG);
+    }
+    catch {
+        return; // Not a Prisma-on-D1 (better-sqlite3 adapter) project.
+    }
+    // createRequire from .creek walks up into the project's node_modules too, so
+    // this single check covers both a prior .creek install and a project dep.
+    const creekDir = join(cwd, CREEK_DIR);
+    try {
+        createRequire(join(creekDir, "noop.js")).resolve(PRISMA_D1_PKG);
+        return; // Already available.
+    }
+    catch {
+        // Fall through to install.
+    }
+    let version = "latest";
+    try {
+        const clientPkg = JSON.parse(readFileSync(projectRequire.resolve("@prisma/client/package.json"), "utf-8"));
+        if (clientPkg.version)
+            version = clientPkg.version;
+    }
+    catch {
+        // No @prisma/client version readable — fall back to latest.
+    }
+    consola.start(`  Installing ${PRISMA_D1_PKG}@${version} (Prisma on D1)...`);
+    if (installCreekDep(creekDir, PRISMA_D1_PKG, version)) {
+        consola.success(`  ${PRISMA_D1_PKG} installed`);
+    }
+    else {
+        consola.warn(`  Could not install ${PRISMA_D1_PKG} — Prisma build may fail`);
+    }
+}
 /**
  * Ensure @opennextjs/cloudflare is available in .creek/node_modules.
  * Returns the path to the opennextjs-cloudflare CLI binary.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solcreek/cli",
-  "version": "0.4.26",
+  "version": "0.4.28",
   "description": "CLI for the Creek deployment platform",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,6 +44,7 @@
     "hono": "^4.7.4",
     "jsdom": "^29.0.1",
     "miniflare": "^4.20260317.3",
+    "msw": "^2.12.14",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "typescript": "^5.8.2",