alchemy 0.56.0 → 0.57.1

package/src/cloudflare/react-router/react-router.ts

@@ -0,0 +1,41 @@
+import { getPackageManagerRunner } from "../../util/detect-package-manager.ts";
+import type { Assets } from "../assets.ts";
+import type { Bindings } from "../bindings.ts";
+import { Vite, type ViteProps } from "../vite/vite.ts";
+import type { Worker } from "../worker.ts";
+
+export interface ReactRouterProps<B extends Bindings> extends ViteProps<B> {
+  /**
+   * @default workers/app.ts
+   */
+  main?: string;
+}
+
+// don't allow the ASSETS to be overriden
+export type ReactRouter<B extends Bindings> = B extends { ASSETS: any }
+  ? never
+  : Worker<B & { ASSETS: Assets }>;
+
+export async function ReactRouter<B extends Bindings>(
+  id: string,
+  props: ReactRouterProps<B> = {},
+): Promise<ReactRouter<B>> {
+  const runner = await getPackageManagerRunner();
+  return await Vite(id, {
+    ...props,
+    build:
+      props.build ??
+      `${runner} react-router typegen && ${runner} react-router build`,
+    dev:
+      props.dev ??
+      `${runner} react-router typegen && ${runner} react-router dev`,
+    compatibility: "node",
+    entrypoint: props.entrypoint ?? "build/server/index.js",
+    noBundle: props.noBundle ?? true,
+    assets: props.assets ?? "build/client",
+    wrangler: {
+      main: props.wrangler?.main ?? props.main ?? "workers/app.ts",
+      transform: props.wrangler?.transform,
+    },
+  });
+}

package/src/cloudflare/redwood/plugin.ts

@@ -0,0 +1,20 @@
+import { redwood, type RedwoodPluginOptions } from "rwsdk/vite";
+import { DEFAULT_CONFIG_PATH } from "../miniflare/paths.ts";
+import alchemyVite from "../vite/plugin.ts";
+
+const alchemyRedwood = (options?: RedwoodPluginOptions) => {
+  const configPath = options?.configPath ?? DEFAULT_CONFIG_PATH;
+  return [
+    redwood({
+      ...options,
+      configPath,
+      includeCloudflarePlugin: false,
+    }),
+    alchemyVite({
+      configPath,
+      viteEnvironment: { name: "worker" },
+    }),
+  ];
+};
+
+export default alchemyRedwood;

package/src/cloudflare/{redwood.ts → redwood/redwood.ts}

@@ -1,10 +1,10 @@
 import path from "node:path";
-import type { Assets } from "./assets.ts";
-import type { Bindings } from "./bindings.ts";
-import { Website, type WebsiteProps } from "./website.ts";
-import type { Worker } from "./worker.ts";
+import type { Assets } from "../assets.ts";
+import type { Bindings } from "../bindings.ts";
+import { Vite, type ViteProps } from "../vite/vite.ts";
+import type { Worker } from "../worker.ts";
 
-export interface RedwoodProps<B extends Bindings> extends WebsiteProps<B> {}
+export interface RedwoodProps<B extends Bindings> extends ViteProps<B> {}
 
 // don't allow the ASSETS to be overridden
 export type Redwood<B extends Bindings> = B extends { ASSETS: any }
@@ -41,24 +41,21 @@ export async function Redwood<B extends Bindings>(
   id: string,
   props?: Partial<RedwoodProps<B>>,
 ): Promise<Redwood<B>> {
-  return Website(id, {
+  return await Vite(id, {
     ...props,
-    command:
-      props?.command ??
-      "rm -rf ./node_modules/.vite && RWSDK_DEPLOY=1 vite build",
-    dev: props?.dev ?? {
-      command: "vite dev",
+    build: props?.build ?? {
+      command: "rm -rf ./node_modules/.vite && vite build",
+      env: {
+        RWSDK_DEPLOY: "1",
+      },
     },
     noBundle: props?.noBundle ?? true,
-    wrangler:
-      props?.wrangler === false
-        ? false
-        : {
-            main: props?.main ?? path.join("src", "worker.tsx"),
-          },
-    main: props?.main ?? path.join("dist", "worker", "worker.js"),
-    assets: props?.assets ?? path.join("dist", "client"),
+    entrypoint: props?.entrypoint ?? path.join("dist", "worker", "worker.js"),
     compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
     compatibilityDate: props?.compatibilityDate ?? "2025-04-02",
+    wrangler: {
+      main: props?.wrangler?.main ?? "src/worker.tsx",
+      transform: props?.wrangler?.transform,
+    },
   });
 }

package/src/cloudflare/sveltekit/plugin.ts

@@ -0,0 +1,12 @@
+import adapter, { type AdapterOptions } from "@sveltejs/adapter-cloudflare";
+import { getPlatformProxyOptions } from "../cloudflare-env-proxy.ts";
+
+const alchemy = (options?: AdapterOptions) => {
+  const platformProxy = getPlatformProxyOptions(options?.platformProxy);
+  return adapter({
+    platformProxy,
+    ...options,
+  });
+};
+
+export default alchemy;

package/src/cloudflare/{sveltekit.ts → sveltekit/sveltekit.ts}

@@ -1,10 +1,10 @@
 import { join } from "node:path";
-import type { Assets } from "./assets.ts";
-import type { Bindings } from "./bindings.ts";
-import { Website, type WebsiteProps } from "./website.ts";
-import type { Worker } from "./worker.ts";
+import type { Assets } from "../assets.ts";
+import type { Bindings } from "../bindings.ts";
+import { Vite, type ViteProps } from "../vite/vite.ts";
+import type { Worker } from "../worker.ts";
 
-export interface SvelteKitProps<B extends Bindings> extends WebsiteProps<B> {}
+export interface SvelteKitProps<B extends Bindings> extends ViteProps<B> {}
 
 // don't allow the ASSETS to be overriden
 export type SvelteKit<B extends Bindings> = B extends { ASSETS: any }
@@ -61,12 +61,13 @@ export async function SvelteKit<B extends Bindings>(
     }
   }
 
-  return Website(id, {
+  return await Vite(id, {
     ...props,
-    command: props?.command ?? "bun run build",
-    main: props?.main ?? join(".svelte-kit", "cloudflare", "_worker.js"),
+    entrypoint:
+      props?.entrypoint ?? join(".svelte-kit", "cloudflare", "_worker.js"),
     assets: props?.assets ?? join(".svelte-kit", "cloudflare"),
     compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
     compatibilityDate: props?.compatibilityDate,
+    wrangler: { secrets: true },
   });
 }

package/src/cloudflare/{local-dev-cloudflare-shim.ts → tanstack-start/plugin.ts}

@@ -1,4 +1,5 @@
-import { dedent } from "../util/dedent.ts";
+import type { GetPlatformProxyOptions } from "wrangler";
+import { dedent } from "../../util/dedent.ts";
 
 /**
  * TanStackStart server functions and middleware run in Node.js intead of Miniflare when using `vite dev`.
@@ -7,7 +8,7 @@ import { dedent } from "../util/dedent.ts";
  *
  * @see https://developers.cloudflare.com/workers/framework-guides/web-apps/tanstack/#using-cloudflare-bindings
  */
-export function cloudflareWorkersDevEnvironmentShim() {
+export default function alchemy(options: GetPlatformProxyOptions = {}) {
   return {
     name: "cloudflare-workers-dev-shim",
     apply: "serve", // dev‑only
@@ -17,14 +18,12 @@ export function cloudflareWorkersDevEnvironmentShim() {
     },
     load(id: string) {
       if (id === "cloudflare:workers") {
-        const processEnv = JSON.stringify(process.env);
-
-        // @see https://developers.cloudflare.com/workers/wrangler/api/#getplatformproxy
         return dedent`
-          import { getPlatformProxy } from "wrangler";
-          const cloudflare = await getPlatformProxy({ experimental: { remoteBindings: true } });
-          export const env = Object.assign(${processEnv}, cloudflare.env);
-        `.trim();
+          import { getCloudflareEnvProxy } from "alchemy/cloudflare";
+          export const env = await getCloudflareEnvProxy(${JSON.stringify(
+            options,
+          )});
+        `;
       }
     },
   } as const;

package/src/cloudflare/tanstack-start/tanstack-start.ts

@@ -0,0 +1,24 @@
+import type { Assets } from "../assets.ts";
+import type { Bindings } from "../bindings.ts";
+import { Vite, type ViteProps } from "../vite/vite.ts";
+import type { Worker } from "../worker.ts";
+
+export interface TanStackStartProps<B extends Bindings> extends ViteProps<B> {}
+
+// don't allow the ASSETS to be overriden
+export type TanStackStart<B extends Bindings> = B extends { ASSETS: any }
+  ? never
+  : Worker<B & { ASSETS: Assets }>;
+
+export async function TanStackStart<B extends Bindings>(
+  id: string,
+  props?: Partial<TanStackStartProps<B>>,
+): Promise<TanStackStart<B>> {
+  return await Vite(id, {
+    ...props,
+    noBundle: true,
+    entrypoint: props?.entrypoint ?? ".output/server/index.mjs",
+    compatibilityFlags: ["nodejs_compat", ...(props?.compatibilityFlags ?? [])],
+    assets: props?.assets ?? ".output/public",
+  });
+}

package/src/cloudflare/vite/plugin.ts

@@ -0,0 +1,30 @@
+import { cloudflare, type PluginConfig } from "@cloudflare/vite-plugin";
+import path from "node:path";
+import {
+  DEFAULT_PERSIST_PATH,
+  validateConfigPath,
+  validatePersistPath,
+} from "../miniflare/paths.ts";
+
+const alchemy = (config?: PluginConfig) => {
+  const persistState = config?.persistState ?? {
+    path: validatePersistPath(
+      typeof config?.persistState === "object"
+        ? config.persistState.path
+        : DEFAULT_PERSIST_PATH,
+    ),
+  };
+  if (typeof persistState === "object" && persistState.path.endsWith("v3")) {
+    persistState.path = path.dirname(persistState.path);
+  }
+  return cloudflare({
+    ...config,
+    configPath: validateConfigPath(config?.configPath),
+    persistState,
+    experimental: config?.experimental ?? {
+      remoteBindings: true,
+    },
+  });
+};
+
+export default alchemy;

package/src/cloudflare/vite/vite.ts

@@ -0,0 +1,34 @@
+import { getPackageManagerRunner } 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";
+import type { Worker } from "../worker.ts";
+
+export interface ViteProps<B extends Bindings>
+  extends Omit<WebsiteProps<B>, "spa"> {}
+
+export type Vite<B extends Bindings> = B extends { ASSETS: any }
+  ? never
+  : Worker<B & { ASSETS: Assets }>;
+
+export async function Vite<B extends Bindings>(
+  id: string,
+  props: ViteProps<B>,
+): Promise<Vite<B>> {
+  const runner = await getPackageManagerRunner();
+  return await Website(id, {
+    ...props,
+    spa: true,
+    assets:
+      typeof props.assets === "string"
+        ? { directory: props.assets }
+        : {
+            ...(props.assets ?? {}),
+            directory:
+              props.assets?.directory ??
+              (props.entrypoint || props.script ? "dist/client" : "dist"),
+          },
+    build: props.build ?? `${runner} vite build`,
+    dev: props.dev ?? `${runner} vite dev`,
+  });
+}