alchemy 0.49.1 → 0.50.0

package/src/cloudflare/nuxt.ts

@@ -55,7 +55,7 @@ export async function Nuxt<B extends Bindings>(
     ...props,
     noBundle: props?.noBundle ?? true,
     // Default build command, can be overridden by props.command
-    command: props?.command ?? "bun run build",
+    command: props?.command ?? "nuxt build",
     // Default entry point for cloudflare-module preset
     main: props?.main ?? "./.output/server/index.mjs",
     // Default static assets directory for cloudflare-module preset

package/src/cloudflare/orange.ts

@@ -40,7 +40,10 @@ export async function Orange<B extends Bindings>(
 ): Promise<Orange<B>> {
   return Website(id, {
     ...props,
-    command: props?.command ?? "bun run build",
+    command: props?.command ?? "vite build",
+    dev: props?.dev ?? {
+      command: "vite dev",
+    },
     // The entrypoint and the Wrangler main must differ for the Cloudflare vite plugin
     // to bundle the application correctly, and alchemy must run our bundler on the Vite
     // output since we don't resolve vite imports.

package/src/cloudflare/redwood.ts

@@ -43,7 +43,12 @@ export async function Redwood<B extends Bindings>(
 ): Promise<Redwood<B>> {
   return Website(id, {
     ...props,
-    command: props?.command ?? "bun run clean && RWSDK_DEPLOY=1 bun run build",
+    command:
+      props?.command ??
+      "rm -rf ./node_modules/.vite && RWSDK_DEPLOY=1 vite build",
+    dev: props?.dev ?? {
+      command: "vite dev",
+    },
     noBundle: props?.noBundle ?? true,
     wrangler:
       props?.wrangler === false

package/src/cloudflare/vite.ts

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { detectPackageManager } from "../util/detect-package-manager.ts";
 import type { Assets } from "./assets.ts";
 import type { Bindings } from "./bindings.ts";
 import { Website, type WebsiteProps } from "./website.ts";
@@ -18,14 +17,6 @@ export async function Vite<B extends Bindings>(
   props: ViteProps<B>,
 ): Promise<Vite<B>> {
   const defaultAssets = path.join("dist", "client");
-  const packageManager = await detectPackageManager();
-  const devCommand = {
-    npm: "npx vite dev",
-    bun: "bun vite dev",
-    pnpm: "pnpm vite dev",
-    yarn: "yarn vite dev",
-    deno: "deno vite dev",
-  }[packageManager];
   return Website(id, {
     ...props,
     spa: true,
@@ -36,8 +27,9 @@ export async function Vite<B extends Bindings>(
             dist: props.assets.dist ?? defaultAssets,
           }
         : (props.assets ?? defaultAssets),
+    command: props.command ?? "vite build",
     dev: props.dev ?? {
-      command: devCommand,
+      command: "vite dev",
     },
   });
 }

package/src/cloudflare/website.ts

@@ -231,6 +231,7 @@ export default {
           cwd,
           command: props.command,
           env: {
+            ...(process.env ?? {}),
             ...(props.env ?? {}),
             ...(props.commandEnv ?? {}),
             ...Object.fromEntries(

package/src/cloudflare/worker.ts

@@ -1088,6 +1088,7 @@ export const _Worker = Resource(
           command: props.dev.command,
           cwd: props.dev.cwd || props.cwd || process.cwd(),
           env: {
+            ...(process.env ?? {}),
             ...props.env,
             ...Object.fromEntries(
               Object.entries(props.bindings ?? {}).flatMap(([key, value]) =>
@@ -1834,7 +1835,7 @@ async function createDevCommand(props: {
   id: string;
   command: string;
   cwd: string;
-  env: Record<string, string>;
+  env: Record<string, string | undefined>;
 }): Promise<{ url: string }> {
   const persistFile = path.join(process.cwd(), ".alchemy", `${props.id}.pid`);
   if (await exists(persistFile)) {

package/src/os/exec.ts

@@ -48,7 +48,7 @@ export interface ExecProps {
   /**
    * Environment variables to set
    */
-  env?: Record<string, string | Secret<string>>;
+  env?: Record<string, string | Secret<string> | undefined>;
 
   /**
    * Whether to inherit stdio from parent process
@@ -218,7 +218,7 @@ export const Exec = Resource(
         for (const [key, value] of Object.entries(props.env)) {
           if (typeof value === "string") {
             processedEnv[key] = value;
-          } else {
+          } else if (value) {
             // Handle Secret objects
             processedEnv[key] = value.unencrypted;
           }