create-croissant 0.1.52 → 0.1.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-croissant",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "Scaffold a new project using the Croissant Stack",
   "repository": {
     "type": "git",

package/template/apps/desktop/package.json

@@ -26,6 +26,7 @@
     "@workspace/auth": "workspace:*",
     "@workspace/orpc": "workspace:*",
     "@workspace/ui": "workspace:*",
+    "better-auth": "1.6.11",
     "electron-updater": "^6.3.9",
     "lucide-react": "^1.14.0",
     "react": "19.2.5",
@@ -44,6 +45,7 @@
     "@workspace/config-typescript": "workspace:*",
     "electron": "39.8.9",
     "electron-builder": "^26.0.12",
-    "electron-vite": "^5.0.0"
+    "electron-vite": "^5.0.0",
+    "vite": "^8.0.12"
   }
 }

package/template/apps/desktop/src/main/index.ts

@@ -17,6 +17,20 @@ function createWindow(): void {
     },
   });
 
+  // Handle deep links
+  if (process.defaultApp) {
+    if (process.argv.length >= 2) {
+      app.setAsDefaultProtocolClient("desktop", process.execPath, [join(__dirname, "../../")]);
+    }
+  } else {
+    app.setAsDefaultProtocolClient("desktop");
+  }
+
+  app.on("open-url", (event, url) => {
+    event.preventDefault();
+    mainWindow.webContents.send("auth-callback", url);
+  });
+
   mainWindow.on("ready-to-show", () => {
     mainWindow.show();
   });

package/template/apps/desktop/src/preload/index.d.ts

@@ -3,6 +3,9 @@ import type { ElectronAPI } from "@electron-toolkit/preload";
 declare global {
   interface Window {
     electron: ElectronAPI;
-    api: unknown;
+    api: {
+      onAuthCallback: (callback: (url: string) => void) => () => void;
+      openExternal: (url: string) => Promise<void>;
+    };
   }
 }

package/template/apps/desktop/src/preload/index.ts

@@ -1,8 +1,15 @@
-import { contextBridge } from "electron";
+import { contextBridge, ipcRenderer, shell } from "electron";
 import { electronAPI } from "@electron-toolkit/preload";
 
 // Custom APIs for renderer
-const api = {};
+const api = {
+  onAuthCallback: (callback: (url: string) => void) => {
+    const listener = (_: any, url: string) => callback(url);
+    ipcRenderer.on("auth-callback", listener);
+    return () => ipcRenderer.removeListener("auth-callback", listener);
+  },
+  openExternal: (url: string) => shell.openExternal(url),
+};
 
 // Use `contextBridge` APIs to expose Electron APIs to
 // renderer only if context isolation is enabled, otherwise

package/template/apps/desktop/src/renderer/src/components/login-form.tsx

@@ -15,7 +15,7 @@ import {
   FieldLabel,
 } from "@workspace/ui/components/field";
 import { Input } from "@workspace/ui/components/input";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { Link, useNavigate } from "@tanstack/react-router";
 import { useForm } from "@tanstack/react-form";
 import { z } from "zod";
@@ -32,6 +32,27 @@ export function LoginForm({ className, ...props }: React.ComponentProps<"div">)
   const [error, setError] = useState<string | null>(null);
   const navigate = useNavigate();
 
+  useEffect(() => {
+    const unsubscribe = window.api.onAuthCallback(async (url) => {
+      const token = new URL(url).searchParams.get("token");
+      if (token) {
+        setLoading(true);
+        // Better Auth typically handles this via the setSession/proxy
+        // In deep link flow, we might need to manually set the session
+        // or let the client handle the token.
+        // For now, we redirect to dashboard and let authClient.getSession() handle it
+        navigate({ to: "/dashboard" });
+        setLoading(false);
+      }
+    });
+    return () => unsubscribe();
+  }, [navigate]);
+
+  const handleBrowserLogin = () => {
+     const platformUrl = `${import.meta.env.VITE_API_URL.replace("/api/auth", "")}/login?redirect=desktop://auth-callback`;
+     window.api.openExternal(platformUrl);
+   };
+
   const form = useForm({
     defaultValues: {
       email: "",
@@ -139,6 +160,17 @@ export function LoginForm({ className, ...props }: React.ComponentProps<"div">)
                     </Button>
                   )}
                 </form.Subscribe>
+                <div className="relative">
+                  <div className="absolute inset-0 flex items-center">
+                    <span className="w-full border-t" />
+                  </div>
+                  <div className="relative flex justify-center text-xs uppercase">
+                    <span className="bg-background px-2 text-muted-foreground">Or continue with</span>
+                  </div>
+                </div>
+                <Button variant="outline" type="button" onClick={handleBrowserLogin} disabled={loading}>
+                  Login with Browser
+                </Button>
                 <Button variant="outline" type="button" disabled={loading}>
                   Login with Google
                 </Button>

package/template/apps/desktop/src/renderer/src/lib/auth-client.ts

@@ -1,3 +1,5 @@
 import { createAuthClient } from "better-auth/react";
 
-export const authClient = createAuthClient();
+export const authClient: ReturnType<typeof createAuthClient> = createAuthClient({
+    baseURL: import.meta.env.VITE_API_URL,
+});

package/template/apps/desktop/src/renderer/src/routes/__root.tsx

@@ -1,10 +1,12 @@
-import { Outlet, createRootRoute } from "@tanstack/react-router";
+import { Link, Outlet, createRootRoute } from "@tanstack/react-router";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { Toaster } from "@workspace/ui/components/sonner";
 import { ThemeProvider } from "@workspace/ui/components/theme-provider";
 import { ORPCProvider } from "@workspace/orpc/react";
 import { orpc } from "@renderer/lib/orpc";
 import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
+import { Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyTitle } from "@workspace/ui/components/empty";
+import { Button, buttonVariants } from "@workspace/ui/components/button";
 
 import "@workspace/ui/globals.css";
 
@@ -12,6 +14,23 @@ const queryClient = new QueryClient();
 
 export const Route = createRootRoute({
   component: RootLayout,
+  notFoundComponent: () => {
+    return (
+      <Empty className="h-screen border-none">
+        <EmptyHeader>
+          <EmptyTitle>404 - Page Not Found</EmptyTitle>
+          <EmptyDescription>
+            The page you are looking for does not exist or has been moved.
+          </EmptyDescription>
+        </EmptyHeader>
+        <EmptyContent>
+          <Link to="/" className={buttonVariants({ variant: "outline" })}>
+            Go Home
+          </Link>
+        </EmptyContent>
+      </Empty>
+    );
+  },
 });
 
 function RootLayout() {

package/template/apps/desktop/tsconfig.web.json

@@ -9,6 +9,7 @@
   ],
   "compilerOptions": {
     "composite": true,
+    "types": ["vite/client"],
     "paths": {
       "@renderer/*": ["./src/renderer/src/*"],
       "@main/*": ["./src/main/src/*"],

package/template/apps/platform/package.json

@@ -12,6 +12,7 @@
     "db:studio": "drizzle-kit studio"
   },
   "dependencies": {
+    "@better-auth/electron": "1.6.11",
     "@noble/ciphers": "^2.2.0",
     "@tailwindcss/vite": "^4.2.4",
     "@tanstack/react-router": "^1.168.24",
@@ -20,11 +21,12 @@
     "@workspace/auth": "workspace:*",
     "@workspace/orpc": "workspace:*",
     "@workspace/ui": "workspace:*",
+    "better-auth": "1.6.11",
     "lucide-react": "^1.11.0",
     "nitro": "latest",
-    "sonner": "^2.0.7",
     "react": "19.2.5",
     "react-dom": "19.2.5",
+    "sonner": "^2.0.7",
     "tailwindcss": "^4.2.4",
     "vite-tsconfig-paths": "^6.1.1"
   },

package/template/apps/platform/src/components/login-form.tsx

@@ -16,7 +16,7 @@ import {
 } from "@workspace/ui/components/field";
 import { Input } from "@workspace/ui/components/input";
 import { useState } from "react";
-import { Link } from "@tanstack/react-router";
+import { Link, useSearch } from "@tanstack/react-router";
 import { useForm } from "@tanstack/react-form";
 import { z } from "zod";
 
@@ -30,6 +30,7 @@ const loginSchema = z.object({
 export function LoginForm({ className, ...props }: React.ComponentProps<"div">) {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
+  const search = useSearch({ from: "/_public/login" }) as { redirect?: string };
 
   const form = useForm({
     defaultValues: {
@@ -45,7 +46,7 @@ export function LoginForm({ className, ...props }: React.ComponentProps<"div">)
       const { error: signInError } = await authClient.signIn.email({
         email: value.email,
         password: value.password,
-        callbackURL: "/dashboard",
+        callbackURL: search.redirect || "/dashboard",
       });
       if (signInError) {
         setError(signInError.message || "Failed to sign in");

package/template/apps/platform/src/lib/auth-client-electron.ts

@@ -0,0 +1,13 @@
+import { createAuthClient } from "better-auth/client";
+import { electronProxyClient } from "@better-auth/electron/proxy";
+
+export const authClient = createAuthClient({
+  baseURL: import.meta.env.VITE_API_URL,
+  plugins: [
+    electronProxyClient({
+      protocol: {
+        scheme: "com.example.app"
+      },
+    }),
+  ],
+});

package/template/apps/platform/src/lib/auth-client.ts

@@ -1,3 +1,5 @@
 import { createAuthClient } from "better-auth/react";
 
-export const authClient = createAuthClient();
+export const authClient = createAuthClient({
+  baseURL: typeof window !== "undefined" ? window.location.origin : "http://localhost:3000",
+});

package/template/apps/platform/src/routes/__root.tsx

@@ -1,9 +1,11 @@
-import { HeadContent, Scripts, createRootRoute } from "@tanstack/react-router";
+import { HeadContent, Link, Scripts, createRootRoute } from "@tanstack/react-router";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { Toaster } from "@workspace/ui/components/sonner";
 import { ThemeProvider } from "@workspace/ui/components/theme-provider";
 import { ORPCProvider } from "@workspace/orpc/react";
 import { orpc } from "@/lib/orpc";
+import { Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyTitle } from "@workspace/ui/components/empty";
+import { Button, buttonVariants } from "@workspace/ui/components/button";
 
 import appCss from "@workspace/ui/globals.css?url";
 
@@ -31,6 +33,23 @@ export const Route = createRootRoute({
     ],
   }),
   shellComponent: RootDocument,
+  notFoundComponent: () => {
+    return (
+      <Empty className="h-screen border-none">
+        <EmptyHeader>
+          <EmptyTitle>404 - Page Not Found</EmptyTitle>
+          <EmptyDescription>
+            The page you are looking for does not exist or has been moved.
+          </EmptyDescription>
+        </EmptyHeader>
+        <EmptyContent>
+          <Link to="/" className={buttonVariants({ variant: "outline" })}>
+            Go Home
+          </Link>
+        </EmptyContent>
+      </Empty>
+    );
+  },
 });
 
 function RootDocument({ children }: { children: React.ReactNode }) {

package/template/package.json

@@ -25,11 +25,9 @@
     "@orpc/server": "latest",
     "@orpc/tanstack-query": "latest",
     "@tanstack/react-form": "latest",
-    "@tanstack/react-query": "latest",
-    "better-auth": "^1.6.11"
+    "@tanstack/react-query": "latest"
   },
   "devDependencies": {
-    "@better-auth/core": "^1.6.11",
     "husky": "latest",
     "oxfmt": "latest",
     "oxlint": "latest",

package/template/packages/auth/package.json

@@ -12,7 +12,8 @@
     "generate": "better-auth generate --output ../db/src/lib/auth-schema.ts"
   },
   "dependencies": {
-    "@workspace/db": "workspace:*"
+    "@workspace/db": "workspace:*",
+    "better-auth": "1.6.11"
   },
   "devDependencies": {
     "@better-auth/cli": "^1.4.22",