@farm.js/create-app 0.1.0-beta.31 → 0.1.0-beta.32

package/dist/index.mjs

@@ -2720,7 +2720,7 @@ async function createApp(projectName, options = {}) {
 		logger.error(`Unknown renderer "${options.renderer}". Available: "react", "preact", "solid", "vue", "svelte".`);
 		process.exit(1);
 	}
-	if (!renderer && !options.template && template === "basic") {
+	if (!renderer && !options.template && (template === "basic" || template === "better-auth")) {
 		const response = await prompts({
 			type: "select",
 			name: "renderer",
@@ -2761,8 +2761,8 @@ async function createApp(projectName, options = {}) {
 		renderer = response.renderer;
 	}
 	renderer ||= "react";
-	if (renderer !== "react" && template !== "basic") {
-		logger.error(`The "${template}" integration starter currently targets React. Use --template basic with --renderer ${renderer}.`);
+	if (renderer !== "react" && template !== "basic" && !await hasRendererIntegrationTemplate(template, renderer)) {
+		logger.error(`The "${template}" integration starter currently targets React. Use --template basic or --template better-auth with --renderer ${renderer}.`);
 		process.exit(1);
 	}
 	let useTypeScript = options.typescript;
@@ -2819,29 +2819,18 @@ async function createApp(projectName, options = {}) {
 async function copyTemplate(template, projectPath, useTypeScript, renderer) {
 	const details = templateDetails[template];
 	await copyDir(path.join(__dirname, "..", "templates", details?.integration ? "basic" : template), projectPath);
+	const basePackageJson = await readPackageJson(projectPath);
 	if (useTypeScript) {
 		const tsTemplatePath = path.join(__dirname, "..", "templates", "_typescript");
 		if (await dirExists(tsTemplatePath)) await copyDir(tsTemplatePath, projectPath);
 	}
-	if (renderer === "solid") await copyDir(path.join(__dirname, "..", "templates", "_renderers", "solid"), projectPath);
-	if (renderer === "preact") await copyDir(path.join(__dirname, "..", "templates", "_renderers", "preact"), projectPath);
-	if (renderer === "vue") {
-		const rendererTemplatePath = path.join(__dirname, "..", "templates", "_renderers", "vue");
-		await Promise.all([
-			fs.rm(path.join(projectPath, "src", "app", "page.tsx"), { force: true }),
-			fs.rm(path.join(projectPath, "src", "app", "layout.tsx"), { force: true }),
-			fs.rm(path.join(projectPath, "src", "components", "resource-links.tsx"), { force: true })
-		]);
-		await copyDir(rendererTemplatePath, projectPath);
-	}
-	if (renderer === "svelte") {
-		const rendererTemplatePath = path.join(__dirname, "..", "templates", "_renderers", "svelte");
-		await Promise.all([
-			fs.rm(path.join(projectPath, "src", "app", "page.tsx"), { force: true }),
-			fs.rm(path.join(projectPath, "src", "app", "layout.tsx"), { force: true }),
-			fs.rm(path.join(projectPath, "src", "components", "resource-links.tsx"), { force: true })
-		]);
-		await copyDir(rendererTemplatePath, projectPath);
+	if (renderer !== "react") {
+		await applyRendererTemplate(projectPath, renderer, basePackageJson);
+		const integrationRendererPath = getRendererIntegrationTemplatePath(template, renderer);
+		if (await dirExists(integrationRendererPath)) {
+			await removeRendererIntegrationConflicts(projectPath);
+			await copyDir(integrationRendererPath, projectPath);
+		}
 	}
 	if (!details?.integration) return;
 	const result = await addFarmIntegration({
@@ -2854,6 +2843,79 @@ async function copyTemplate(template, projectPath, useTypeScript, renderer) {
 	await writeIntegrationReadme(projectPath, details.integration, result.env);
 	return result;
 }
+async function applyRendererTemplate(projectPath, renderer, basePackageJson) {
+	const rendererTemplatePath = path.join(__dirname, "..", "templates", "_renderers", renderer);
+	if (renderer === "vue" || renderer === "svelte") await Promise.all([
+		fs.rm(path.join(projectPath, "src", "app", "page.tsx"), { force: true }),
+		fs.rm(path.join(projectPath, "src", "app", "layout.tsx"), { force: true }),
+		fs.rm(path.join(projectPath, "src", "components", "resource-links.tsx"), { force: true })
+	]);
+	await copyDir(rendererTemplatePath, projectPath);
+	await writePackageJson(projectPath, mergeRendererPackageJson(basePackageJson, await readPackageJson(projectPath)));
+}
+function mergeRendererPackageJson(base, renderer) {
+	const dependencies = {
+		...base.dependencies,
+		...renderer.dependencies
+	};
+	const devDependencies = {
+		...base.devDependencies,
+		...renderer.devDependencies
+	};
+	for (const name of ["react", "react-dom"]) delete dependencies[name];
+	for (const name of ["@types/react", "@types/react-dom"]) delete devDependencies[name];
+	return {
+		...base,
+		...renderer.type ? { type: renderer.type } : {},
+		scripts: {
+			...base.scripts,
+			...renderer.scripts
+		},
+		dependencies,
+		devDependencies
+	};
+}
+async function readPackageJson(projectPath) {
+	return JSON.parse(await fs.readFile(path.join(projectPath, "package.json"), "utf8"));
+}
+async function writePackageJson(projectPath, packageJson) {
+	await fs.writeFile(path.join(projectPath, "package.json"), `${JSON.stringify(packageJson, null, 2)}\n`, "utf8");
+}
+function getRendererIntegrationTemplatePath(template, renderer) {
+	return path.join(__dirname, "..", "templates", "_integrations", template, renderer);
+}
+async function hasRendererIntegrationTemplate(template, renderer) {
+	return dirExists(getRendererIntegrationTemplatePath(template, renderer));
+}
+async function removeRendererIntegrationConflicts(projectPath) {
+	const appFiles = [
+		"page.tsx",
+		"layout.tsx",
+		"loading.tsx",
+		"error.tsx",
+		"not-found.tsx",
+		"sign-in/page.tsx",
+		"sign-up/page.tsx",
+		"dashboard/page.tsx",
+		"preact.css",
+		"solid.css",
+		"vue.css",
+		"svelte.css",
+		"api/greeting/route.ts"
+	];
+	const componentFiles = [
+		"auth-form.tsx",
+		"auth-shell.tsx",
+		"sign-out-button.tsx",
+		"site-header.tsx"
+	];
+	await Promise.all([
+		...appFiles.map((file) => fs.rm(path.join(projectPath, "src", "app", file), { force: true })),
+		...componentFiles.map((file) => fs.rm(path.join(projectPath, "src", "components", file), { force: true })),
+		fs.rm(path.join(projectPath, "src", "lib", "api-client.ts"), { force: true }),
+		fs.rm(path.join(projectPath, "src", "lib", "api.generated.ts"), { force: true })
+	]);
+}
 async function writeEnvironmentExample(projectPath, keys) {
 	if (keys.length === 0) return;
 	const envPath = path.join(projectPath, ".env.example");