create-cloudflare 0.0.0-e4bb5f36 → 0.0.0-e5cdd7fa

package/package.json

@@ -1,81 +1,93 @@
 {
-	"name": "create-cloudflare",
-	"version": "0.0.0-e4bb5f36",
-	"description": "A CLI for creating and deploying new applications to Cloudflare.",
-	"keywords": [
-		"cloudflare",
-		"workers",
-		"cloudflare workers",
-		"serverless",
-		"serverless application"
-	],
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/cloudflare/workers-sdk.git",
-		"directory": "packages/create-cloudflare"
-	},
-	"license": "MIT OR Apache-2.0",
-	"author": "wrangler@cloudflare.com",
-	"exports": {
-		".": "./dist/cli.js"
-	},
-	"main": "./dist/cli.js",
-	"bin": "./dist/cli.js",
-	"files": [
-		"dist",
-		"templates"
-	],
-	"scripts": {
-		"build": "node -r esbuild-register scripts/build.ts",
-		"check:lint": "eslint .",
-		"check:type": "tsc",
-		"lint": "eslint",
-		"prepublishOnly": "npm run build",
-		"test:e2e:cleanup": "node -r esbuild-register scripts/e2eCleanup.ts",
-		"test:e2e:npm": "npm run build && TEST_PM=npm vitest run --config ./vitest-e2e.config.ts",
-		"test:e2e:pnpm": "npm run build && TEST_PM=pnpm vitest run --config ./vitest-e2e.config.ts",
-		"test:unit": "vitest run --config ./vitest.config.ts",
-		"test:unit:watch": "vitest --config ./vitest.config.ts",
-		"watch": "node -r esbuild-register scripts/build.ts --watch"
-	},
-	"devDependencies": {
-		"@babel/parser": "^7.21.3",
-		"@babel/types": "^7.21.4",
-		"@clack/prompts": "^0.6.3",
-		"@cloudflare/eslint-config-worker": "*",
-		"@cloudflare/workers-tsconfig": "*",
-		"@cloudflare/workers-types": "^4.20230419.0",
-		"@types/command-exists": "^1.2.0",
-		"@types/cross-spawn": "^6.0.2",
-		"@types/dns2": "^2.0.3",
-		"@types/esprima": "^4.0.3",
-		"@types/node": "^18.15.3",
-		"@types/which-pm-runs": "^1.0.0",
-		"@types/yargs": "^17.0.22",
-		"@typescript-eslint/eslint-plugin": "^5.55.0",
-		"@typescript-eslint/parser": "^5.55.0",
-		"chalk": "^5.2.0",
-		"command-exists": "^1.2.9",
-		"cross-spawn": "^7.0.3",
-		"dns2": "^2.1.0",
-		"esbuild": "^0.17.12",
-		"execa": "^7.1.1",
-		"haikunator": "^2.1.2",
-		"log-update": "^5.0.1",
-		"open": "^8.4.0",
-		"pnpm": "^8.6.11",
-		"recast": "^0.22.0",
-		"semver": "^7.5.1",
-		"typescript": "^5.0.2",
-		"undici": "5.20.0",
-		"vite-tsconfig-paths": "^4.0.8",
-		"vitest": "^0.30.0",
-		"which-pm-runs": "^1.1.0",
-		"wrangler": "*",
-		"yargs": "^17.7.1",
-		"yarn": "^1.22.19"
-	},
-	"engines": {
-		"node": ">=16.13.0"
-	}
-}
+  "name": "create-cloudflare",
+  "version": "0.0.0-e5cdd7fa",
+  "description": "A CLI for creating and deploying new applications to Cloudflare.",
+  "keywords": [
+    "cloudflare",
+    "workers",
+    "cloudflare workers",
+    "serverless",
+    "serverless application"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cloudflare/workers-sdk.git",
+    "directory": "packages/create-cloudflare"
+  },
+  "license": "MIT OR Apache-2.0",
+  "author": "wrangler@cloudflare.com",
+  "exports": {
+    ".": "./dist/cli.js"
+  },
+  "main": "./dist/cli.js",
+  "bin": "./dist/cli.js",
+  "files": [
+    "dist",
+    "templates"
+  ],
+  "devDependencies": {
+    "@babel/parser": "^7.21.3",
+    "@babel/types": "^7.21.4",
+    "@clack/prompts": "^0.6.3",
+    "@cloudflare/eslint-config-worker": "*",
+    "@cloudflare/workers-types": "^4.20230419.0",
+    "@iarna/toml": "^3.0.0",
+    "@types/command-exists": "^1.2.0",
+    "@types/cross-spawn": "^6.0.2",
+    "@types/deepmerge": "^2.2.0",
+    "@types/degit": "^2.8.6",
+    "@types/dns2": "^2.0.3",
+    "@types/esprima": "^4.0.3",
+    "@types/node": "^18.15.3",
+    "@types/semver": "^7.5.1",
+    "@types/which-pm-runs": "^1.0.0",
+    "@types/yargs": "^17.0.22",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
+    "@typescript-eslint/parser": "^5.55.0",
+    "chalk": "^5.2.0",
+    "command-exists": "^1.2.9",
+    "cross-spawn": "^7.0.3",
+    "deepmerge": "^4.3.1",
+    "degit": "^2.8.4",
+    "dns2": "^2.1.0",
+    "esbuild": "^0.17.12",
+    "execa": "^7.1.1",
+    "glob": "^10.3.3",
+    "haikunator": "^2.1.2",
+    "magic-string": "^0.30.5",
+    "open": "^8.4.0",
+    "pnpm": "^8.10.0",
+    "recast": "^0.22.0",
+    "semver": "^7.5.1",
+    "typescript": "^5.0.2",
+    "undici": "5.28.2",
+    "vite-tsconfig-paths": "^4.0.8",
+    "which-pm-runs": "^1.1.0",
+    "yargs": "^17.7.1",
+    "yarn": "^1.22.19",
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "wrangler": "3.27.0"
+  },
+  "engines": {
+    "node": ">=18.14.1"
+  },
+  "workers-sdk": {
+    "prerelease": true
+  },
+  "scripts": {
+    "build": "node -r esbuild-register scripts/build.ts",
+    "check:lint": "eslint .",
+    "check:type": "tsc",
+    "lint": "eslint",
+    "test:e2e:cleanup": "node -r esbuild-register scripts/e2eCleanup.ts",
+    "test:e2e:npm": "pnpm run build && cross-env TEST_PM=npm vitest run --config ./vitest-e2e.config.ts",
+    "test:e2e:pnpm": "pnpm run build && cross-env TEST_PM=pnpm vitest run --config ./vitest-e2e.config.ts",
+    "test:e2e:bun": "pnpm run build && cross-env TEST_PM=bun vitest run --config ./vitest-e2e.config.ts",
+    "test:e2e:yarn": "pnpm run build && cross-env TEST_PM=yarn vitest run --config ./vitest-e2e.config.ts",
+    "test:unit": "vitest run --config ./vitest.config.ts",
+    "test:unit:watch": "vitest --config ./vitest.config.ts",
+    "watch": "node -r esbuild-register scripts/build.ts --watch",
+    "test:ci": "vitest run --config ./vitest.config.ts"
+  }
+}

package/templates/angular/c3.ts

@@ -0,0 +1,99 @@
+import { resolve } from "node:path";
+import { logRaw } from "@cloudflare/cli";
+import { brandColor, dim } from "@cloudflare/cli/colors";
+import { spinner } from "@cloudflare/cli/interactive";
+import { installPackages, runFrameworkGenerator } from "helpers/command";
+import { compatDateFlag, readFile, readJSON, writeFile } 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, "--ssr"]);
+	logRaw("");
+};
+
+const configure = async (ctx: C3Context) => {
+	updateAngularJson(ctx);
+	await updateAppCode();
+	await installCFWorker();
+};
+
+async function installCFWorker() {
+	await installPackages(
+		["@cloudflare/workers-types", "@miniflare/tre@next", "wrangler@beta"],
+		{
+			dev: true,
+			startText: "Installing adapter dependencies",
+			doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
+		}
+	);
+}
+async function updateAppCode() {
+	const s = spinner();
+	s.start(`Updating application code`);
+
+	// Update an app config file to:
+	// - add the `provideHttpClient(withFetch())` call to enable `fetch` usage in `HttpClient`
+	const appConfigPath = "src/app/app.config.ts";
+	const appConfig = readFile(resolve(appConfigPath));
+	const newAppConfig =
+		"import { provideHttpClient, withFetch } from '@angular/common/http';\n" +
+		appConfig.replace(
+			"providers: [",
+			"providers: [provideHttpClient(withFetch()), "
+		);
+	writeFile(resolve(appConfigPath), newAppConfig);
+	s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
+
+	// Remove unwanted dependencies
+	s.start(`Updating package.json`);
+	const packageJsonPath = resolve("package.json");
+	const packageManifest = readJSON(packageJsonPath);
+
+	delete packageManifest["dependencies"]["@angular/ssr"];
+	delete packageManifest["dependencies"]["express"];
+
+	writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
+	s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
+}
+
+function updateAngularJson(ctx: C3Context) {
+	const s = spinner();
+	s.start(`Updating angular.json config`);
+	const angularJson = readJSON(resolve("angular.json"));
+	// Update builder
+	const architectSection = angularJson.projects[ctx.project.name].architect;
+	architectSection.build.options.outputPath = "dist";
+	architectSection.build.options.assets.push("src/_routes.json");
+
+	writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
+	s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
+}
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "angular",
+	displayName: "Angular",
+	platform: "pages",
+	copyFiles: {
+		path: "./templates",
+	},
+	generate,
+	configure,
+	transformPackageJson: async () => ({
+		scripts: {
+			start: `${npm} run pages:build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+			process:
+				"node ./tools/copy-files.mjs && node ./tools/alter-polyfills.mjs",
+			"pages:build": `ng build && ${npm} run process`,
+			deploy: `${npm} run pages:build && wrangler pages deploy dist/cloudflare`,
+		},
+	}),
+	deployScript: "deploy",
+	devScript: "start",
+	testFlags: ["--style", "sass"],
+};
+export default config;

package/{dist/angular/templates/src/main.server.ts → templates/angular/templates/server.ts}

@@ -1,11 +1,5 @@
-import "zone.js/dist/zone-node";
-import "@angular/platform-server/init";
-
-import { bootstrapApplication } from "@angular/platform-browser";
 import { renderApplication } from "@angular/platform-server";
-
-import { AppComponent } from "./app/app.component";
-import { config } from "./app/app.config.server";
+import bootstrap from "./src/main.server";
 
 interface Env {
 	ASSETS: { fetch: typeof fetch };
@@ -14,10 +8,7 @@ interface Env {
 // We attach the Cloudflare `fetch()` handler to the global scope
 // so that we can export it when we process the Angular output.
 // See tools/bundle.mjs
-(globalThis as any).__workerFetchHandler = async function fetch(
-	request: Request,
-	env: Env
-) {
+async function workerFetchHandler(request: Request, env: Env) {
 	const url = new URL(request.url);
 	console.log("render SSR", url.href);
 
@@ -26,10 +17,18 @@ interface Env {
 	const indexResponse = await env.ASSETS.fetch(new Request(indexUrl));
 	const document = await indexResponse.text();
 
-	const content = await renderApplication(
-		() => bootstrapApplication(AppComponent, config),
-		{ document, url: url.pathname }
-	);
+	const content = await renderApplication(bootstrap, {
+		document,
+		url: url.pathname,
+	});
+
 	// console.log("rendered SSR", content);
 	return new Response(content, indexResponse);
+}
+
+export default {
+	fetch: (request: Request, env: Env) =>
+		(globalThis as any)["__zone_symbol__Promise"].resolve(
+			workerFetchHandler(request, env)
+		),
 };

package/templates/angular/templates/tools/alter-polyfills.mjs

@@ -0,0 +1,27 @@
+import fs from "node:fs";
+import { EOL } from "node:os";
+import { join } from "node:path";
+import { worker } from "./paths.mjs";
+
+/**
+ * Split by lines and comment the banner
+ * ```
+ * import { createRequire } from 'node:module';
+ * globalThis['require'] ??= createRequire(import.meta.url);
+ * ```
+ */
+const serverPolyfillsFile = join(worker, "polyfills.server.mjs");
+const serverPolyfillsData = fs
+	.readFileSync(serverPolyfillsFile, "utf8")
+	.split(/\r?\n/);
+
+for (let index = 0; index < 2; index++) {
+	if (serverPolyfillsData[index].includes("createRequire")) {
+		serverPolyfillsData[index] = "// " + serverPolyfillsData[index];
+	}
+}
+
+// Add needed polyfills
+serverPolyfillsData.unshift(`globalThis['process'] = {};`);
+
+fs.writeFileSync(serverPolyfillsFile, serverPolyfillsData.join(EOL));

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

@@ -0,0 +1,9 @@
+// Copy the files over so that they can be uploaded by the pages publish command.
+import fs from "node:fs";
+import { join } from "node:path";
+import { client, cloudflare, ssr, worker } from "./paths.mjs";
+
+fs.cpSync(client, cloudflare, { recursive: true });
+fs.cpSync(ssr, worker, { recursive: true });
+
+fs.renameSync(join(worker, "server.mjs"), join(worker, "index.js"));

package/templates/astro/c3.ts

@@ -0,0 +1,50 @@
+import { logRaw } from "@cloudflare/cli";
+import { brandColor, dim } from "@cloudflare/cli/colors";
+import { runCommand, 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 { npx } = detectPackageManager();
+
+const generate = async (ctx: C3Context) => {
+	await runFrameworkGenerator(ctx, [ctx.project.name, "--no-install"]);
+
+	logRaw(""); // newline
+};
+
+const configure = async () => {
+	await runCommand([npx, "astro", "add", "cloudflare", "-y"], {
+		silent: true,
+		startText: "Installing adapter",
+		doneText: `${brandColor("installed")} ${dim(
+			`via \`${npx} astro add cloudflare\``
+		)}`,
+	});
+};
+
+const config: TemplateConfig = {
+	configVersion: 1,
+	id: "astro",
+	platform: "pages",
+	displayName: "Astro",
+	generate,
+	configure,
+	transformPackageJson: async () => ({
+		scripts: {
+			"pages:dev": `wrangler pages dev ${await compatDateFlag()} -- astro dev`,
+			"pages:deploy": `astro build && wrangler pages deploy ./dist`,
+		},
+	}),
+	testFlags: [
+		"--skip-houston",
+		"--no-install",
+		"--no-git",
+		"--template",
+		"blog",
+		"--typescript",
+		"strict",
+	],
+};
+export default config;

package/templates/common/c3.ts

@@ -0,0 +1,14 @@
+export default {
+	configVersion: 1,
+	id: "common",
+	displayName: "Example router & proxy Worker",
+	platform: "workers",
+	copyFiles: {
+		js: {
+			path: "./js",
+		},
+		ts: {
+			path: "./ts",
+		},
+	},
+};

package/templates/common/js/__dot__gitignore

@@ -0,0 +1,172 @@
+# Logs
+
+logs
+_.log
+npm-debug.log_
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# Runtime data
+
+pids
+_.pid
+_.seed
+\*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+
+lib-cov
+
+# Coverage directory used by tools like istanbul
+
+coverage
+\*.lcov
+
+# nyc test coverage
+
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+
+bower_components
+
+# node-waf configuration
+
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+
+build/Release
+
+# Dependency directories
+
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+
+web_modules/
+
+# TypeScript cache
+
+\*.tsbuildinfo
+
+# Optional npm cache directory
+
+.npm
+
+# Optional eslint cache
+
+.eslintcache
+
+# Optional stylelint cache
+
+.stylelintcache
+
+# Microbundle cache
+
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+
+.node_repl_history
+
+# Output of 'npm pack'
+
+\*.tgz
+
+# Yarn Integrity file
+
+.yarn-integrity
+
+# dotenv environment variable files
+
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+
+.cache
+.parcel-cache
+
+# Next.js build output
+
+.next
+out
+
+# Nuxt.js build / generate output
+
+.nuxt
+dist
+
+# Gatsby files
+
+.cache/
+
+# Comment in the public line in if your project uses Gatsby and not Next.js
+
+# https://nextjs.org/blog/next-9-1#public-directory-support
+
+# public
+
+# vuepress build output
+
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+
+.temp
+.cache
+
+# Docusaurus cache and generated files
+
+.docusaurus
+
+# Serverless directories
+
+.serverless/
+
+# FuseBox cache
+
+.fusebox/
+
+# DynamoDB Local files
+
+.dynamodb/
+
+# TernJS port file
+
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+
+.vscode-test
+
+# yarn v2
+
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.\*
+
+# wrangler project
+
+.dev.vars
+.wrangler/

package/templates/common/js/package.json

@@ -4,6 +4,7 @@
 	"private": true,
 	"scripts": {
 		"deploy": "wrangler deploy",
+		"dev": "wrangler dev",
 		"start": "wrangler dev"
 	},
 	"devDependencies": {

package/templates/common/js/wrangler.toml

@@ -35,7 +35,7 @@ compatibility_date = "<TBD>"
 # Docs: https://developers.cloudflare.com/workers/platform/services
 # [[services]]
 # binding = "MY_SERVICE"
-# service = "/api/*"
+# service = "my-service"
 
 # Bind a Durable Object. Durable objects are a scale-to-zero compute primitive based on the actor model.
 # Durable Objects can live for as long as needed. Use these when you need a long-running "server", such as in realtime apps.