C3: update the solidStart logic to work with their latest (beta-2) implementation (#4711)

* C3: update the solidStart logic to work with their latest (beta-2) implementation

* remove pages:dev in favour of pages:preview

* make prettier ignore c3 template files

* skip windows for solid in c3 e2es

Author: dario-piotrowicz

.changeset/giant-sloths-check.md

@@ -0,0 +1,5 @@
+---
+"create-cloudflare": patch
+---
+
+update the solidStart logic to work with their latest (beta-2) implementation

.prettierignore

@@ -37,3 +37,9 @@ fixtures/**/dist/**
 
 # Miniflare shouldn't be formatted with the root `prettier` version
 packages/miniflare
+
+# In the C3 templates, in particular framework templates, we want to be able to
+# use any format that the framework authors prefer/use in their own templates,
+# so let's ignore all the c3 template files, exlcuding the c3.ts ones
+packages/create-cloudflare/templates/**/*.*
+!packages/create-cloudflare/templates/**/c3.ts

packages/create-cloudflare/e2e-tests/frameworks.test.ts

@@ -124,7 +124,7 @@ describe.concurrent(`E2E: Web frameworks`, () => {
 			],
 			testCommitMessage: true,
 			timeout: LONG_TIMEOUT,
-			quarantine: true,
+			unsupportedOSs: ["win32"],
 		},
 		svelte: {
 			expectResponseToContain: "SvelteKit app",

packages/create-cloudflare/templates/solid/c3.ts

@@ -15,18 +15,6 @@ const generate = async (ctx: C3Context) => {
 	logRaw("");
 };
 
-const configure = async (ctx: C3Context) => {
-	// Install the pages adapter
-	const pkg = "solid-start-cloudflare-pages";
-	await installPackages([pkg], {
-		dev: true,
-		startText: "Adding the Cloudflare Pages adapter",
-		doneText: `${brandColor(`installed`)} ${dim(pkg)}`,
-	});
-
-	updateStatus(`Adding the Cloudflare Pages adapter to vite config`);
-};
-
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "solid",
@@ -37,12 +25,13 @@ const config: TemplateConfig = {
 		ts: { path: "./ts" },
 	},
 	generate,
-	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 3000 -- ${npm} run dev`,
-			"pages:deploy": `${npm} run build && wrangler pages deploy ./dist/public`,
+			"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`,
 		},
 	}),
+	devScript: "dev",
+	compatibilityFlags: ["nodejs_compat"],
 };
 export default config;

packages/create-cloudflare/templates/solid/js/vite.config.js

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

packages/create-cloudflare/templates/solid/ts/vite.config.ts

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