create-cloudflare 2.33.0 → 2.33.2

package/dist/cli.js

@@ -73725,7 +73725,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "2.33.0";
+var version = "2.33.2";
 
 // src/metrics.ts
 var import_node_async_hooks = require("node:async_hooks");
@@ -74486,7 +74486,7 @@ var package_default = {
     "create-docusaurus": "3.6.1",
     "create-hono": "0.14.2",
     "create-next-app": "14.2.5",
-    "create-qwik": "1.9.1",
+    "create-qwik": "1.11.0",
     "create-vite": "5.5.5",
     "create-remix": "2.14.0",
     "create-solid": "0.5.13",
@@ -74526,7 +74526,11 @@ var runFrameworkGenerator = async (ctx, args) => {
 // templates-experimental/angular/c3.ts
 var { npm } = detectPackageManager();
 var generate = async (ctx) => {
-  await runFrameworkGenerator(ctx, [ctx.project.name, "--ssr"]);
+  await runFrameworkGenerator(ctx, [
+    ctx.project.name,
+    "--ssr",
+    "--server-routing"
+  ]);
   logRaw("");
 };
 var configure = async (ctx) => {
@@ -74535,9 +74539,9 @@ var configure = async (ctx) => {
   await installCFWorker();
 };
 async function installCFWorker() {
-  await installPackages(["@cloudflare/workers-types", "wrangler"], {
+  await installPackages(["xhr2"], {
     dev: true,
-    startText: "Installing adapter dependencies",
+    startText: "Installing additional dependencies",
     doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`
   });
 }
@@ -74552,10 +74556,17 @@ async function updateAppCode() {
   );
   writeFile2((0, import_node_path3.resolve)(appConfigPath), newAppConfig);
   s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
+  const appServerRoutesPath = "src/app/app.routes.server.ts";
+  const appRoutes = readFile((0, import_node_path3.resolve)(appServerRoutesPath));
+  const newAppRoutes = appRoutes.replace(
+    "RenderMode.Prerender",
+    "RenderMode.Server"
+  );
+  writeFile2((0, import_node_path3.resolve)(appServerRoutesPath), newAppRoutes);
+  s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
   s.start(`Updating package.json`);
   const packageJsonPath = (0, import_node_path3.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));
@@ -74567,7 +74578,8 @@ function updateAngularJson(ctx) {
   const angularJson = readJSON((0, import_node_path3.resolve)("angular.json"));
   const architectSection = angularJson.projects[ctx.project.name].architect;
   architectSection.build.options.outputPath = "dist";
-  architectSection.build.options.assets.push("src/_routes.json");
+  architectSection.build.options.outputMode = "server";
+  architectSection.build.options.ssr.experimentalPlatform = "neutral";
   writeFile2((0, import_node_path3.resolve)("angular.json"), JSON.stringify(angularJson, null, 2));
   s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
 }
@@ -74583,13 +74595,13 @@ var config = {
   path: "templates-experimental/angular",
   devScript: "start",
   deployScript: "deploy",
+  previewScript: "start",
   generate,
   configure,
   transformPackageJson: async () => ({
     scripts: {
       start: `${npm} run build && wrangler dev`,
-      build: `ng build && ${npm} run process`,
-      process: "node ./tools/alter-polyfills.mjs",
+      build: `ng build`,
       deploy: `${npm} run build && wrangler deploy`
     }
   })
@@ -75609,14 +75621,11 @@ var configure10 = async (ctx) => {
   await installCFWorker2();
 };
 async function installCFWorker2() {
-  await installPackages(
-    ["@cloudflare/workers-types", "@miniflare/tre@next", "wrangler@beta"],
-    {
-      dev: true,
-      startText: "Installing adapter dependencies",
-      doneText: `${brandColor("installed")} ${dim(`via \`${npm10} install\``)}`
-    }
-  );
+  await installPackages(["xhr2"], {
+    dev: true,
+    startText: "Installing additional dependencies",
+    doneText: `${brandColor("installed")} ${dim(`via \`${npm10} install\``)}`
+  });
 }
 async function updateAppCode2() {
   const s = spinner();
@@ -75668,11 +75677,12 @@ var config14 = {
   },
   devScript: "start",
   deployScript: "deploy",
+  previewScript: "start",
   generate: generate13,
   configure: configure10,
   transformPackageJson: async () => ({
     scripts: {
-      start: `${npm10} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+      start: `${npm10} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()}`,
       build: `ng build && ${npm10} run process`,
       process: "node ./tools/copy-files.mjs",
       deploy: `${npm10} run build && wrangler pages deploy dist/cloudflare`
@@ -76850,7 +76860,7 @@ var config25 = {
 var c3_default35 = config25;
 
 // ../wrangler/package.json
-var version2 = "3.90.0";
+var version2 = "3.92.0";
 
 // src/git.ts
 var offerGit = async (ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.33.0",
+  "version": "2.33.2",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -68,7 +68,7 @@
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "wrangler": "3.90.0",
+    "wrangler": "3.92.0",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "engines": {

package/templates/angular/c3.ts

@@ -28,14 +28,11 @@ const configure = async (ctx: C3Context) => {
 };
 
 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\``)}`,
-		},
-	);
+	await installPackages(["xhr2"], {
+		dev: true,
+		startText: "Installing additional dependencies",
+		doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
+	});
 }
 async function updateAppCode() {
 	const s = spinner();
@@ -102,11 +99,12 @@ const config: TemplateConfig = {
 	},
 	devScript: "start",
 	deployScript: "deploy",
+	previewScript: "start",
 	generate,
 	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+			start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()}`,
 			build: `ng build && ${npm} run process`,
 			process: "node ./tools/copy-files.mjs",
 			deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,

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

@@ -6,7 +6,7 @@ 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);
+	const res = await angularApp.handle(req);
 
 	return res ?? new Response('Page not found.', { status: 404 });
 });

package/templates/hello-world/ts/test/tsconfig.json

@@ -3,6 +3,6 @@
 	"compilerOptions": {
 		"types": ["@cloudflare/workers-types/experimental", "@cloudflare/vitest-pool-workers"]
 	},
-	"include": ["./**/*.ts", "../src/env.d.ts"],
+	"include": ["./**/*.ts", "../worker-configuration.d.ts"],
 	"exclude": []
 }

package/templates-experimental/angular/c3.ts

@@ -12,7 +12,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("");
 };
 
@@ -23,9 +27,9 @@ const configure = async (ctx: C3Context) => {
 };
 
 async function installCFWorker() {
-	await installPackages(["@cloudflare/workers-types", "wrangler"], {
+	await installPackages(["xhr2"], {
 		dev: true,
-		startText: "Installing adapter dependencies",
+		startText: "Installing additional dependencies",
 		doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
 	});
 }
@@ -46,12 +50,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"];
 
@@ -66,7 +79,8 @@ function updateAngularJson(ctx: C3Context) {
 	// Update builder
 	const architectSection = angularJson.projects[ctx.project.name].architect;
 	architectSection.build.options.outputPath = "dist";
-	architectSection.build.options.assets.push("src/_routes.json");
+	architectSection.build.options.outputMode = "server";
+	architectSection.build.options.ssr.experimentalPlatform = "neutral";
 
 	writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
 	s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
@@ -84,13 +98,13 @@ const config: TemplateConfig = {
 	path: "templates-experimental/angular",
 	devScript: "start",
 	deployScript: "deploy",
+	previewScript: "start",
 	generate,
 	configure,
 	transformPackageJson: async () => ({
 		scripts: {
 			start: `${npm} run build && wrangler dev`,
-			build: `ng build && ${npm} run process`,
-			process: "node ./tools/alter-polyfills.mjs",
+			build: `ng build`,
 			deploy: `${npm} run build && wrangler deploy`,
 		},
 	}),

package/templates-experimental/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.handle(req);
+
+	return res ?? new Response('Page not found.', { status: 404 });
+});
+
+
+export default { fetch: reqHandler };

package/templates-experimental/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("/index.html", 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-experimental/angular/templates/tools/alter-polyfills.mjs

@@ -1,32 +0,0 @@
-import fs from "node:fs";
-import { EOL } from "node:os";
-import { join } from "node:path";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-
-/**
- * Split by lines and comment the banner
- * ```
- * import { createRequire } from 'node:module';
- * globalThis['require'] ??= createRequire(import.meta.url);
- * ```
- */
-const serverPolyfillsFile = join(
-  dirname,
-  "../dist/server/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));