create-cloudflare 2.32.1 → 2.33.0

package/dist/cli.js

@@ -67118,7 +67118,7 @@ var logRaw = (msg) => {
 `);
 };
 var log = (msg) => {
-  const lines = msg.split("\n").map((ln) => `${gray(shapes.bar)} ${white(ln)}`);
+  const lines = msg.split("\n").map((ln) => `${gray(shapes.bar)}${ln.length > 0 ? " " + white(ln) : ""}`);
   logRaw(lines.join("\n"));
 };
 var newline = () => {
@@ -68818,7 +68818,10 @@ var spinner = (frames = spinnerFrames.clockwise, color = brandColor) => {
     start(msg, helpText) {
       helpText ||= ``;
       currentMsg = msg;
-      startMsg = `${currentMsg} ${dim(helpText)}`;
+      startMsg = currentMsg;
+      if (helpText !== void 0 && helpText.length > 0) {
+        startMsg += ` ${dim(helpText)}`;
+      }
       if (isInteractive()) {
         let index = 0;
         clearLoop();
@@ -68831,7 +68834,7 @@ var spinner = (frames = spinnerFrames.clockwise, color = brandColor) => {
           }
         }, frameRate);
       } else {
-        logUpdate2(`${leftT} ${startMsg}`);
+        logRaw(`${leftT} ${startMsg}`);
       }
     },
     update(msg) {
@@ -68849,17 +68852,20 @@ ${grayBar} ${msg}`);
         clearLoop();
       } else {
         if (msg !== void 0) {
-          logUpdate2(`
-${grayBar} ${msg}`);
+          logRaw(`${grayBar} ${msg}`);
         }
         newline();
       }
     }
   };
 };
-var isInteractive = () => {
-  return process.stdin.isTTY;
-};
+function isInteractive() {
+  try {
+    return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+  } catch {
+    return false;
+  }
+}
 
 // ../../node_modules/.pnpm/yargs@17.7.2/node_modules/yargs/lib/platform-shims/esm.mjs
 var import_assert = require("assert");
@@ -73719,7 +73725,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "2.32.1";
+var version = "2.33.0";
 
 // src/metrics.ts
 var import_node_async_hooks = require("node:async_hooks");
@@ -73999,7 +74005,7 @@ var detectPmMismatch = (ctx) => {
     case "pnpm":
       return !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "pnpm-lock.yaml"));
     case "bun":
-      return !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "bun.lockb"));
+      return !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "bun.lockb")) && !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "bun.lock"));
   }
 };
 
@@ -74476,7 +74482,7 @@ var package_default = {
   dependencies: {
     "create-astro": "4.10.0",
     "create-analog": "1.8.1",
-    "@angular/create": "18.2.11",
+    "@angular/create": "19.0.0",
     "create-docusaurus": "3.6.1",
     "create-hono": "0.14.2",
     "create-next-app": "14.2.5",
@@ -75590,7 +75596,11 @@ var c3_default15 = config13;
 var import_node_path4 = require("node:path");
 var { npm: npm10 } = detectPackageManager();
 var generate13 = async (ctx) => {
-  await runFrameworkGenerator(ctx, [ctx.project.name, "--ssr"]);
+  await runFrameworkGenerator(ctx, [
+    ctx.project.name,
+    "--ssr",
+    "--server-routing"
+  ]);
   logRaw("");
 };
 var configure10 = async (ctx) => {
@@ -75619,10 +75629,17 @@ async function updateAppCode2() {
   );
   writeFile2((0, import_node_path4.resolve)(appConfigPath), newAppConfig);
   s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
+  const appServerRoutesPath = "src/app/app.routes.server.ts";
+  const appRoutes = readFile((0, import_node_path4.resolve)(appServerRoutesPath));
+  const newAppRoutes = appRoutes.replace(
+    "RenderMode.Prerender",
+    "RenderMode.Server"
+  );
+  writeFile2((0, import_node_path4.resolve)(appServerRoutesPath), newAppRoutes);
+  s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
   s.start(`Updating package.json`);
   const packageJsonPath = (0, import_node_path4.resolve)("package.json");
   const packageManifest = readJSON(packageJsonPath);
-  delete packageManifest["dependencies"]["@angular/ssr"];
   delete packageManifest["dependencies"]["express"];
   delete packageManifest["devDependencies"]["@types/express"];
   writeFile2(packageJsonPath, JSON.stringify(packageManifest, null, 2));
@@ -75634,6 +75651,8 @@ function updateAngularJson2(ctx) {
   const angularJson = readJSON((0, import_node_path4.resolve)("angular.json"));
   const architectSection = angularJson.projects[ctx.project.name].architect;
   architectSection.build.options.outputPath = "dist";
+  architectSection.build.options.outputMode = "server";
+  architectSection.build.options.ssr.experimentalPlatform = "neutral";
   architectSection.build.options.assets.push("src/_routes.json");
   writeFile2((0, import_node_path4.resolve)("angular.json"), JSON.stringify(angularJson, null, 2));
   s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
@@ -75655,7 +75674,7 @@ var config14 = {
     scripts: {
       start: `${npm10} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
       build: `ng build && ${npm10} run process`,
-      process: "node ./tools/copy-files.mjs && node ./tools/alter-polyfills.mjs",
+      process: "node ./tools/copy-files.mjs",
       deploy: `${npm10} run build && wrangler pages deploy dist/cloudflare`
     }
   })
@@ -76831,7 +76850,7 @@ var config25 = {
 var c3_default35 = config25;
 
 // ../wrangler/package.json
-var version2 = "3.86.1";
+var version2 = "3.90.0";
 
 // src/git.ts
 var offerGit = async (ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.32.1",
+  "version": "2.33.0",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -67,9 +67,9 @@
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/workers-tsconfig": "0.0.0",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "wrangler": "3.86.1"
+    "wrangler": "3.90.0",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/angular/c3.ts

@@ -13,7 +13,11 @@ import type { C3Context } from "types";
 const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name, "--ssr"]);
+	await runFrameworkGenerator(ctx, [
+		ctx.project.name,
+		"--ssr",
+		"--server-routing" /** Dev Preview API */,
+	]);
 	logRaw("");
 };
 
@@ -50,12 +54,21 @@ async function updateAppCode() {
 	writeFile(resolve(appConfigPath), newAppConfig);
 	s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
 
+	// Update an app server routes file to:
+	const appServerRoutesPath = "src/app/app.routes.server.ts";
+	const appRoutes = readFile(resolve(appServerRoutesPath));
+	const newAppRoutes = appRoutes.replace(
+		"RenderMode.Prerender",
+		"RenderMode.Server",
+	);
+	writeFile(resolve(appServerRoutesPath), newAppRoutes);
+	s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
+
 	// 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"];
 	delete packageManifest["devDependencies"]["@types/express"];
 
@@ -70,6 +83,8 @@ function updateAngularJson(ctx: C3Context) {
 	// Update builder
 	const architectSection = angularJson.projects[ctx.project.name].architect;
 	architectSection.build.options.outputPath = "dist";
+	architectSection.build.options.outputMode = "server";
+	architectSection.build.options.ssr.experimentalPlatform = "neutral";
 	architectSection.build.options.assets.push("src/_routes.json");
 
 	writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
@@ -93,8 +108,7 @@ const config: TemplateConfig = {
 		scripts: {
 			start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
 			build: `ng build && ${npm} run process`,
-			process:
-				"node ./tools/copy-files.mjs && node ./tools/alter-polyfills.mjs",
+			process: "node ./tools/copy-files.mjs",
 			deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
 		},
 	}),

package/templates/angular/templates/src/server.ts

@@ -0,0 +1,15 @@
+import { AngularAppEngine, createRequestHandler } from '@angular/ssr';
+
+const angularApp = new AngularAppEngine();
+
+/**
+ * This is a request handler used by the Angular CLI (dev-server and during build).
+ */
+export const reqHandler = createRequestHandler(async (req) => {
+	const res = await angularApp.render(req);
+
+	return res ?? new Response('Page not found.', { status: 404 });
+});
+
+
+export default { fetch: reqHandler };

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

@@ -1,7 +1,13 @@
 // 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";
+import { join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const root = resolve(fileURLToPath(import.meta.url), "../../");
+const client = resolve(root, "dist/browser");
+const ssr = resolve(root, "dist/server");
+const cloudflare = resolve(root, "dist/cloudflare");
+const worker = resolve(cloudflare, "_worker.js");
 
 fs.cpSync(client, cloudflare, { recursive: true });
 fs.cpSync(ssr, worker, { recursive: true });

package/templates/angular/templates/server.ts

@@ -1,34 +0,0 @@
-import { renderApplication } from "@angular/platform-server";
-import bootstrap from "./src/main.server";
-
-interface Env {
-	ASSETS: { fetch: typeof fetch };
-}
-
-// 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
-async function workerFetchHandler(request: Request, env: Env) {
-	const url = new URL(request.url);
-	console.log("render SSR", url.href);
-
-	// Get the root `index.html` content.
-	const indexUrl = new URL("/", url);
-	const indexResponse = await env.ASSETS.fetch(new Request(indexUrl));
-	const document = await indexResponse.text();
-
-	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

@@ -1,27 +0,0 @@
-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/paths.mjs

@@ -1,9 +0,0 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-export const root = path.resolve(dirname, "..");
-export const client = path.resolve(root, "dist/browser");
-export const ssr = path.resolve(root, "dist/server");
-export const cloudflare = path.resolve(root, "dist/cloudflare");
-export const worker = path.resolve(cloudflare, "_worker.js");