create-cloudflare 0.0.0-e33bb44a → 0.0.0-e3a57616

package/templates/scheduled/ts/package.json

@@ -4,10 +4,10 @@
 	"private": true,
 	"scripts": {
 		"deploy": "wrangler deploy",
+		"dev": "wrangler dev",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
 		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}

package/templates/scheduled/ts/wrangler.toml

@@ -1,6 +1,6 @@
 name = "<TBD>"
-main = "src/worker.ts"
-compatibility_date = "2023-05-15"
+main = "src/index.ts"
+compatibility_date = "<TBD>"
 
 # Cron Triggers
 # Docs: https://developers.cloudflare.com/workers/platform/triggers/cron-triggers/

package/templates/solid/c3.ts

@@ -0,0 +1,48 @@
+import { logRaw, updateStatus } from "@cloudflare/cli";
+import { blue, brandColor, dim } from "@cloudflare/cli/colors";
+import { installPackages, runFrameworkGenerator } from "helpers/command";
+import { compatDateFlag } from "helpers/files";
+import { detectPackageManager } from "helpers/packages";
+import type { TemplateConfig } from "../../src/templates";
+import type { C3Context } from "types";
+
+const { npm } = detectPackageManager();
+
+const generate = async (ctx: C3Context) => {
+	// Run the create-solid command
+	await runFrameworkGenerator(ctx, [ctx.project.name]);
+
+	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",
+	displayName: "Solid",
+	platform: "pages",
+	copyFiles: {
+		js: { path: "./js" },
+		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`,
+		},
+	}),
+};
+export default config;

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

@@ -0,0 +1,7 @@
+import cloudflare from "solid-start-cloudflare-pages";
+import solid from "solid-start/vite";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+	plugins: [solid({ adapter: cloudflare({}) })],
+});

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

@@ -0,0 +1,7 @@
+import cloudflare from "solid-start-cloudflare-pages";
+import solid from "solid-start/vite";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+	plugins: [solid({ adapter: cloudflare({}) })],
+});

package/templates/svelte/c3.ts

@@ -0,0 +1,75 @@
+import { logRaw, updateStatus } from "@cloudflare/cli";
+import { blue, brandColor, dim } from "@cloudflare/cli/colors";
+import { parseTs, transformFile } from "helpers/codemod";
+import { installPackages, runFrameworkGenerator } from "helpers/command";
+import { compatDateFlag, usesTypescript } from "helpers/files";
+import { detectPackageManager } from "helpers/packages";
+import { platformInterface } from "./templates";
+import type { TemplateConfig } from "../../src/templates";
+import type * as recast from "recast";
+import type { C3Context } from "types";
+
+const { npm } = detectPackageManager();
+
+const generate = async (ctx: C3Context) => {
+	await runFrameworkGenerator(ctx, [ctx.project.name]);
+
+	logRaw("");
+};
+
+const configure = async (ctx: C3Context) => {
+	// Install the adapter
+	const pkg = `@sveltejs/adapter-cloudflare`;
+	await installPackages([pkg], {
+		dev: true,
+		startText: "Adding the Cloudflare Pages adapter",
+		doneText: `${brandColor(`installed`)} ${dim(pkg)}`,
+	});
+
+	// Change the import statement in svelte.config.js
+	transformFile("svelte.config.js", {
+		visitImportDeclaration: function (n) {
+			// importSource is the `x` in `import y from "x"`
+			const importSource = n.value.source;
+			if (importSource.value === "@sveltejs/adapter-auto") {
+				importSource.value = "@sveltejs/adapter-cloudflare";
+			}
+
+			// stop traversing this node
+			return false;
+		},
+	});
+	updateStatus(`Changing adapter in ${blue("svelte.config.js")}`);
+
+	// If using typescript, add the platform interface to the `App` interface
+	if (usesTypescript(ctx)) {
+		transformFile("src/app.d.ts", {
+			visitTSModuleDeclaration(n) {
+				if (n.value.id.name === "App") {
+					const patchAst = parseTs(platformInterface);
+					const body = n.node.body as recast.types.namedTypes.TSModuleBlock;
+					body.body.push(patchAst.program.body[0]);
+				}
+
+				this.traverse(n);
+			},
+		});
+		updateStatus(`Updating global type definitions in ${blue("app.d.ts")}`);
+	}
+};
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "svelte",
+	displayName: "Svelte",
+	platform: "pages",
+	generate,
+	configure,
+	transformPackageJson: async () => ({
+		scripts: {
+			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 5173 -- ${npm} run dev`,
+			"pages:deploy": `${npm} run build && wrangler pages deploy .svelte-kit/cloudflare`,
+		},
+	}),
+};
+export default config;

package/templates/svelte/templates.ts

@@ -0,0 +1,13 @@
+export const platformInterface = `
+interface Platform {
+  env: {
+    COUNTER: DurableObjectNamespace;
+  };
+  context: {
+    waitUntil(promise: Promise<any>): void;
+  };
+  caches: CacheStorage & { default: Cache }
+}
+`;
+
+// interface["Platform"] #context #waitUntil:nth(2)

package/templates/vue/c3.ts

@@ -0,0 +1,27 @@
+import { runFrameworkGenerator } from "helpers/command";
+import { compatDateFlag } from "helpers/files";
+import { detectPackageManager } from "helpers/packages";
+import type { TemplateConfig } from "../../src/templates";
+import type { C3Context } from "types";
+
+const { npm } = detectPackageManager();
+
+const generate = async (ctx: C3Context) => {
+	await runFrameworkGenerator(ctx, [ctx.project.name]);
+};
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "vue",
+	displayName: "Vue",
+	platform: "pages",
+	generate,
+	transformPackageJson: async () => ({
+		scripts: {
+			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 5173 -- ${npm} run dev`,
+			"pages:deploy": `${npm} run build && wrangler pages deploy ./dist`,
+		},
+	}),
+	testFlags: ["--ts"],
+};
+export default config;

package/dist/angular/templates/tools/bundle.mjs

@@ -1,77 +0,0 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import { worker as workerPath } from "./paths.mjs";
-import * as esbuild from "esbuild";
-import { NodeGlobalsPolyfillPlugin } from "@esbuild-plugins/node-globals-polyfill";
-import { NodeModulesPolyfillPlugin } from "@esbuild-plugins/node-modules-polyfill";
-import fg from "fast-glob";
-
-// Process each of the JS files in the `_worker.js` directory
-for (const entry of await fg("**/*.js", { cwd: workerPath, onlyFiles: true })) {
-	if (entry === "index.js") {
-		// This is the main bundle and gets special treatment
-		await bundleMain();
-	} else {
-		await bundleLazyModule(entry);
-	}
-}
-
-// Use esbuild to process the main entry-point.
-// - shim Node.js APIs
-// - convert `global` to `globalThis`
-// - convert dynamic `require()` calls to `await import()` calls
-// - ensure that the Cloudflare `fetch()` handler is exported
-async function bundleMain() {
-	const result = await esbuild.build({
-		entryPoints: ["index.js"],
-		bundle: true,
-		format: "iife",
-		write: false,
-		absWorkingDir: workerPath,
-		define: {
-			global: "globalThis",
-		},
-		plugins: [
-			NodeGlobalsPolyfillPlugin({ buffer: true }),
-			NodeModulesPolyfillPlugin(),
-		],
-	});
-
-	// Store the original promise (before Angular/Zone.js replaces it) on the global scope.
-	let main = "globalThis.OGPromise = Promise;\n" + result.outputFiles[0].text;
-
-	// Patch any dynamic imports (converting `require()` calls to `import()` calls).
-	main = main.replace(
-		'installChunk(__require("./" + __webpack_require__.u(chunkId))',
-		'promises.push(import("./" + __webpack_require__.u(chunkId)).then((mod) => installChunk(mod.default))'
-	);
-	// Export the fetch handler (grabbing it from the global).
-	// Also Cloudflare expects `fetch()` to return an original Promise (not a ZoneAwarePromise).
-	main +=
-		"\nexport default { fetch: (request, env) => globalThis.OGPromise.resolve(globalThis.__workerFetchHandler(request, env)) };";
-
-	await fs.writeFile(path.resolve(workerPath, "index.js"), main);
-}
-
-// Use esbuild to process the lazy load modules
-// In particular we need to convert the CommonJS export syntax to ESM.
-async function bundleLazyModule(filePath) {
-	const result = await esbuild.build({
-		entryPoints: [filePath],
-		bundle: true,
-		format: "cjs",
-		write: false,
-		absWorkingDir: workerPath,
-		define: {
-			global: "globalThis",
-		},
-		plugins: [NodeModulesPolyfillPlugin()],
-	});
-
-	let content = result.outputFiles[0].text;
-
-	// Export the fetch handler (grabbing it from the global).
-	content = "const exports = {};\n" + content + "\nexport default exports";
-
-	await fs.writeFile(path.resolve(workerPath, filePath), content);
-}

package/dist/angular/templates/tools/copy-client-files.mjs

@@ -1,4 +0,0 @@
-// Copy the client-side files over so that they can be uploaded by the pages publish command.
-import fs from "node:fs";
-import { client, cloudflare } from "./paths.mjs";
-fs.cpSync(client, cloudflare, { recursive: true });

package/dist/angular/templates/tools/copy-worker-files.mjs

@@ -1,10 +0,0 @@
-// Copy the lazy loaded modules into the dist folder so that they can be
-// uploaded along with the main Worker module.
-import fs from "node:fs";
-import path from "node:path";
-import { ssr, worker } from "./paths.mjs";
-fs.cpSync(ssr, worker, { recursive: true });
-fs.renameSync(
-	path.resolve(worker, "main.js"),
-	path.resolve(worker, "index.js")
-);

package/dist/angular/templates/tsconfig.server.json

@@ -1,5 +0,0 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-	"extends": "./tsconfig.app.json",
-	"files": ["./src/main.server.ts"]
-}