@farm.js/cli 0.1.0-beta.1 → 0.1.0-beta.4

package/dist/index.mjs

@@ -59,9 +59,7 @@ async function deployPlatform(platform, root, outputDir, deployConfig, prod) {
 		case "cloudflare":
 			await deployCloudflare(root, outputDir, deployConfig.cloudflare?.projectName || deployConfig.projectName);
 			break;
-		case "netlify":
-			await deployNetlify(root, outputDir, deployConfig.netlify?.site);
-			break;
+		case "netlify": await deployNetlify(root, outputDir, deployConfig.netlify?.site);
 	}
 }
 /**
@@ -282,7 +280,8 @@ async function deployNetlify(root, outputDir, site) {
 	}
 	try {
 		process.chdir(outputDir);
-		execSync(`netlify deploy --prod --dir=.${site ? ` --site=${site}` : ""}`, { stdio: "inherit" });
+		const siteFlag = site ? ` --site=${site}` : "";
+		execSync(`netlify deploy --prod --dir=.${siteFlag}`, { stdio: "inherit" });
 		logger.success("✅ Deployed to Netlify successfully!");
 	} catch (error) {
 		logger.error(`❌ Failed to deploy to Netlify: ${error.message}`);
@@ -765,7 +764,7 @@ function commandExists(command) {
 	return !result.error && result.status === 0;
 }
 function expandTunnelTemplate(template, target, requestedName, requestedHostname) {
-	return template.replaceAll("{url}", shellQuote(target.localUrl)).replaceAll("{port}", shellQuote(String(target.port))).replaceAll("{host}", shellQuote(target.host)).replaceAll("{name}", shellQuote(requestedName)).replaceAll("{hostname}", shellQuote(requestedHostname));
+	return template.split("{url}").join(shellQuote(target.localUrl)).split("{port}").join(shellQuote(String(target.port))).split("{host}").join(shellQuote(target.host)).split("{name}").join(shellQuote(requestedName)).split("{hostname}").join(shellQuote(requestedHostname));
 }
 function shellQuote(value) {
 	return `"${value.replace(/(["\\$`])/g, "\\$1")}"`;
@@ -808,7 +807,7 @@ async function generateFarmArtifacts(options = {}) {
 	if (!userConfig && hasSchemaOptions(options)) throw new Error("No Farm config found. Please create farm.config.ts or config.ts.");
 	const resolvedConfig = await resolveConfig({
 		root,
-		...userConfig || {}
+		...userConfig
 	}, "development");
 	const extraRoutes = [...resolvedConfig.openapi?.enabled && resolvedConfig.openapi.route ? [resolvedConfig.openapi.route] : [], ...getFarmDocsRouteTypeEntries(resolvedConfig.docs)];
 	await generateRouteTypes({
@@ -822,7 +821,8 @@ async function generateFarmArtifacts(options = {}) {
 		srcDir: resolvedConfig.srcDir,
 		configPath: options.configPath
 	});
-	const apiGenerator = new APITypeGenerator(path.join(resolvedConfig.root, resolvedConfig.srcDir, "app"));
+	const appDir = path.join(resolvedConfig.root, resolvedConfig.srcDir, "app");
+	const apiGenerator = new APITypeGenerator(appDir);
 	const apiRoutes = apiGenerator.scanAPIRoutes();
 	const apiTypesPath = path.join(resolvedConfig.root, resolvedConfig.srcDir, "lib", "api.generated.ts");
 	await mkdir(path.dirname(apiTypesPath), { recursive: true });
@@ -1071,7 +1071,8 @@ async function writePrismaSchema(schemaPath, models) {
 	const source = await readFile(schemaPath, "utf8");
 	const generated = createPrismaGeneratedBlock(generatePrismaSchema(models));
 	const pattern = new RegExp(`${escapeRegExp(PRISMA_GENERATED_START)}[\\s\\S]*?${escapeRegExp(PRISMA_GENERATED_END)}`, "m");
-	await writeFile(schemaPath, pattern.test(source) ? source.replace(pattern, generated) : `${source.trimEnd()}\n\n${generated}\n`, "utf8");
+	const nextSource = pattern.test(source) ? source.replace(pattern, generated) : `${source.trimEnd()}\n\n${generated}\n`;
+	await writeFile(schemaPath, nextSource, "utf8");
 }
 function generatePrismaSchema(models) {
 	return models.map((model) => renderPrismaModel(model)).join("\n\n");
@@ -2066,7 +2067,7 @@ async function createFrameworkMigrationPlan(root, source, options = {}) {
 	};
 	if (source === "next") await planNextMigration(root, packageJson, plan, options);
 	else await planTanStackMigration(root, packageJson, plan, options);
-	addSharedFarmFiles(root, packageJson, plan, source, options);
+	addSharedFarmFiles(root, packageJson, plan, options);
 	return plan;
 }
 async function planNextMigration(root, packageJson, plan, options) {
@@ -2146,32 +2147,22 @@ async function planTanStackMigration(root, packageJson, plan, options) {
 	plan.manual.push("Review loaders, beforeLoad hooks, search params, and Route.use* calls; Farm page modules should move that logic into props, API routes, or server helpers.");
 	if (packageJson) addPackageOperation(root, plan, createMigratedPackageJson(packageJson, "tanstack"));
 }
-function addSharedFarmFiles(root, packageJson, plan, source, options) {
+function addSharedFarmFiles(root, packageJson, plan, options) {
 	if (![
 		"farm.config.ts",
 		"farm.config.mts",
 		"farm.config.js",
 		"farm.config.mjs"
-	].map((file) => path.join(root, file)).find((file) => existsSync(file))) {
-		const output = source === "next" ? `import { defineConfig } from "@farm.js/core";
-
-export default defineConfig({
-  srcDir: "src",
-});
-` : `import { defineConfig } from "@farm.js/core";
+	].map((file) => path.join(root, file)).find((file) => existsSync(file))) plan.operations.push({
+		kind: "write-file",
+		path: path.join(root, "farm.config.ts"),
+		description: "Create farm.config.ts",
+		content: `import { defineConfig } from "@farm.js/core";
 
-export default defineConfig({
-  srcDir: "src",
-});
-`;
-		plan.operations.push({
-			kind: "write-file",
-			path: path.join(root, "farm.config.ts"),
-			description: "Create farm.config.ts",
-			content: output,
-			skipped: false
-		});
-	}
+export default defineConfig({});
+`,
+		skipped: false
+	});
 	const layoutPath = path.join(root, "src", "app", "layout.tsx");
 	if (!existsSync(layoutPath)) plan.operations.push({
 		kind: "write-file",