alchemy 2.0.0-beta.44 → 2.0.0-beta.46

package/src/Cloudflare/Website/StaticSite.ts

@@ -8,16 +8,12 @@ import {
   Worker,
   type WorkerAssetsConfig,
   type WorkerBindingProps,
-  type WorkerEnv,
   type WorkerProps,
 } from "../Workers/Worker.ts";
 
-export interface StaticSiteProps<
-  Bindings extends WorkerBindingProps = {},
-  Env extends WorkerEnv = WorkerEnv,
->
+export interface StaticSiteProps<Bindings extends WorkerBindingProps = {}>
   extends
-    Omit<WorkerProps<Bindings, Env, WorkerAssetsConfig>, "assets">,
+    Omit<WorkerProps<Bindings, WorkerAssetsConfig>, "assets" | "dev">,
     Omit<CommandProps, "env"> {
   /**
    * Optional configuration for static asset routing behavior.
@@ -120,13 +116,12 @@ export type StaticSite = ReturnType<typeof StaticSite>;
  */
 export const StaticSite = <
   const Bindings extends WorkerBindingProps = {},
-  const Env extends WorkerEnv = WorkerEnv,
   Req = never,
 >(
   id: string,
   propsEff:
-    | InputProps<StaticSiteProps<Bindings, Env>>
-    | Effect.Effect<InputProps<StaticSiteProps<Bindings, Env>>, never, Req>,
+    | InputProps<StaticSiteProps<Bindings>>
+    | Effect.Effect<InputProps<StaticSiteProps<Bindings>>, never, Req>,
 ) =>
   Effect.gen(function* () {
     const props = Effect.isEffect(propsEff)
@@ -154,7 +149,7 @@ export const StaticSite = <
       })),
     );
 
-    return yield* Worker<Bindings, Env, WorkerAssetsConfig, Req>(
+    return yield* Worker<Bindings, WorkerAssetsConfig, Req>(
       "Worker",
       Effect.map(props, (props) => ({
         ...props,
@@ -163,6 +158,9 @@ export const StaticSite = <
           hash: build.hash,
           config: props.assetsConfig,
         },
+        // Omit the dev command from WorkerProps since it's different from WorkerProps["dev"].
+        // TODO: we'll need to update this when we add local dev support for StaticSite.
+        dev: undefined,
       })),
     );
   }).pipe(Namespace.push(id));

package/src/Cloudflare/Website/Vite.ts

@@ -5,14 +5,12 @@ import {
   Worker,
   type WorkerAssetsConfig,
   type WorkerBindingProps,
-  type WorkerEnv,
   type WorkerProps,
 } from "../Workers/Worker.ts";
 
 export interface ViteProps<
   Bindings extends WorkerBindingProps = {},
-  Env extends WorkerEnv = {},
-> extends Omit<WorkerProps<Bindings, Env>, "vite" | "main"> {
+> extends Omit<WorkerProps<Bindings>, "vite" | "main"> {
   /**
    * Root directory passed to Vite's `root` option.
    * Defaults to the current working directory (`process.cwd()`).
@@ -111,15 +109,14 @@ export interface ViteProps<
  */
 export const Vite = <
   const Bindings extends WorkerBindingProps = {},
-  const Env extends WorkerEnv = {},
   Req = never,
 >(
   id: string,
   propsEff?:
-    | InputProps<ViteProps<Bindings, Env>>
-    | Effect.Effect<InputProps<ViteProps<Bindings, Env>>, never, Req>,
+    | InputProps<ViteProps<Bindings>>
+    | Effect.Effect<InputProps<ViteProps<Bindings>>, never, Req>,
 ) =>
-  Worker<Bindings, Env, WorkerAssetsConfig, Req>(
+  Worker<Bindings, WorkerAssetsConfig, Req>(
     id,
     Effect.map(
       Effect.isEffect(propsEff) ? propsEff : Effect.succeed(propsEff),

package/src/Cloudflare/Workers/Assets.ts

@@ -1,3 +1,4 @@
+import createIgnore from "@alchemy.run/node-utils/ignore";
 import * as workers from "@distilled.cloud/cloudflare/workers";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
@@ -6,7 +7,6 @@ import * as Path from "effect/Path";
 import type { PlatformError } from "effect/PlatformError";
 import type { ScopedPlanStatusSession } from "../../Cli/Cli.ts";
 import { sha256, sha256Object } from "../../Util/index.ts";
-import createIgnore from "../../Util/ignore.ts";
 
 const MAX_ASSET_SIZE = 1024 * 1024 * 25; // 25MB
 const MAX_ASSET_COUNT = 20_000;

package/src/Cloudflare/Workers/DurableObjectBridge.ts

@@ -16,7 +16,7 @@ import {
   DurableObjectState,
   fromDurableObjectState,
 } from "./DurableObjectState.ts";
-import { makeRequestEffect } from "./HttpServer.ts";
+import { isScopeEjected, makeRequestEffect } from "./HttpServer.ts";
 import { fromWebSocket } from "./WebSocket.ts";
 import { getWorkerExport, handleRpcExit } from "./WorkerBridge.ts";
 
@@ -130,9 +130,12 @@ export const makeDurableObjectBridge =
                   : Promise.reject(Cause.squash(exit.cause))),
           )
           .finally(() =>
-            Scope.close(scope, Exit.void).pipe(Effect.runPromise, (promise) =>
-              this.#state.waitUntil(promise),
-            ),
+            isScopeEjected(scope)
+              ? undefined
+              : Scope.close(scope, Exit.void).pipe(
+                  Effect.runPromise,
+                  (promise) => this.ctx.waitUntil(promise),
+                ),
           );
       }