npm - create-better-t-stack - Versions diffs - 3.11.1 → 3.12.1 - Mend

create-better-t-stack 3.11.1 → 3.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (69) hide show

package/templates/frontend/react/tanstack-start/src/routes/__root.tsx.hbs CHANGED Viewed

@@ -43,6 +43,8 @@ import { getToken } from "@/lib/auth-server";
 const getAuth = createServerFn({ method: "GET" }).handler(async () => {
   return await getToken();
 });
+{{else if (eq backend "convex")}}
+import { ConvexProvider } from "convex/react";
 {{/if}}
 {{#if (eq backend "convex")}}
@@ -162,6 +164,26 @@ function RootDocument() {
       </html>
     </ConvexBetterAuthProvider>
   );
+  {{else if (eq backend "convex")}}
+  const { convexQueryClient } = Route.useRouteContext();
+  return (
+    <ConvexProvider client={convexQueryClient.convexClient}>
+      <html lang="en" className="dark">
+        <head>
+          <HeadContent />
+        </head>
+        <body>
+          <div className="grid h-svh grid-rows-[auto_1fr]">
+            <Header />
+            <Outlet />
+          </div>
+          <Toaster richColors />
+          <TanStackRouterDevtools position="bottom-left" />
+          <Scripts />
+        </body>
+      </html>
+    </ConvexProvider>
+  );
   {{else}}
   return (
     <html lang="en" className="dark">
@@ -175,10 +197,8 @@ function RootDocument() {
         </div>
         <Toaster richColors />
         <TanStackRouterDevtools position="bottom-left" />
-        {{#unless (eq backend "convex")}}
-          {{#unless (eq api "none")}}
+        {{#unless (eq api "none")}}
         <ReactQueryDevtools position="bottom" buttonPosition="bottom-right" />
-          {{/unless}}
         {{/unless}}
         <Scripts />
       </body>

package/templates/packages/config/tsconfig.base.json.hbs CHANGED Viewed

@@ -26,7 +26,7 @@
         "node"
       {{else}}
         "node"
-      {{/if}}{{#if (or (eq serverDeploy "alchemy") (eq webDeploy "alchemy"))}},
+      {{/if}}{{#if (or (eq serverDeploy "cloudflare") (eq webDeploy "cloudflare"))}},
       "@cloudflare/workers-types"{{/if}}
     ]
   }

package/templates/{deploy/alchemy → packages/env}/env.d.ts.hbs RENAMED Viewed

@@ -1,14 +1,16 @@
+import { type server } from "@{{projectName}}/infra/alchemy.run";
 // This file infers types for the cloudflare:workers environment from your Alchemy Worker.
 // @see https://alchemy.run/concepts/bindings/#type-safe-bindings
 export type CloudflareEnv = typeof server.Env;
 declare global {
-	type Env = CloudflareEnv;
+  type Env = CloudflareEnv;
 }
 declare module "cloudflare:workers" {
-	namespace Cloudflare {
-		export interface Env extends CloudflareEnv {}
-	}
+  namespace Cloudflare {
+    export interface Env extends CloudflareEnv {}
+  }
 }

package/templates/packages/env/package.json.hbs ADDED Viewed

@@ -0,0 +1,7 @@
+{
+	"name": "@{{projectName}}/env",
+	"version": "0.0.0",
+	"private": true,
+	"type": "module",
+	"exports": {}
+}

package/templates/packages/env/src/native.ts.hbs ADDED Viewed

@@ -0,0 +1,21 @@
+import { createEnv } from "@t3-oss/env-core";
+import { z } from "zod";
+export const env = createEnv({
+	clientPrefix: "EXPO_PUBLIC_",
+	client: {
+{{#if (eq backend "convex")}}
+		EXPO_PUBLIC_CONVEX_URL: z.url(),
+{{#if (eq auth "better-auth")}}
+		EXPO_PUBLIC_CONVEX_SITE_URL: z.url(),
+{{/if}}
+{{#if (eq auth "clerk")}}
+		EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY: z.string().min(1),
+{{/if}}
+{{else}}
+		EXPO_PUBLIC_SERVER_URL: z.url(),
+{{/if}}
+	},
+	runtimeEnv: process.env,
+	emptyStringAsUndefined: true,
+});

package/templates/packages/env/src/server.ts.hbs ADDED Viewed

@@ -0,0 +1,38 @@
+{{#if (eq serverDeploy "cloudflare")}}
+/// <reference path="../env.d.ts" />
+// For Cloudflare Workers, env is accessed via cloudflare:workers module
+// Types are defined in env.d.ts based on your alchemy.run.ts bindings
+export { env } from "cloudflare:workers";
+{{else}}
+import { createEnv } from "@t3-oss/env-core";
+import { z } from "zod";
+export const env = createEnv({
+	server: {
+{{#if (ne database "none")}}
+{{#if (eq dbSetup "planetscale")}}
+		DATABASE_HOST: z.string().min(1),
+		DATABASE_USERNAME: z.string().min(1),
+		DATABASE_PASSWORD: z.string().min(1),
+{{else}}
+		DATABASE_URL: z.string().min(1),
+{{#if (eq dbSetup "turso")}}
+		DATABASE_AUTH_TOKEN: z.string().min(1),
+{{/if}}
+{{/if}}
+{{/if}}
+{{#if (eq auth "better-auth")}}
+		BETTER_AUTH_SECRET: z.string().min(32),
+		BETTER_AUTH_URL: z.url(),
+{{/if}}
+{{#if (eq payments "polar")}}
+		POLAR_ACCESS_TOKEN: z.string().min(1),
+		POLAR_SUCCESS_URL: z.url(),
+{{/if}}
+		CORS_ORIGIN: z.url(),
+		NODE_ENV: z.enum(["development", "production", "test"]).default("development"),
+	},
+	runtimeEnv: process.env,
+	emptyStringAsUndefined: true,
+});
+{{/if}}

package/templates/packages/env/src/web.ts.hbs ADDED Viewed

@@ -0,0 +1,98 @@
+{{#if (includes frontend "next")}}
+import { createEnv } from "@t3-oss/env-nextjs";
+{{else if (includes frontend "nuxt")}}
+import { createEnv } from "@t3-oss/env-nuxt";
+{{else}}
+import { createEnv } from "@t3-oss/env-core";
+{{/if}}
+import { z } from "zod";
+{{#if (includes frontend "nuxt")}}
+/**
+ * Nuxt env validation - validates at build time when imported in nuxt.config.ts
+ * For runtime access in components/plugins, use useRuntimeConfig() instead:
+ *   const config = useRuntimeConfig()
+ *   config.public.serverUrl (NUXT_PUBLIC_SERVER_URL maps to serverUrl)
+ */
+{{/if}}
+export const env = createEnv({
+{{#if (eq backend "convex")}}
+{{#if (includes frontend "next")}}
+	client: {
+		NEXT_PUBLIC_CONVEX_URL: z.url(),
+{{#if (eq auth "better-auth")}}
+		NEXT_PUBLIC_CONVEX_SITE_URL: z.url(),
+{{/if}}
+{{#if (eq auth "clerk")}}
+		NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: z.string().min(1),
+{{/if}}
+	},
+	runtimeEnv: {
+		NEXT_PUBLIC_CONVEX_URL: process.env.NEXT_PUBLIC_CONVEX_URL,
+{{#if (eq auth "better-auth")}}
+		NEXT_PUBLIC_CONVEX_SITE_URL: process.env.NEXT_PUBLIC_CONVEX_SITE_URL,
+{{/if}}
+{{#if (eq auth "clerk")}}
+		NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY,
+{{/if}}
+	},
+{{else if (includes frontend "nuxt")}}
+	client: {
+		NUXT_PUBLIC_CONVEX_URL: z.url(),
+	},
+{{else if (includes frontend "svelte")}}
+	clientPrefix: "PUBLIC_",
+	client: {
+		PUBLIC_CONVEX_URL: z.url(),
+	},
+	runtimeEnv: (import.meta as any).env,
+{{else}}
+	clientPrefix: "VITE_",
+	client: {
+		VITE_CONVEX_URL: z.url(),
+{{#if (eq auth "better-auth")}}
+		VITE_CONVEX_SITE_URL: z.url(),
+{{/if}}
+{{#if (eq auth "clerk")}}
+		VITE_CLERK_PUBLISHABLE_KEY: z.string().min(1),
+{{/if}}
+	},
+	runtimeEnv: (import.meta as any).env,
+{{/if}}
+{{else if (or (eq backend "self") (eq backend "self-next") (eq backend "self-tanstack-start"))}}
+{{#if (includes frontend "next")}}
+	client: {},
+	runtimeEnv: {},
+{{else}}
+	clientPrefix: "VITE_",
+	client: {},
+	runtimeEnv: (import.meta as any).env,
+{{/if}}
+{{else if (ne backend "none")}}
+{{#if (includes frontend "next")}}
+	client: {
+		NEXT_PUBLIC_SERVER_URL: z.url(),
+	},
+	runtimeEnv: {
+		NEXT_PUBLIC_SERVER_URL: process.env.NEXT_PUBLIC_SERVER_URL,
+	},
+{{else if (includes frontend "nuxt")}}
+	client: {
+		NUXT_PUBLIC_SERVER_URL: z.url(),
+	},
+{{else if (includes frontend "svelte")}}
+	clientPrefix: "PUBLIC_",
+	client: {
+		PUBLIC_SERVER_URL: z.url(),
+	},
+	runtimeEnv: (import.meta as any).env,
+{{else}}
+	clientPrefix: "VITE_",
+	client: {
+		VITE_SERVER_URL: z.url(),
+	},
+	runtimeEnv: (import.meta as any).env,
+{{/if}}
+{{/if}}
+	emptyStringAsUndefined: true,
+});

package/templates/packages/env/tsconfig.json.hbs ADDED Viewed

@@ -0,0 +1,3 @@
+{
+  "extends": "@{{projectName}}/config/tsconfig.base.json",
+}

package/templates/{deploy/alchemy → packages/infra}/alchemy.run.ts.hbs RENAMED Viewed

@@ -1,5 +1,5 @@
 import alchemy from "alchemy";
-{{#if (eq webDeploy "alchemy")}}
+{{#if (eq webDeploy "cloudflare")}}
 {{#if (includes frontend "next")}}
 import { Nextjs } from "alchemy/cloudflare";
 {{else if (includes frontend "nuxt")}}
@@ -16,236 +16,240 @@ import { ReactRouter } from "alchemy/cloudflare";
 import { Vite } from "alchemy/cloudflare";
 {{/if}}
 {{/if}}
-{{#if (eq serverDeploy "alchemy")}}
+{{#if (eq serverDeploy "cloudflare")}}
 import { Worker } from "alchemy/cloudflare";
 {{/if}}
-{{#if (and (or (eq serverDeploy "alchemy") (and (eq webDeploy "alchemy") (eq backend "self"))) (eq dbSetup "d1"))}}
+{{#if (and (or (eq serverDeploy "cloudflare") (and (eq webDeploy "cloudflare") (eq backend "self"))) (eq dbSetup "d1"))}}
 import { D1Database } from "alchemy/cloudflare";
 {{/if}}
 import { config } from "dotenv";
-{{#if (and (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}
+{{#if (and (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare"))}}
 config({ path: "./.env" });
-config({ path: "./apps/web/.env" });
-config({ path: "./apps/server/.env" });
-{{else if (or (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}
+config({ path: "../../apps/web/.env" });
+config({ path: "../../apps/server/.env" });
+{{else if (eq webDeploy "cloudflare")}}
 config({ path: "./.env" });
+config({ path: "../../apps/web/.env" });
+{{else if (eq serverDeploy "cloudflare")}}
+config({ path: "./.env" });
+config({ path: "../../apps/server/.env" });
 {{/if}}
 const app = await alchemy("{{projectName}}");
-{{#if (and (or (eq serverDeploy "alchemy") (and (eq webDeploy "alchemy") (eq backend "self"))) (eq dbSetup "d1"))}}
+{{#if (and (or (eq serverDeploy "cloudflare") (and (eq webDeploy "cloudflare") (eq backend "self"))) (eq dbSetup "d1"))}}
 const db = await D1Database("database", {
 	{{#if (eq orm "prisma")}}
-	migrationsDir: "packages/db/prisma/migrations",
+	migrationsDir: "../../packages/db/prisma/migrations",
 	{{else if (eq orm "drizzle")}}
-	migrationsDir: "packages/db/src/migrations",
+	migrationsDir: "../../packages/db/src/migrations",
 	{{/if}}
 });
 {{/if}}
-{{#if (eq webDeploy "alchemy")}}
+{{#if (eq webDeploy "cloudflare")}}
 {{#if (includes frontend "next")}}
 export const web = await Nextjs("web", {
-  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  cwd: "../../apps/web",
   bindings: {
     {{#if (eq backend "convex")}}
-    NEXT_PUBLIC_CONVEX_URL: alchemy.env.NEXT_PUBLIC_CONVEX_URL,
+    NEXT_PUBLIC_CONVEX_URL: alchemy.env.NEXT_PUBLIC_CONVEX_URL!,
     {{#if (eq auth "better-auth")}}
-    NEXT_PUBLIC_CONVEX_SITE_URL: alchemy.env.NEXT_PUBLIC_CONVEX_SITE_URL,
+    NEXT_PUBLIC_CONVEX_SITE_URL: alchemy.env.NEXT_PUBLIC_CONVEX_SITE_URL!,
     {{/if}}
     {{else if (ne backend "self")}}
-    NEXT_PUBLIC_SERVER_URL: alchemy.env.NEXT_PUBLIC_SERVER_URL,
+    NEXT_PUBLIC_SERVER_URL: alchemy.env.NEXT_PUBLIC_SERVER_URL!,
     {{/if}}
     {{#if (eq dbSetup "d1")}}
     DB: db,
     {{else if (ne database "none")}}
-    DATABASE_URL: alchemy.secret.env.DATABASE_URL,
+    DATABASE_URL: alchemy.secret.env.DATABASE_URL!,
     {{/if}}
     {{#if (ne backend "convex")}}
-    CORS_ORIGIN: alchemy.env.CORS_ORIGIN,
+    CORS_ORIGIN: alchemy.env.CORS_ORIGIN!,
     {{#if (eq auth "better-auth")}}
-    BETTER_AUTH_SECRET: alchemy.secret.env.BETTER_AUTH_SECRET,
-    BETTER_AUTH_URL: alchemy.env.BETTER_AUTH_URL,
+    BETTER_AUTH_SECRET: alchemy.secret.env.BETTER_AUTH_SECRET!,
+    BETTER_AUTH_URL: alchemy.env.BETTER_AUTH_URL!,
     {{/if}}
     {{/if}}
     {{#if (eq auth "clerk")}}
-    CLERK_SECRET_KEY: alchemy.secret.env.CLERK_SECRET_KEY,
+    CLERK_SECRET_KEY: alchemy.secret.env.CLERK_SECRET_KEY!,
     {{/if}}
     {{#if (and (includes examples "ai") (ne backend "convex"))}}
-    GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY,
+    GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY!,
     {{/if}}
     {{#if (eq payments "polar")}}
-    POLAR_ACCESS_TOKEN: alchemy.secret.env.POLAR_ACCESS_TOKEN,
-    POLAR_SUCCESS_URL: alchemy.env.POLAR_SUCCESS_URL,
+    POLAR_ACCESS_TOKEN: alchemy.secret.env.POLAR_ACCESS_TOKEN!,
+    POLAR_SUCCESS_URL: alchemy.env.POLAR_SUCCESS_URL!,
     {{/if}}
     {{#if (eq dbSetup "turso")}}
-    DATABASE_AUTH_TOKEN: alchemy.secret.env.DATABASE_AUTH_TOKEN,
+    DATABASE_AUTH_TOKEN: alchemy.secret.env.DATABASE_AUTH_TOKEN!,
     {{/if}}
     {{#if (eq database "mysql")}}
     {{#if (eq orm "drizzle")}}
-    DATABASE_HOST: alchemy.env.DATABASE_HOST,
-    DATABASE_USERNAME: alchemy.env.DATABASE_USERNAME,
-    DATABASE_PASSWORD: alchemy.secret.env.DATABASE_PASSWORD,
+    DATABASE_HOST: alchemy.env.DATABASE_HOST!,
+    DATABASE_USERNAME: alchemy.env.DATABASE_USERNAME!,
+    DATABASE_PASSWORD: alchemy.secret.env.DATABASE_PASSWORD!,
     {{/if}}
     {{/if}}
   }
 });
 {{else if (includes frontend "nuxt")}}
 export const web = await Nuxt("web", {
-  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  cwd: "../../apps/web",
   bindings: {
     {{#if (eq backend "convex")}}
-    NUXT_PUBLIC_CONVEX_URL: alchemy.env.NUXT_PUBLIC_CONVEX_URL,
+    NUXT_PUBLIC_CONVEX_URL: alchemy.env.NUXT_PUBLIC_CONVEX_URL!,
     {{#if (eq auth "better-auth")}}
-    NUXT_PUBLIC_CONVEX_SITE_URL: alchemy.env.NUXT_PUBLIC_CONVEX_SITE_URL,
+    NUXT_PUBLIC_CONVEX_SITE_URL: alchemy.env.NUXT_PUBLIC_CONVEX_SITE_URL!,
     {{/if}}
     {{else if (ne backend "self")}}
-    NUXT_PUBLIC_SERVER_URL: alchemy.env.NUXT_PUBLIC_SERVER_URL,
+    NUXT_PUBLIC_SERVER_URL: alchemy.env.NUXT_PUBLIC_SERVER_URL!,
     {{/if}}
   }
 });
 {{else if (includes frontend "svelte")}}
 export const web = await SvelteKit("web", {
-  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  cwd: "../../apps/web",
   bindings: {
     {{#if (eq backend "convex")}}
-    PUBLIC_CONVEX_URL: alchemy.env.PUBLIC_CONVEX_URL,
+    PUBLIC_CONVEX_URL: alchemy.env.PUBLIC_CONVEX_URL!,
     {{#if (eq auth "better-auth")}}
-    PUBLIC_CONVEX_SITE_URL: alchemy.env.PUBLIC_CONVEX_SITE_URL,
+    PUBLIC_CONVEX_SITE_URL: alchemy.env.PUBLIC_CONVEX_SITE_URL!,
     {{/if}}
     {{else if (ne backend "self")}}
-    PUBLIC_SERVER_URL: alchemy.env.PUBLIC_SERVER_URL,
+    PUBLIC_SERVER_URL: alchemy.env.PUBLIC_SERVER_URL!,
     {{/if}}
   }
 });
 {{else if (includes frontend "tanstack-start")}}
 export const web = await TanStackStart("web", {
-  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  cwd: "../../apps/web",
   bindings: {
     {{#if (eq backend "convex")}}
-    VITE_CONVEX_URL: alchemy.env.VITE_CONVEX_URL,
+    VITE_CONVEX_URL: alchemy.env.VITE_CONVEX_URL!,
     {{#if (eq auth "better-auth")}}
-    VITE_CONVEX_SITE_URL: alchemy.env.VITE_CONVEX_SITE_URL,
+    VITE_CONVEX_SITE_URL: alchemy.env.VITE_CONVEX_SITE_URL!,
     {{/if}}
     {{else if (ne backend "self")}}
-    VITE_SERVER_URL: alchemy.env.VITE_SERVER_URL,
+    VITE_SERVER_URL: alchemy.env.VITE_SERVER_URL!,
     {{/if}}
     {{#if (eq dbSetup "d1")}}
     DB: db,
     {{else if (ne database "none")}}
-    DATABASE_URL: alchemy.secret.env.DATABASE_URL,
+    DATABASE_URL: alchemy.secret.env.DATABASE_URL!,
     {{/if}}
     {{#if (ne backend "convex")}}
-    CORS_ORIGIN: alchemy.env.CORS_ORIGIN,
+    CORS_ORIGIN: alchemy.env.CORS_ORIGIN!,
     {{#if (eq auth "better-auth")}}
-    BETTER_AUTH_SECRET: alchemy.secret.env.BETTER_AUTH_SECRET,
-    BETTER_AUTH_URL: alchemy.env.BETTER_AUTH_URL,
+    BETTER_AUTH_SECRET: alchemy.secret.env.BETTER_AUTH_SECRET!,
+    BETTER_AUTH_URL: alchemy.env.BETTER_AUTH_URL!,
     {{/if}}
     {{/if}}
     {{#if (eq auth "clerk")}}
-    CLERK_SECRET_KEY: alchemy.secret.env.CLERK_SECRET_KEY,
+    CLERK_SECRET_KEY: alchemy.secret.env.CLERK_SECRET_KEY!,
     {{/if}}
     {{#if (and (includes examples "ai") (ne backend "convex"))}}
-    GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY,
+    GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY!,
     {{/if}}
     {{#if (eq payments "polar")}}
-    POLAR_ACCESS_TOKEN: alchemy.secret.env.POLAR_ACCESS_TOKEN,
-    POLAR_SUCCESS_URL: alchemy.env.POLAR_SUCCESS_URL,
+    POLAR_ACCESS_TOKEN: alchemy.secret.env.POLAR_ACCESS_TOKEN!,
+    POLAR_SUCCESS_URL: alchemy.env.POLAR_SUCCESS_URL!,
     {{/if}}
     {{#if (eq dbSetup "turso")}}
-    DATABASE_AUTH_TOKEN: alchemy.secret.env.DATABASE_AUTH_TOKEN,
+    DATABASE_AUTH_TOKEN: alchemy.secret.env.DATABASE_AUTH_TOKEN!,
     {{/if}}
     {{#if (eq database "mysql")}}
     {{#if (eq orm "drizzle")}}
-    DATABASE_HOST: alchemy.env.DATABASE_HOST,
-    DATABASE_USERNAME: alchemy.env.DATABASE_USERNAME,
-    DATABASE_PASSWORD: alchemy.secret.env.DATABASE_PASSWORD,
+    DATABASE_HOST: alchemy.env.DATABASE_HOST!,
+    DATABASE_USERNAME: alchemy.env.DATABASE_USERNAME!,
+    DATABASE_PASSWORD: alchemy.secret.env.DATABASE_PASSWORD!,
     {{/if}}
     {{/if}}
   }
 });
 {{else if (includes frontend "tanstack-router")}}
 export const web = await Vite("web", {
-  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  cwd: "../../apps/web",
   assets: "dist",
   bindings: {
     {{#if (eq backend "convex")}}
-    VITE_CONVEX_URL: alchemy.env.VITE_CONVEX_URL,
+    VITE_CONVEX_URL: alchemy.env.VITE_CONVEX_URL!,
     {{#if (eq auth "better-auth")}}
-    VITE_CONVEX_SITE_URL: alchemy.env.VITE_CONVEX_SITE_URL,
+    VITE_CONVEX_SITE_URL: alchemy.env.VITE_CONVEX_SITE_URL!,
     {{/if}}
     {{else if (ne backend "self")}}
-    VITE_SERVER_URL: alchemy.env.VITE_SERVER_URL,
+    VITE_SERVER_URL: alchemy.env.VITE_SERVER_URL!,
     {{/if}}
   }
 });
 {{else if (includes frontend "react-router")}}
 export const web = await ReactRouter("web", {
-  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  cwd: "../../apps/web",
   bindings: {
     {{#if (eq backend "convex")}}
-    VITE_CONVEX_URL: alchemy.env.VITE_CONVEX_URL,
+    VITE_CONVEX_URL: alchemy.env.VITE_CONVEX_URL!,
     {{#if (eq auth "better-auth")}}
-    VITE_CONVEX_SITE_URL: alchemy.env.VITE_CONVEX_SITE_URL,
+    VITE_CONVEX_SITE_URL: alchemy.env.VITE_CONVEX_SITE_URL!,
     {{/if}}
     {{else if (ne backend "self")}}
-    VITE_SERVER_URL: alchemy.env.VITE_SERVER_URL,
+    VITE_SERVER_URL: alchemy.env.VITE_SERVER_URL!,
     {{/if}}
   }
 });
 {{else if (includes frontend "solid")}}
 export const web = await Vite("web", {
-  {{#if (eq serverDeploy "alchemy")}}cwd: "apps/web",{{/if}}
+  cwd: "../../apps/web",
   assets: "dist",
   bindings: {
     {{#if (eq backend "convex")}}
-    VITE_CONVEX_URL: alchemy.env.VITE_CONVEX_URL,
+    VITE_CONVEX_URL: alchemy.env.VITE_CONVEX_URL!,
     {{#if (eq auth "better-auth")}}
-    VITE_CONVEX_SITE_URL: alchemy.env.VITE_CONVEX_SITE_URL,
+    VITE_CONVEX_SITE_URL: alchemy.env.VITE_CONVEX_SITE_URL!,
     {{/if}}
     {{else if (ne backend "self")}}
-    VITE_SERVER_URL: alchemy.env.VITE_SERVER_URL,
+    VITE_SERVER_URL: alchemy.env.VITE_SERVER_URL!,
     {{/if}}
   }
 });
 {{/if}}
 {{/if}}
-{{#if (eq serverDeploy "alchemy")}}
+{{#if (eq serverDeploy "cloudflare")}}
 export const server = await Worker("server", {
-  {{#if (eq webDeploy "alchemy")}}cwd: "apps/server",{{/if}}
+  cwd: "../../apps/server",
   entrypoint: "src/index.ts",
   compatibility: "node",
   bindings: {
     {{#if (eq dbSetup "d1")}}
     DB: db,
     {{else if (ne database "none")}}
-    DATABASE_URL: alchemy.secret.env.DATABASE_URL,
+    DATABASE_URL: alchemy.secret.env.DATABASE_URL!,
     {{/if}}
-    CORS_ORIGIN: alchemy.env.CORS_ORIGIN,
+    CORS_ORIGIN: alchemy.env.CORS_ORIGIN!,
     {{#if (eq auth "better-auth")}}
-    BETTER_AUTH_SECRET: alchemy.secret.env.BETTER_AUTH_SECRET,
-    BETTER_AUTH_URL: alchemy.env.BETTER_AUTH_URL,
+    BETTER_AUTH_SECRET: alchemy.secret.env.BETTER_AUTH_SECRET!,
+    BETTER_AUTH_URL: alchemy.env.BETTER_AUTH_URL!,
     {{/if}}
     {{#if (eq auth "clerk")}}
-    CLERK_SECRET_KEY: alchemy.secret.env.CLERK_SECRET_KEY,
+    CLERK_SECRET_KEY: alchemy.secret.env.CLERK_SECRET_KEY!,
     {{/if}}
     {{#if (includes examples "ai")}}
-    GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY,
+    GOOGLE_GENERATIVE_AI_API_KEY: alchemy.secret.env.GOOGLE_GENERATIVE_AI_API_KEY!,
     {{/if}}
     {{#if (eq payments "polar")}}
-    POLAR_ACCESS_TOKEN: alchemy.secret.env.POLAR_ACCESS_TOKEN,
-    POLAR_SUCCESS_URL: alchemy.env.POLAR_SUCCESS_URL,
+    POLAR_ACCESS_TOKEN: alchemy.secret.env.POLAR_ACCESS_TOKEN!,
+    POLAR_SUCCESS_URL: alchemy.env.POLAR_SUCCESS_URL!,
     {{/if}}
     {{#if (eq dbSetup "turso")}}
-    DATABASE_AUTH_TOKEN: alchemy.secret.env.DATABASE_AUTH_TOKEN,
+    DATABASE_AUTH_TOKEN: alchemy.secret.env.DATABASE_AUTH_TOKEN!,
     {{/if}}
     {{#if (eq database "mysql")}}
     {{#if (eq orm "drizzle")}}
-    DATABASE_HOST: alchemy.env.DATABASE_HOST,
-    DATABASE_USERNAME: alchemy.env.DATABASE_USERNAME,
-    DATABASE_PASSWORD: alchemy.secret.env.DATABASE_PASSWORD,
+    DATABASE_HOST: alchemy.env.DATABASE_HOST!,
+    DATABASE_USERNAME: alchemy.env.DATABASE_USERNAME!,
+    DATABASE_PASSWORD: alchemy.secret.env.DATABASE_PASSWORD!,
     {{/if}}
     {{/if}}
   },
@@ -255,12 +259,12 @@ export const server = await Worker("server", {
 });
 {{/if}}
-{{#if (and (eq webDeploy "alchemy") (eq serverDeploy "alchemy"))}}
+{{#if (and (eq webDeploy "cloudflare") (eq serverDeploy "cloudflare"))}}
 console.log(`Web    -> ${web.url}`);
 console.log(`Server -> ${server.url}`);
-{{else if (eq webDeploy "alchemy")}}
+{{else if (eq webDeploy "cloudflare")}}
 console.log(`Web    -> ${web.url}`);
-{{else if (eq serverDeploy "alchemy")}}
+{{else if (eq serverDeploy "cloudflare")}}
 console.log(`Server -> ${server.url}`);
 {{/if}}

package/templates/packages/infra/package.json.hbs ADDED Viewed

@@ -0,0 +1,10 @@
+{
+  "name": "@{{projectName}}/infra",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "alchemy dev",
+    "deploy": "alchemy deploy",
+    "destroy": "alchemy destroy"
+  }
+}

package/templates/payments/polar/server/base/src/lib/payments.ts.hbs CHANGED Viewed

@@ -1,6 +1,7 @@
 import { Polar } from "@polar-sh/sdk";
+import { env } from "@{{projectName}}/env/server";
 export const polarClient = new Polar({
-    accessToken: process.env.POLAR_ACCESS_TOKEN,
-    server: "sandbox",
+	accessToken: env.POLAR_ACCESS_TOKEN,
+	server: "sandbox",
 });