alchemy 0.46.1 → 0.48.0

package/src/cloudflare/zone.ts

@@ -74,7 +74,7 @@ export interface ZoneProps extends CloudflareApiOptions {
     /**
      * Enable Always Use HTTPS
      * Redirects all HTTP traffic to HTTPS
-     * @default "off"
+     * @default "on" (unless explicitly set to "off")
      */
     alwaysUseHttps?: AlwaysUseHTTPSValue;
 
@@ -339,6 +339,7 @@ export const Zone = Resource(
       return this.destroy();
     }
 
+    let zoneData: CloudflareZone;
     if (this.phase === "update" && this.output?.id) {
       // Get zone details to verify it exists
       const response = await api.get(`/zones/${this.output.id}`);
@@ -349,84 +350,63 @@ export const Zone = Resource(
         );
       }
 
-      const zoneData = ((await response.json()) as { result: CloudflareZone })
-        .result;
-
-      // Update zone settings if provided
-      if (props.settings) {
-        await updateZoneSettings(api, this.output.id, props.settings);
-        // Add a small delay to ensure settings are propagated
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-      }
-
-      return this({
-        id: zoneData.id,
-        name: zoneData.name,
-        type: zoneData.type,
-        status: zoneData.status,
-        paused: zoneData.paused,
-        accountId: zoneData.account.id,
-        nameservers: zoneData.name_servers,
-        originalNameservers: zoneData.original_name_servers,
-        createdAt: new Date(zoneData.created_on).getTime(),
-        modifiedAt: new Date(zoneData.modified_on).getTime(),
-        activatedAt: zoneData.activated_on
-          ? new Date(zoneData.activated_on).getTime()
-          : null,
-        settings: await getZoneSettings(api, zoneData.id),
+      zoneData = ((await response.json()) as { result: CloudflareZone }).result;
+    } else {
+      const response = await api.post("/zones", {
+        name: props.name,
+        type: props.type || "full",
+        jump_start: props.jumpStart !== false,
+        account: {
+          id: api.accountId,
+        },
       });
-    }
-    // Create new zone
-
-    const response = await api.post("/zones", {
-      name: props.name,
-      type: props.type || "full",
-      jump_start: props.jumpStart !== false,
-      account: {
-        id: api.accountId,
-      },
-    });
-
-    const body = await response.text();
-    let zoneData;
-    if (!response.ok) {
-      if (response.status === 400 && body.includes("already exists")) {
-        // Zone already exists, fetch it instead
-        logger.warn(
-          `Zone '${props.name}' already exists during Zone create, adopting it...`,
-        );
-        const getResponse = await api.get(`/zones?name=${props.name}`);
 
-        if (!getResponse.ok) {
-          throw new Error(
-            `Error fetching existing zone '${props.name}': ${getResponse.statusText}`,
+      const body = await response.text();
+      if (!response.ok) {
+        if (response.status === 400 && body.includes("already exists")) {
+          // Zone already exists, fetch it instead
+          logger.warn(
+            `Zone '${props.name}' already exists during Zone create, adopting it...`,
           );
-        }
+          const getResponse = await api.get(`/zones?name=${props.name}`);
 
-        const zones = (
-          (await getResponse.json()) as { result: CloudflareZone[] }
-        ).result;
-        if (zones.length === 0) {
+          if (!getResponse.ok) {
+            throw new Error(
+              `Error fetching existing zone '${props.name}': ${getResponse.statusText}`,
+            );
+          }
+
+          const zones = (
+            (await getResponse.json()) as { result: CloudflareZone[] }
+          ).result;
+          if (zones.length === 0) {
+            throw new Error(
+              `Zone '${props.name}' does not exist, but the name is reserved for another user.`,
+            );
+          }
+          zoneData = zones[0];
+        } else {
           throw new Error(
-            `Zone '${props.name}' does not exist, but the name is reserved for another user.`,
+            `Error creating zone '${props.name}': ${response.statusText}\n${body}`,
           );
         }
-        zoneData = zones[0];
       } else {
-        throw new Error(
-          `Error creating zone '${props.name}': ${response.statusText}\n${body}`,
-        );
+        zoneData = (JSON.parse(body) as { result: CloudflareZone }).result;
       }
-    } else {
-      zoneData = (JSON.parse(body) as { result: CloudflareZone }).result;
     }
 
-    // Update zone settings if provided
-    if (props.settings) {
-      await updateZoneSettings(api, zoneData.id, props.settings);
-      // Add a small delay to ensure settings are propagated
-      await new Promise((resolve) => setTimeout(resolve, 2000));
-    }
+    // Apply defaults to settings
+    const settingsToApply = {
+      ...props.settings,
+      alwaysUseHttps: props.settings?.alwaysUseHttps ?? "on",
+    };
+
+    await updateZoneSettings(api, zoneData.id, settingsToApply);
+
+    // Add a small delay to ensure settings are propagated
+    // TODO(michael): do we need this?
+    // https://github.com/sam-goodwin/alchemy/issues/681
+    await new Promise((resolve) => setTimeout(resolve, 2000));
 
     return this({
       id: zoneData.id,
@@ -451,7 +431,7 @@ export const Zone = Resource(
  * Helper function to update zone settings
  */
 async function updateZoneSettings(
-  api: any,
+  api: CloudflareApi,
   zoneId: string,
   settings: ZoneProps["settings"],
 ): Promise<void> {
@@ -508,7 +488,7 @@ async function updateZoneSettings(
  * Helper function to get current zone settings
  */
 async function getZoneSettings(
-  api: any,
+  api: CloudflareApi,
   zoneId: string,
 ): Promise<Zone["settings"]> {
   const settingsResponse = await api.get(`/zones/${zoneId}/settings`);

package/src/scope.ts

@@ -38,7 +38,18 @@ export interface ScopeOptions {
   stateStore?: StateStoreType;
   quiet?: boolean;
   phase?: Phase;
-  dev?: "prefer-local" | "prefer-remote";
+  /**
+   * Determines if resources should be simulated locally (where possible)
+   *
+   * @default - `true` if ran with `alchemy dev` or `bun ./alchemy.run.ts --dev`
+   */
+  local?: boolean;
+  /**
+   * Determines if local changes to resources should be reactively pushed to the local or remote environment.
+   *
+   * @default - `true` if ran with `alchemy dev`, `alchemy watch`, `bun --watch ./alchemy.run.ts`
+   */
+  watch?: boolean;
   telemetryClient?: ITelemetryClient;
   logger?: LoggerApi;
 }
@@ -107,7 +118,8 @@ export class Scope {
   public readonly stateStore: StateStoreType;
   public readonly quiet: boolean;
   public readonly phase: Phase;
-  public readonly dev?: "prefer-local" | "prefer-remote";
+  public readonly local: boolean;
+  public readonly watch: boolean;
   public readonly logger: LoggerApi;
   public readonly telemetryClient: ITelemetryClient;
   public readonly dataMutex: AsyncMutex;
@@ -162,9 +174,10 @@ export class Scope {
           options.logger,
         );
 
-    this.dev = options.dev ?? this.parent?.dev;
+    this.local = options.local ?? this.parent?.local ?? false;
+    this.watch = options.watch ?? this.parent?.watch ?? false;
 
-    if (this.dev) {
+    if (this.local) {
       this.logger.warnOnce(
         "Development mode is in beta. Please report any issues to https://github.com/sam-goodwin/alchemy/issues.",
       );
@@ -415,6 +428,10 @@ export class Scope {
     await this.rootTelemetryClient?.finalize()?.catch((error) => {
       this.logger.warn("Telemetry finalization failed:", error);
     });
+
+    if (!this.parent && process.env.ALCHEMY_TEST_KILL_ON_FINALIZE) {
+      process.exit(0);
+    }
   }
 
   public async destroyPendingDeletions() {

package/src/util/safe-fetch.ts

@@ -20,6 +20,7 @@ export async function safeFetch(
         err?.code === "UND_ERR_SOCKET" ||
         err?.code === "ECONNRESET" ||
         err?.code === "UND_ERR_CONNECT_TIMEOUT" ||
+        err?.code === "EPIPE" ||
         err?.name === "FetchError";
 
       if (!shouldRetry || attempt === retries) {

package/src/util/telemetry/constants.ts

@@ -1,6 +1,6 @@
-import { createXdgAppPaths } from "../xdg-paths.js";
+import xdgAppPaths from "xdg-app-paths";
 
-const xdg = createXdgAppPaths("alchemy");
+const xdg = xdgAppPaths("alchemy");
 
 export const CONFIG_DIR = xdg.config();
 

package/templates/react-router/package.json

@@ -3,7 +3,7 @@
   "name": "@alchemy.run/react-router-template",
   "private": true,
   "scripts": {
-    "build": "vite build",
+    "build": "react-router build",
     "deploy": "alchemy deploy",
     "destroy": "alchemy destroy",
     "dev": "alchemy dev",

package/templates/react-router/tsconfig.cloudflare.json

@@ -11,7 +11,11 @@
     "composite": true,
     "strict": true,
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
-    "types": ["vite/client"],
+    "types": [
+      "vite/client",
+      "@cloudflare/workers-types",
+      "./types/env.d.ts"
+    ],
     "target": "ES2022",
     "module": "ES2022",
     "moduleResolution": "bundler",

package/templates/react-router/tsconfig.json

@@ -10,8 +10,5 @@
     "skipLibCheck": true,
     "strict": true,
     "noEmit": true,
-    "types": [
-        "./worker-configuration.d.ts"
-    ]
   }
 }

package/templates/react-router/tsconfig.node.json

@@ -8,10 +8,6 @@
   "compilerOptions": {
     "composite": true,
     "strict": true,
-    "types": [
-      "@cloudflare/workers-types",
-      "./types/env.d.ts"
-    ],
     "lib": ["ES2022"],
     "target": "ES2022",
     "module": "ES2022",

package/lib/util/xdg-paths.d.ts

@@ -1,9 +0,0 @@
-/**
- * Vendored XDG Base Directory Specification implementation
- * Provides cross-platform directory paths for config and state
- */
-export declare function createXdgAppPaths(appName: string): {
-    config: () => string;
-    state: () => string;
-};
-//# sourceMappingURL=xdg-paths.d.ts.map

package/lib/util/xdg-paths.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"xdg-paths.d.ts","sourceRoot":"","sources":["../../src/util/xdg-paths.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM;kBAI5B,MAAM;iBAgBP,MAAM;EAoBzB"}

package/lib/util/xdg-paths.js

@@ -1,41 +0,0 @@
-import { join } from "node:path";
-import { homedir } from "node:os";
-/**
- * Vendored XDG Base Directory Specification implementation
- * Provides cross-platform directory paths for config and state
- */
-export function createXdgAppPaths(appName) {
-    const platform = process.platform;
-    const home = homedir();
-    function config() {
-        if (platform === "win32") {
-            return join(process.env.LOCALAPPDATA || join(home, "AppData", "Local"), appName);
-        }
-        else if (platform === "darwin") {
-            return join(home, "Library", "Preferences", appName);
-        }
-        else {
-            // Linux/Unix - follow XDG Base Directory Specification
-            const xdgConfigHome = process.env.XDG_CONFIG_HOME || join(home, ".config");
-            return join(xdgConfigHome, appName);
-        }
-    }
-    function state() {
-        if (platform === "win32") {
-            return join(process.env.LOCALAPPDATA || join(home, "AppData", "Local"), appName);
-        }
-        else if (platform === "darwin") {
-            return join(home, "Library", "Application Support", appName);
-        }
-        else {
-            // Linux/Unix - follow XDG Base Directory Specification
-            const xdgStateHome = process.env.XDG_STATE_HOME || join(home, ".local", "state");
-            return join(xdgStateHome, appName);
-        }
-    }
-    return {
-        config,
-        state,
-    };
-}
-//# sourceMappingURL=xdg-paths.js.map

package/lib/util/xdg-paths.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"xdg-paths.js","sourceRoot":"","sources":["../../src/util/xdg-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,SAAS,MAAM;QACb,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,OAAO,IAAI,CACT,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAC1D,OAAO,CACR,CAAC;QACJ,CAAC;aAAM,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACN,uDAAuD;YACvD,MAAM,aAAa,GACjB,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,SAAS,KAAK;QACZ,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,OAAO,IAAI,CACT,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,EAC1D,OAAO,CACR,CAAC;QACJ,CAAC;aAAM,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,qBAAqB,EAAE,OAAO,CAAC,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,uDAAuD;YACvD,MAAM,YAAY,GAChB,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM;QACN,KAAK;KACN,CAAC;AACJ,CAAC"}

package/src/util/xdg-paths.ts

@@ -1,48 +0,0 @@
-import { join } from "node:path";
-import { homedir } from "node:os";
-
-/**
- * Vendored XDG Base Directory Specification implementation
- * Provides cross-platform directory paths for config and state
- */
-export function createXdgAppPaths(appName: string) {
-  const platform = process.platform;
-  const home = homedir();
-
-  function config(): string {
-    if (platform === "win32") {
-      return join(
-        process.env.LOCALAPPDATA || join(home, "AppData", "Local"),
-        appName,
-      );
-    } else if (platform === "darwin") {
-      return join(home, "Library", "Preferences", appName);
-    } else {
-      // Linux/Unix - follow XDG Base Directory Specification
-      const xdgConfigHome =
-        process.env.XDG_CONFIG_HOME || join(home, ".config");
-      return join(xdgConfigHome, appName);
-    }
-  }
-
-  function state(): string {
-    if (platform === "win32") {
-      return join(
-        process.env.LOCALAPPDATA || join(home, "AppData", "Local"),
-        appName,
-      );
-    } else if (platform === "darwin") {
-      return join(home, "Library", "Application Support", appName);
-    } else {
-      // Linux/Unix - follow XDG Base Directory Specification
-      const xdgStateHome =
-        process.env.XDG_STATE_HOME || join(home, ".local", "state");
-      return join(xdgStateHome, appName);
-    }
-  }
-
-  return {
-    config,
-    state,
-  };
-}