@webflow/cloud-app 0.1.0-beta.9 → 0.1.1-beta.bad4bbe.0

package/dist/wrangler.js

@@ -55,9 +55,13 @@ const jsonc = __importStar(require("jsonc-parser"));
 const utils_1 = require("./utils");
 const webflow_json_1 = require("./config/webflow-json");
 const compat_date_1 = require("./compat-date");
+const errors_1 = require("./frameworks/errors");
+const session_check_1 = require("./frameworks/astro/session-check");
+const diagnostics_1 = require("./diagnostics");
 const bindings_1 = require("./bindings");
-// Schema covers all wrangler.json variants we read: user source and framework
-// template. `main` is optional because the user's source may omit it.
+// Strict schema for the framework template and generated files; the user's
+// source uses `userWranglerJsonSchema` below. `main` is optional because the
+// user's source may omit it.
 const wranglerJsonSchema = zod_1.z
     .object({
     name: zod_1.z.string(),
@@ -105,6 +109,102 @@ const wranglerJsonSchema = zod_1.z
         .default([]),
 })
     .passthrough();
+// The user's source config (and its clouduser.wrangler.json backup). KV `id` and
+// D1 `database_id` are optional here: the deployer provisions each resource and
+// writes the real id, so the user's value is a placeholder. `placement.mode`
+// takes any string: wrangler also accepts "off", and a schema mismatch here fails
+// the build. `assets.directory` is optional: the Cloudflare Vite plugin fills it
+// in, and the build takes `assets` from the template, not from this file.
+// Template and generated files keep the strict schema above.
+const userWranglerJsonSchema = wranglerJsonSchema.extend({
+    assets: zod_1.z
+        .object({
+        directory: zod_1.z.string().optional(),
+        binding: zod_1.z.string().optional(),
+    })
+        .passthrough()
+        .optional(),
+    placement: zod_1.z
+        .object({
+        mode: zod_1.z.string(),
+    })
+        .passthrough()
+        .optional(),
+    d1_databases: zod_1.z
+        .array(zod_1.z
+        .object({
+        database_name: zod_1.z.string(),
+        database_id: zod_1.z.string().optional(),
+        binding: zod_1.z.string(),
+        migrations_dir: zod_1.z.string().optional(),
+    })
+        .passthrough())
+        .default([]),
+    kv_namespaces: zod_1.z
+        .array(zod_1.z
+        .object({
+        binding: zod_1.z.string(),
+        id: zod_1.z.string().optional(),
+    })
+        .passthrough())
+        .default([]),
+});
+// Wrangler itself accepts comments and trailing commas in both wrangler.json and
+// wrangler.jsonc, so only real syntax errors count. jsonc.parse never throws: it
+// repairs what it can and reports the rest through `errors`.
+function parseJsonc(raw) {
+    const errors = [];
+    const value = jsonc.parse(raw, errors, { allowTrailingComma: true });
+    const problems = errors.map((e) => {
+        const before = raw.slice(0, e.offset).split('\n');
+        const line = before.length;
+        const column = before[before.length - 1].length + 1;
+        return `line ${line}, column ${column}: ${jsonc.printParseErrorCode(e.error)}`;
+    });
+    return { value, problems };
+}
+function formatZodIssues(error) {
+    return error.issues.map((issue) => {
+        const fieldPath = issue.path.reduce((acc, part) => typeof part === 'number' ? `${acc}[${part}]` : acc ? `${acc}.${part}` : String(part), '');
+        return fieldPath ? `${fieldPath}: ${issue.message}` : issue.message;
+    });
+}
+// Reads the user's wrangler config, telling "no file" (most apps) apart from
+// "file present but invalid", which must fail the build rather than silently
+// drop every storage binding.
+function readUserWranglerJson(cwd, file) {
+    const filePath = path.join(cwd, file);
+    if (!fs.statSync(filePath, { throwIfNoEntry: false })) {
+        return { kind: 'absent' };
+    }
+    const { value, problems } = parseJsonc(fs.readFileSync(filePath, 'utf8'));
+    if (problems.length > 0) {
+        return { kind: 'invalid', filePath, problems };
+    }
+    const result = userWranglerJsonSchema.safeParse(value);
+    if (!result.success) {
+        return { kind: 'invalid', filePath, problems: formatZodIssues(result.error) };
+    }
+    return { kind: 'valid', filePath, config: result.data };
+}
+function invalidUserWranglerJsonError(filePath, problems) {
+    const file = path.basename(filePath);
+    // Hosts that log only `message` still show the fields and the fix, so both go
+    // in the message itself; `remediation` adds the hint on top. The first line is
+    // a WRANGLER_JSON_INVALID diagnostic, the same as cosmic-builder's.
+    return new errors_1.FrameworkValidationError((0, diagnostics_1.formatDiagnostic)({
+        level: 'error',
+        code: diagnostics_1.DiagnosticCode.WRANGLER_JSON_INVALID,
+        message: `${file} is invalid, so its storage bindings (kv_namespaces, d1_databases, r2_buckets) cannot be applied.`,
+        fix: `correct the problems below in ${file} and redeploy.`,
+    }) +
+        '\n' +
+        problems.map((p) => `  - ${p}`).join('\n') +
+        `\nRequired fields: name, compatibility_date; ` +
+        `kv_namespaces[].binding; d1_databases[].binding and database_name; r2_buckets[].binding and bucket_name.`, {
+        remediation: 'The platform provisions the KV namespace and D1 database ids at deploy time, so `id` and `database_id` can be omitted.',
+    });
+}
 function loadWranglerJson(log, cwd, file = 'wrangler.json') {
     const filePath = path.join(cwd, file);
     if (!fs.statSync(filePath, { throwIfNoEntry: false })) {
@@ -160,9 +260,18 @@ function handleWranglerJson(log, builder, cwd, opts = {}) {
     else if (fs.statSync(jsoncPath, { throwIfNoEntry: false })) {
         originalFilePath = jsoncPath;
     }
-    const legacyUserWrangler = originalFilePath
-        ? loadWranglerJson(log, cwd, path.basename(originalFilePath))
-        : undefined;
+    // An invalid file fails the build even when webflow.json declares the
+    // bindings: `main` and `compatibility_date` still come from it.
+    const userResult = originalFilePath
+        ? readUserWranglerJson(cwd, path.basename(originalFilePath))
+        : { kind: 'absent' };
+    if (userResult.kind === 'invalid') {
+        throw invalidUserWranglerJsonError(userResult.filePath, userResult.problems);
+    }
+    const legacyUserWrangler = userResult.kind === 'valid' ? userResult.config : undefined;
+    if (legacyUserWrangler) {
+        log.debug(`loaded ${originalFilePath}: ${JSON.stringify(legacyUserWrangler)}`);
+    }
     // Bindings declared in webflow.json (the canonical, user-facing surface) take
     // precedence over a legacy user wrangler.json. Synthesize the same binding
     // bridge from them so the rest of this function — and the deployer — are
@@ -184,6 +293,18 @@ function handleWranglerJson(log, builder, cwd, opts = {}) {
     else {
         userProvided = legacyUserWrangler;
     }
+    // Warning only: never fails the build and never provisions (detection is a heuristic).
+    const sessionWarning = (0, session_check_1.astroSessionBindingWarning)({
+        framework: builder.info.name,
+        cwd,
+        configFile: originalFilePath ? path.basename(originalFilePath) : undefined,
+        kvNamespaces: userProvided?.kv_namespaces ?? [],
+        // webflow.json bindings replace wrangler's kv_namespaces, so the fix must name it.
+        bindingsSource: (0, bindings_1.hasAnyBindings)(webflowBindings) ? 'webflow.json' : 'wrangler',
+    });
+    if (sessionWarning) {
+        log.warn(sessionWarning);
+    }
     // Step 1: save the parsed user config as clouduser.wrangler.json. We always
     // normalize to .json — even when the source is .jsonc — because every
     // downstream consumer hardcodes that path. Comments in the user's .jsonc are

package/dist/wrangler.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrangler.js","sourceRoot":"","sources":["../src/wrangler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wrangler.js","sourceRoot":"","sources":["../src/wrangler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webflow/cloud-app",
-  "version": "0.1.0-beta.9",
+  "version": "0.1.1-beta.bad4bbe.0",
   "description": "Build a JS framework app (Vite, Next.js, Astro) into a Webflow Cloud (Cloudflare Workers) bundle. Framework detection, adapter injection, and config generation are handled for you — declare what you need in webflow.json and nothing else.",
   "license": "MIT",
   "repository": {
@@ -35,14 +35,14 @@
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
-    "@types/node": "^20.0.0",
+    "@types/node": "^22.13.0",
     "@types/semver": "^7.5.8",
     "jest": "^30.0.3",
-    "ts-jest": "^29.4.0",
+    "jest-config-custom": "*",
     "tsconfig": "*",
     "typescript": "^5"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22.13.0"
   }
 }

package/dist/frameworks/astro/adapter-patches/ensure-fixed-cloudflare-adapter.d.ts

@@ -1,36 +0,0 @@
-import type { Logger, CommandRunner } from '../../../ports';
-export interface EnsureFixedCloudflareAdapterParams {
-    log: Logger;
-    runCommand: CommandRunner;
-    cwd: string;
-    /** e.g. `@astrojs/cloudflare`. */
-    adapterName: string;
-    /** The version spec we install/force, e.g. `^13.3.1` (Astro 6) or `^14.0.0` (Astro 7). */
-    installVersion: string;
-    /** First release with the base-path fix for this Astro line, e.g. `13.3.1` / `14.0.0`. */
-    fixedFloor: string;
-    /** The user's declared adapter spec (from package.json), or undefined if absent. */
-    declaredVersion: string | undefined;
-}
-/**
- * Ensure the project resolves a `@astrojs/cloudflare` adapter at or above the release that
- * fixes the base-path bug (withastro/astro#16276, fixed in 13.3.1). Companion to
- * `assertAdapterNestedUnderMount`: forcing a fixed adapter is what keeps that guard nearly
- * unreachable — a buggy 13.0.0–13.3.0 adapter emits the client tree
- * WITHOUT the base prefix, so assets end up at the wrong URL no matter how we copy them.
- *
- * - Adapter absent → install our pinned version.
- * - Declared below the fixed floor, SAME major (e.g. Astro 6's `13.x` → `13.3.1`, a
- *   non-breaking bump) → force-install the fixed version and warn.
- * - Declared below the floor but reaching the fix would CROSS a major → warn only; forcing a
- *   major upgrade could break the build. (This is the only path Astro 7 can hit — a sub-14
- *   adapter — and in practice it can't install anyway: `13.x` peers on `astro@^6`.)
- *
- * Note: we key off the declared range floor (`semver.coerce`), not the resolved version.
- * `npm install --save <pkg>@<range>` rewrites BOTH package.json and the lockfile entry for
- * this package, so a forced bump overrides a lockfile-pinned buggy version. The trade-off: a
- * wide range like `^13.0.0` that already resolves to a fixed `13.5.0` still coerces to
- * `13.0.0`, triggering a harmless, unnecessary reinstall.
- */
-export declare function ensureFixedCloudflareAdapter(params: EnsureFixedCloudflareAdapterParams): Promise<void>;
-//# sourceMappingURL=ensure-fixed-cloudflare-adapter.d.ts.map

package/dist/frameworks/astro/adapter-patches/ensure-fixed-cloudflare-adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ensure-fixed-cloudflare-adapter.d.ts","sourceRoot":"","sources":["../../../../src/frameworks/astro/adapter-patches/ensure-fixed-cloudflare-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG5D,MAAM,WAAW,kCAAkC;IACjD,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,aAAa,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,kCAAkC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,0FAA0F;IAC1F,cAAc,EAAE,MAAM,CAAC;IACvB,0FAA0F;IAC1F,UAAU,EAAE,MAAM,CAAC;IACnB,oFAAoF;IACpF,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;CACrC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,IAAI,CAAC,CAwCf"}

package/dist/frameworks/astro/adapter-patches/ensure-fixed-cloudflare-adapter.js

@@ -1,94 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureFixedCloudflareAdapter = ensureFixedCloudflareAdapter;
-const semver = __importStar(require("semver"));
-const utils_1 = require("../../../utils");
-/**
- * Ensure the project resolves a `@astrojs/cloudflare` adapter at or above the release that
- * fixes the base-path bug (withastro/astro#16276, fixed in 13.3.1). Companion to
- * `assertAdapterNestedUnderMount`: forcing a fixed adapter is what keeps that guard nearly
- * unreachable — a buggy 13.0.0–13.3.0 adapter emits the client tree
- * WITHOUT the base prefix, so assets end up at the wrong URL no matter how we copy them.
- *
- * - Adapter absent → install our pinned version.
- * - Declared below the fixed floor, SAME major (e.g. Astro 6's `13.x` → `13.3.1`, a
- *   non-breaking bump) → force-install the fixed version and warn.
- * - Declared below the floor but reaching the fix would CROSS a major → warn only; forcing a
- *   major upgrade could break the build. (This is the only path Astro 7 can hit — a sub-14
- *   adapter — and in practice it can't install anyway: `13.x` peers on `astro@^6`.)
- *
- * Note: we key off the declared range floor (`semver.coerce`), not the resolved version.
- * `npm install --save <pkg>@<range>` rewrites BOTH package.json and the lockfile entry for
- * this package, so a forced bump overrides a lockfile-pinned buggy version. The trade-off: a
- * wide range like `^13.0.0` that already resolves to a fixed `13.5.0` still coerces to
- * `13.0.0`, triggering a harmless, unnecessary reinstall.
- */
-async function ensureFixedCloudflareAdapter(params) {
-    const { log, runCommand, cwd, adapterName, installVersion, fixedFloor, declaredVersion } = params;
-    if (!declaredVersion) {
-        log.warn(`Installing ${adapterName}@${installVersion} (required for Cloudflare deployment)...`);
-        await (0, utils_1.npm)({
-            log,
-            runCommand,
-            cwd,
-            args: ['install', '--save', `${adapterName}@${installVersion}`],
-        });
-        return;
-    }
-    const resolved = semver.coerce(declaredVersion);
-    if (!resolved || !semver.lt(resolved, fixedFloor)) {
-        // Already fixed (or an unparseable spec we leave alone).
-        return;
-    }
-    const floorMajor = semver.coerce(fixedFloor)?.major;
-    if (resolved.major === floorMajor) {
-        log.warn(`Detected ${adapterName}@${declaredVersion}, which has a known base-path bug ` +
-            `(withastro/astro#16276) that breaks static assets on mounted apps. ` +
-            `Upgrading to ${installVersion}.`);
-        await (0, utils_1.npm)({
-            log,
-            runCommand,
-            cwd,
-            args: ['install', '--save', `${adapterName}@${installVersion}`],
-        });
-    }
-    else {
-        log.warn(`${adapterName}@${declaredVersion} predates the base-path fix in ${fixedFloor} and ` +
-            `upgrading crosses a major version. Please upgrade to ${adapterName}@${installVersion} ` +
-            `manually to avoid broken asset serving on mounted apps.`);
-    }
-}
-//# sourceMappingURL=ensure-fixed-cloudflare-adapter.js.map

package/dist/frameworks/astro/adapter-patches/ensure-fixed-cloudflare-adapter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ensure-fixed-cloudflare-adapter.js","sourceRoot":"","sources":["../../../../src/frameworks/astro/adapter-patches/ensure-fixed-cloudflare-adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuCA,oEA0CC;AAjFD,+CAAiC;AAGjC,0CAAqC;AAgBrC;;;;;;;;;;;;;;;;;;;GAmBG;AACI,KAAK,UAAU,4BAA4B,CAChD,MAA0C;IAE1C,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;IAElG,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,GAAG,CAAC,IAAI,CAAC,cAAc,WAAW,IAAI,cAAc,0CAA0C,CAAC,CAAC;QAChG,MAAM,IAAA,WAAG,EAAC;YACR,GAAG;YACH,UAAU;YACV,GAAG;YACH,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,WAAW,IAAI,cAAc,EAAE,CAAC;SAChE,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAChD,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,CAAC;QAClD,yDAAyD;QACzD,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC;IACpD,IAAI,QAAQ,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;QAClC,GAAG,CAAC,IAAI,CACN,YAAY,WAAW,IAAI,eAAe,oCAAoC;YAC5E,qEAAqE;YACrE,gBAAgB,cAAc,GAAG,CACpC,CAAC;QACF,MAAM,IAAA,WAAG,EAAC;YACR,GAAG;YACH,UAAU;YACV,GAAG;YACH,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,WAAW,IAAI,cAAc,EAAE,CAAC;SAChE,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,IAAI,CACN,GAAG,WAAW,IAAI,eAAe,kCAAkC,UAAU,OAAO;YAClF,wDAAwD,WAAW,IAAI,cAAc,GAAG;YACxF,yDAAyD,CAC5D,CAAC;IACJ,CAAC;AACH,CAAC"}