alchemy 2.0.0-beta.49 → 2.0.0-beta.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "2.0.0-beta.49",
+  "version": "2.0.0-beta.50",
   "homepage": "https://alchemy.run",
   "license": "Apache-2.0",
   "author": "Sam Goodwin <sam@alchemy.run>",
@@ -294,9 +294,9 @@
     "@distilled.cloud/aws": "^0.22.4",
     "@distilled.cloud/axiom": "^0.22.4",
     "@distilled.cloud/cloudflare": "^0.22.4",
-    "@distilled.cloud/cloudflare-rolldown-plugin": "0.10.1",
-    "@distilled.cloud/cloudflare-runtime": "0.10.1",
-    "@distilled.cloud/cloudflare-vite-plugin": "0.10.1",
+    "@distilled.cloud/cloudflare-rolldown-plugin": "0.10.2",
+    "@distilled.cloud/cloudflare-runtime": "0.10.2",
+    "@distilled.cloud/cloudflare-vite-plugin": "0.10.2",
     "@distilled.cloud/core": "^0.22.4",
     "@distilled.cloud/neon": "^0.22.4",
     "@distilled.cloud/planetscale": "^0.22.4",

package/src/Cloudflare/Workers/LocalWorkerProvider.ts

@@ -286,6 +286,7 @@ export const LocalWorkerProvider = () =>
           workerBindings,
           durableObjectNamespaces,
           hyperdrives,
+          env: props.env,
           bundleOptions: {
             id,
             main: props.main!,
@@ -307,7 +308,7 @@ export const LocalWorkerProvider = () =>
 
       type WorkerConfig = Effect.Success<ReturnType<typeof buildConfig>>;
 
-      const runServer = Effect.fnUntraced(function* (worker: WorkerConfig) {
+      const runWorker = Effect.fnUntraced(function* (worker: WorkerConfig) {
         let start = Date.now();
         let status: "start" | "update" = "start";
         const proxy = yield* maybeStartProxy(worker.id, worker.dev);
@@ -357,7 +358,36 @@ export const LocalWorkerProvider = () =>
           Stream.runDrain,
           Effect.forkScoped,
         );
-        return proxy.url.toString();
+        return proxy.url;
+      });
+
+      const runVite = Effect.fnUntraced(function* (
+        worker: WorkerConfig,
+        rootDir: string | undefined,
+      ) {
+        const proxy = yield* maybeStartProxy(worker.id, worker.dev);
+        yield* proxy.unset().pipe(Effect.forkChild);
+        const devServer = yield* Vite.viteDev(
+          rootDir,
+          worker.env ?? {},
+          {
+            compatibilityDate: worker.compatibility.date,
+            compatibilityFlags: worker.compatibility.flags,
+            worker: {
+              name: worker.name,
+              bindings: worker.workerBindings,
+              durableObjectNamespaces: toRuntimeDurableObjectNamespaces(
+                worker.durableObjectNamespaces,
+              ),
+              hyperdrives: worker.hyperdrives,
+              assets: toRuntimeAssets(worker.assets),
+            },
+            context,
+          },
+          { port: 0 },
+        );
+        yield* proxy.set(new URL(devServer.resolvedUrls!.local[0]));
+        return proxy.url;
       });
 
       const rootScope = yield* Effect.scope;
@@ -383,31 +413,9 @@ export const LocalWorkerProvider = () =>
       }) {
         const { props, bindings } = options;
         const config = yield* buildConfig(options);
-        let url: string;
-        if (props.vite) {
-          const devServer = yield* Vite.viteDev(
-            props.vite.rootDir,
-            props.env ?? {},
-            {
-              compatibilityDate: config.compatibility.date,
-              compatibilityFlags: config.compatibility.flags,
-              worker: {
-                name: config.name,
-                bindings: config.workerBindings,
-                durableObjectNamespaces: toRuntimeDurableObjectNamespaces(
-                  config.durableObjectNamespaces,
-                ),
-                hyperdrives: config.hyperdrives,
-                assets: toRuntimeAssets(config.assets),
-              },
-              context,
-            },
-            config.dev,
-          );
-          url = devServer.resolvedUrls!.local[0];
-        } else {
-          url = yield* runServer(config);
-        }
+        const url = yield* (
+          props.vite ? runVite(config, props.vite.rootDir) : runWorker(config)
+        ).pipe(Effect.map((url) => url.toString()));
         return {
           workerId: config.name,
           workerName: config.name,

package/src/Cloudflare/Workers/WorkerAsyncBindings.ts

@@ -41,9 +41,13 @@ export const bindWorkerAsyncBindings = Effect.fnUntraced(function* (
       // Bindings can be passed as a plain resource value, an Effect that
       // yields a resource, or an effect-class (e.g. a `Cloudflare.Worker`
       // class). Resolve the yieldable forms before deriving binding metadata.
-      const binding = isYieldableEffectLike(bindingEff)
-        ? ((yield* bindingEff as Effect.Effect<unknown>) as WorkerBindingResource)
-        : bindingEff;
+      // Avoid yielding outputs as this requires `RuntimeContext`;
+      // allow the engine to resolve them instead.
+      const binding = (
+        isYieldableEffectLike(bindingEff) && !Output.isOutput(bindingEff)
+          ? yield* bindingEff as Effect.Effect<unknown>
+          : bindingEff
+      ) as WorkerBindingResource;
 
       const bindingMeta: InputProps<WorkerBinding> | undefined =
         yield* asEffect(toBinding(bindingName, binding));