create-cloudflare 0.0.0-96b79b3f → 0.0.0-96e4e165

package/templates/solid/c3.ts

@@ -1,7 +1,10 @@
-import { logRaw } from "@cloudflare/cli";
+import { logRaw, updateStatus } from "@cloudflare/cli";
+import { blue } from "@cloudflare/cli/colors";
+import { transformFile } from "helpers/codemod";
 import { runFrameworkGenerator } from "helpers/command";
-import { compatDateFlag } from "helpers/files";
+import { compatDateFlag, usesTypescript } from "helpers/files";
 import { detectPackageManager } from "helpers/packages";
+import * as recast from "recast";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
 
@@ -9,31 +12,70 @@ const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
 	// Run the create-solid command
-	await runFrameworkGenerator(ctx, [ctx.project.name]);
+	// -s flag forces solid-start
+	await runFrameworkGenerator(ctx, ["-p", ctx.project.name, "-s"]);
 
 	logRaw("");
 };
 
+const configure = async (ctx: C3Context) => {
+	usesTypescript(ctx);
+	const filePath = `app.config.${usesTypescript(ctx) ? "ts" : "js"}`;
+
+	updateStatus(`Updating configuration in ${blue(filePath)}`);
+
+	transformFile(filePath, {
+		visitCallExpression: function (n) {
+			const callee = n.node.callee as recast.types.namedTypes.Identifier;
+			if (callee.name !== "defineConfig") {
+				return this.traverse(n);
+			}
+
+			const b = recast.types.builders;
+			n.node.arguments = [
+				b.objectExpression([
+					b.objectProperty(
+						b.identifier("server"),
+						b.objectExpression([
+							b.objectProperty(
+								b.identifier("preset"),
+								b.stringLiteral("cloudflare-pages")
+							),
+							b.objectProperty(
+								b.identifier("rollupConfig"),
+								b.objectExpression([
+									b.objectProperty(
+										b.identifier("external"),
+										b.arrayExpression([b.stringLiteral("node:async_hooks")])
+									),
+								])
+							),
+						])
+					),
+				]),
+			];
+
+			return false;
+		},
+	});
+};
+
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "solid",
 	displayName: "Solid",
 	platform: "pages",
-	copyFiles: {
-		variants: {
-			js: { path: "./js" },
-			ts: { path: "./ts" },
-		},
-	},
 	generate,
+	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:preview": `${npm} run build && npx wrangler pages dev dist ${await compatDateFlag()} --compatibility-flag nodejs_compat`,
-			"pages:deploy": `${npm} run build && wrangler pages deploy ./dist`,
+			preview: `${npm} run build && npx wrangler pages dev dist ${await compatDateFlag()} --compatibility-flag nodejs_compat`,
+			deploy: `${npm} run build && wrangler pages deploy ./dist`,
 		},
 	}),
 	devScript: "dev",
-	previewScript: "pages:preview",
+	deployScript: "deploy",
+	previewScript: "preview",
 	compatibilityFlags: ["nodejs_compat"],
 };
 export default config;

package/templates/solid/js/vite.config.js

@@ -1,12 +0,0 @@
-import { defineConfig } from "@solidjs/start/config";
-
-export default defineConfig({
-    start: {
-        server: {
-            preset: "cloudflare-pages",
-            rollupConfig: {
-                external: ["node:async_hooks"]
-            },
-        }
-    }
-});

package/templates/solid/ts/vite.config.ts

@@ -1,12 +0,0 @@
-import { defineConfig } from "@solidjs/start/config";
-
-export default defineConfig({
-    start: {
-        server: {
-            preset: "cloudflare-pages",
-            rollupConfig: {
-                external: ["node:async_hooks"]
-            },
-        }
-    }
-});