@webflow/webflow-cli 2.1.0 → 2.2.0-next.0

package/dist/templates/astro/v7/astro.config.mjs.template

@@ -0,0 +1,34 @@
+// Generated by the Webflow Cloud builder. Merge logic lives in ./astro.config.webflow.ts.
+import { defineConfig } from 'astro/config';
+import { readFileSync } from 'node:fs';
+import cloudflare from '@astrojs/cloudflare';
+import react from '@astrojs/react';
+import userConfig from './clouduser.astro.config';
+import { withWebflowOverrides } from './astro.config.webflow';
+
+// Detect React 19+ so we know whether to alias react-dom/server -> .edge.
+let isReact19 = false;
+try {
+  const pkg = JSON.parse(readFileSync('./package.json', 'utf8'));
+  const reactVersion = pkg.dependencies?.react || pkg.devDependencies?.react || '';
+  // Match versions like "19", "^19", "~19", "19.0.0", "^19.0.0", etc.
+  isReact19 = /(?:^|[^\d])19(?:\.|$)/.test(reactVersion);
+} catch {
+  // Could not read package.json, assume not React 19.
+}
+
+export default defineConfig(
+  withWebflowOverrides(userConfig, {
+    mountPath: '${COSMIC_MOUNT_PATH}',
+    deployUrl: '${COSMIC_DEPLOY_URL}',
+    adapter: cloudflare({
+      imageService: 'custom',
+      // Note: workerd runs natively via @cloudflare/vite-plugin (no platformProxy needed).
+    }),
+    reactIntegration: react(),
+    // Only React 19+ has react-dom/server.edge. React 18 has only .browser, which doesn't run in edge runtimes.
+    reactDomServerAlias: import.meta.env.PROD && isReact19
+      ? { 'react-dom/server': 'react-dom/server.edge' }
+      : undefined,
+  })
+);

package/dist/templates/astro/v7/webflow-loader.ts

@@ -0,0 +1,122 @@
+/**
+ * Webflow Image Loader for Astro 7
+ *
+ * This is the same loader as Astro 5/6 - it handles image optimization
+ * through Cloudflare's image resizing service.
+ *
+ * Note: Astro defaults to 'cloudflare-binding' for imageService,
+ * but we use 'custom' to maintain compatibility with our CDN setup.
+ */
+
+import type { ExternalImageService, ImageTransform, AstroConfig } from "astro";
+
+function normalizeSrc(src: string, deployUrl?: string, mountPath?: string) {
+  // For local assets, include the mount path but not the deploy url, and remove the leading slash
+  if (deployUrl && src.startsWith(deployUrl)) {
+    return `${src.slice(deployUrl.length)}`.slice(1);
+  } else if (mountPath && src.startsWith(mountPath)) {
+    return src.slice(1);
+  } else if (src.startsWith("/")) {
+    return `${mountPath}${src}`.slice(1);
+  }
+  return src;
+}
+
+// Default implementation copied from Astro's baseService
+function getTargetDimensions(options: ImageTransform) {
+  let targetWidth = options.width;
+  let targetHeight = options.height;
+
+  // For ESM imported images, calculate missing dimensions based on aspect ratio
+  if (
+    typeof options.src === "object" &&
+    "width" in options.src &&
+    "height" in options.src
+  ) {
+    const aspectRatio = options.src.width / options.src.height;
+    if (targetHeight && !targetWidth) {
+      targetWidth = Math.round(targetHeight * aspectRatio);
+    } else if (targetWidth && !targetHeight) {
+      targetHeight = Math.round(targetWidth / aspectRatio);
+    } else if (!targetWidth && !targetHeight) {
+      targetWidth = options.src.width;
+      targetHeight = options.src.height;
+    }
+  }
+
+  return {
+    targetWidth,
+    targetHeight,
+  };
+}
+
+const cloudflareLoader: ExternalImageService = {
+  getURL(options: ImageTransform, imageConfig: AstroConfig["image"]) {
+    const normalizedSrc = normalizeSrc(
+      typeof options.src === "object" ? options.src.src : options.src,
+      imageConfig.service.config.deployUrl,
+      imageConfig.service.config.mountPath
+    );
+    // Our cloudflare zone doesn't allow optimizing external images for security reasons, so just load the original image
+    // For now, also skip optimization for images hosted on regular webflow sites (cdn.website-files.com)
+    // because optimizing them would result in two bandwidth charges: one from the website-files zone (for the full image)
+    // and one from the cosmic.webflow.services zone (for the resized image)
+    if (
+      normalizedSrc.startsWith("http://") ||
+      normalizedSrc.startsWith("https://")
+    ) {
+      return normalizedSrc;
+    }
+
+    const supportedOptions = ["width", "height", "quality", "format"];
+    const params = [];
+    for (const option of supportedOptions) {
+      if (options[option]) {
+        params.push(`${option}=${options[option]}`);
+      }
+    }
+
+    const workerUrl = imageConfig.service.config.deployUrl;
+    // Skip resizing svgs, since it doesn't do anything
+    const isSvg =
+      typeof options.src === "object"
+        ? options.src.format === "svg"
+        : options.src.endsWith(".svg");
+    if (isSvg || params.length === 0) {
+      return `${workerUrl}/${normalizedSrc}`;
+    }
+
+    const paramsString = params.join(",");
+    return `${workerUrl}/cdn-cgi/image/${paramsString}/${normalizedSrc}`;
+  },
+
+  // Default implementation copied from Astro's baseService
+  getHTMLAttributes(options: ImageTransform) {
+    const { targetWidth, targetHeight } = getTargetDimensions(options);
+    const {
+      src,
+      width,
+      height,
+      format,
+      quality,
+      densities,
+      widths,
+      formats,
+      layout,
+      priority,
+      fit,
+      position,
+      ...attributes
+    } = options;
+
+    return {
+      ...attributes,
+      width: targetWidth,
+      height: targetHeight,
+      loading: attributes.loading ?? "lazy",
+      decoding: attributes.decoding ?? "async",
+    };
+  },
+};
+
+export default cloudflareLoader;

package/dist/templates/astro/v7/wrangler.json

@@ -0,0 +1,9 @@
+{
+  "name": "cosmic-builder-dry-run",
+  "main": "@astrojs/cloudflare/entrypoints/server",
+  "compatibility_date": "2025-03-03",
+  "compatibility_flags": ["nodejs_compat"],
+  "assets": {
+    "directory": "./dist/client"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webflow/webflow-cli",
-  "version": "2.1.0",
+  "version": "2.2.0-next.0",
   "license": "MIT",
   "bin": {
     "webflow": "./dist/index.js"
@@ -32,7 +32,7 @@
     "@module-federation/enhanced": "0.20.0",
     "@rspack/core": "^1.7.8",
     "@webflow/cosmic-deploy-contract": "^1.0.2",
-    "@webflow/data-types": "^2.0.0",
+    "@webflow/data-types": "*",
     "ajv": "^8.17.1",
     "archiver": "^5.3.1",
     "babel-loader": "^10.0.0",
@@ -61,7 +61,7 @@
     "semver": "^7.7.2",
     "serve-handler": "^6.1.5",
     "source-map-support": "^0.5.21",
-    "tar": "^7.4.3",
+    "tar": "^7.5.16",
     "ts-checker-rspack-plugin": "^1.0.0",
     "tsconfig-paths": "^4.2.0",
     "tsconfig-paths-webpack-plugin": "^4.2.0",
@@ -90,7 +90,7 @@
     "express": "^4.18.1",
     "jest": "^29.3.1",
     "nock": "13.3.1",
-    "tar": "^7.4.3",
+    "tar": "^7.5.16",
     "ts-jest": "^29.4.9",
     "ts-node": "^10.9.1",
     "tsconfig": "*",

package/dist/extension-scaffolds/default/.eslintrc

@@ -1,25 +0,0 @@
-{
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "./tsconfig.json"
-  },
-  "plugins": ["@typescript-eslint", "promise"],
-  "rules": {
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-floating-promises": "error",
-    "@typescript-eslint/no-misused-promises": [
-      "error",
-      { "checksVoidReturn": false }
-    ],
-    "@typescript-eslint/no-unused-vars": "error",
-    "no-async-promise-executor": "error",
-    "require-await": "error",
-    "promise/catch-or-return": "error"
-  }
-}

package/dist/extension-scaffolds/react/.eslintrc

@@ -1,25 +0,0 @@
-{
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "./tsconfig.json"
-  },
-  "plugins": ["@typescript-eslint", "promise"],
-  "rules": {
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-floating-promises": "error",
-    "@typescript-eslint/no-misused-promises": [
-      "error",
-      { "checksVoidReturn": false }
-    ],
-    "@typescript-eslint/no-unused-vars": "error",
-    "no-async-promise-executor": "error",
-    "require-await": "error",
-    "promise/catch-or-return": "error"
-  }
-}

package/dist/extension-scaffolds/typescript-alt/.eslintrc

@@ -1,25 +0,0 @@
-{
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "./tsconfig.json"
-  },
-  "plugins": ["@typescript-eslint", "promise"],
-  "rules": {
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-floating-promises": "error",
-    "@typescript-eslint/no-misused-promises": [
-      "error",
-      { "checksVoidReturn": false }
-    ],
-    "@typescript-eslint/no-unused-vars": "error",
-    "no-async-promise-executor": "error",
-    "require-await": "error",
-    "promise/catch-or-return": "error"
-  }
-}