create-cloudflare 0.0.0-9098a3b03 → 0.0.0-90fa58b5b

package/dist/cli.js

@@ -24815,8 +24815,8 @@ var require_index_688c5d50 = __commonJS({
     var pathReservations = () => {
       const queues = /* @__PURE__ */ new Map();
       const reservations = /* @__PURE__ */ new Map();
-      const { join: join7 } = path__default["default"];
-      const getDirs = (path7) => join7(path7).split(/[\\/]/).slice(0, -1).reduce((set, path8) => set.length ? set.concat(join7(set[set.length - 1], path8)) : [path8], []);
+      const { join: join8 } = path__default["default"];
+      const getDirs = (path7) => join8(path7).split(/[\\/]/).slice(0, -1).reduce((set, path8) => set.length ? set.concat(join8(set[set.length - 1], path8)) : [path8], []);
       const running = /* @__PURE__ */ new Set();
       const getQueues = (fn) => {
         const res = reservations.get(fn);
@@ -38609,7 +38609,7 @@ var require_util8 = __commonJS({
       return path6;
     }
     exports2.normalize = normalize2;
-    function join7(aRoot, aPath) {
+    function join8(aRoot, aPath) {
       if (aRoot === "") {
         aRoot = ".";
       }
@@ -38641,7 +38641,7 @@ var require_util8 = __commonJS({
       }
       return joined;
     }
-    exports2.join = join7;
+    exports2.join = join8;
     exports2.isAbsolute = function(aPath) {
       return aPath.charAt(0) === "/" || urlRegexp.test(aPath);
     };
@@ -38814,7 +38814,7 @@ var require_util8 = __commonJS({
             parsed.path = parsed.path.substring(0, index + 1);
           }
         }
-        sourceURL = join7(urlGenerate(parsed), sourceURL);
+        sourceURL = join8(urlGenerate(parsed), sourceURL);
       }
       return normalize2(sourceURL);
     }
@@ -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 = "0.0.0-9098a3b03";
+var version = "0.0.0-90fa58b5b";
 
 // src/metrics.ts
 var import_node_async_hooks = require("node:async_hooks");
@@ -73811,6 +73817,13 @@ var runCommand = async (command2, opts = {}) => {
     doneText: opts.doneText,
     promise() {
       const [executable, ...args] = command2;
+      if (args[0] === "wrangler") {
+        const metrics = readMetricsConfig();
+        if (metrics.c3permission?.enabled === false) {
+          opts.env ??= {};
+          opts.env["WRANGLER_SEND_METRICS"] = "false";
+        }
+      }
       const abortController = new AbortController();
       const cmd = (0, import_cross_spawn.spawn)(executable, [...args], {
         // TODO: ideally inherit stderr, but npm install uses this for warnings
@@ -73999,7 +74012,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,15 +74489,15 @@ var package_default = {
   dependencies: {
     "create-astro": "4.10.0",
     "create-analog": "1.8.1",
-    "@angular/create": "18.2.11",
-    "create-docusaurus": "3.6.0",
+    "@angular/create": "19.0.0",
+    "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.13.1",
+    "create-remix": "2.15.0",
     "create-solid": "0.5.13",
-    "create-vue": "3.12.0",
+    "create-vue": "3.12.1",
     gatsby: "5.14.0",
     nuxi: "3.15.0",
     sv: "0.6.1"
@@ -74520,7 +74533,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) => {
@@ -74529,9 +74546,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\``)}`
   });
 }
@@ -74546,10 +74563,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));
@@ -74561,7 +74585,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\``)}`);
 }
@@ -74577,13 +74602,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`
     }
   })
@@ -75063,7 +75088,7 @@ var updateNuxtConfig = () => {
     b2.objectExpression([
       b2.objectProperty(
         b2.identifier("preset"),
-        b2.stringLiteral("./cloudflare-preset")
+        b2.stringLiteral("cloudflare_module")
       )
     ])
   );
@@ -75279,6 +75304,7 @@ var configure7 = async (ctx) => {
   });
   usesTypescript(ctx);
   const filePath = `app.config.${usesTypescript(ctx) ? "ts" : "js"}`;
+  const compatDate = await getWorkerdCompatibilityDate();
   updateStatus(`Updating configuration in ${blue(filePath)}`);
   transformFile(filePath, {
     visitCallExpression: function(n2) {
@@ -75293,60 +75319,14 @@ var configure7 = async (ctx) => {
           b2.objectProperty(
             b2.identifier("server"),
             b2.objectExpression([
-              // preset: "cloudflare-pages"
+              // preset: "cloudflare_module"
               b2.objectProperty(
                 b2.identifier("preset"),
-                b2.stringLiteral("cloudflare-pages")
-              ),
-              // output: {
-              // 	dir: "{{ rootDir }}/dist",
-              // 	publicDir: "{{ output.dir }}/public",
-              // 	serverDir: "{{ output.dir }}/worker",
-              // },
-              b2.objectProperty(
-                b2.identifier("output"),
-                b2.objectExpression([
-                  b2.objectProperty(
-                    b2.identifier("dir"),
-                    b2.stringLiteral("{{ rootDir }}/dist")
-                  ),
-                  b2.objectProperty(
-                    b2.identifier("publicDir"),
-                    b2.stringLiteral("{{ output.dir }}/public")
-                  ),
-                  b2.objectProperty(
-                    b2.identifier("serverDir"),
-                    b2.stringLiteral("{{ output.dir }}/worker")
-                  )
-                ])
-              ),
-              // rollupConfig: {
-              // 	external: ["node:async_hooks"],
-              // },
-              b2.objectProperty(
-                b2.identifier("rollupConfig"),
-                b2.objectExpression([
-                  b2.objectProperty(
-                    b2.identifier("external"),
-                    b2.arrayExpression([b2.stringLiteral("node:async_hooks")])
-                  )
-                ])
+                b2.stringLiteral("cloudflare_module")
               ),
-              // hooks: {
-              // 	// Prevent the Pages preset from writing the _routes.json etc.
-              // 	compiled() {},
-              // },
               b2.objectProperty(
-                b2.identifier("hooks"),
-                b2.objectExpression([
-                  b2.objectMethod(
-                    "method",
-                    b2.identifier("compiled"),
-                    [],
-                    b2.blockStatement([]),
-                    false
-                  )
-                ])
+                b2.identifier("compatibilityDate"),
+                b2.stringLiteral(compatDate)
               )
             ])
           )
@@ -75590,7 +75570,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) => {
@@ -75599,14 +75583,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();
@@ -75619,10 +75600,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 +75622,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\``)}`);
@@ -75649,13 +75639,14 @@ 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 && node ./tools/alter-polyfills.mjs",
+      process: "node ./tools/copy-files.mjs",
       deploy: `${npm10} run build && wrangler pages deploy dist/cloudflare`
     }
   })
@@ -76706,6 +76697,7 @@ var config23 = {
 var c3_default33 = config23;
 
 // templates/svelte/c3.ts
+var import_node_fs3 = require("node:fs");
 var import_node_os4 = require("node:os");
 var recast12 = __toESM(require_main3());
 var { npm: npm19 } = detectPackageManager();
@@ -76721,6 +76713,7 @@ var configure18 = async (ctx) => {
     doneText: `${brandColor(`installed`)} ${dim(pkg)}`
   });
   updateSvelteConfig2();
+  updatePlaywrightConfig(usesTypescript(ctx));
   updateTypeDefinitions2(ctx);
 };
 var updateSvelteConfig2 = () => {
@@ -76735,6 +76728,28 @@ var updateSvelteConfig2 = () => {
     }
   });
 };
+var updatePlaywrightConfig = (shouldUseTypescript) => {
+  const filePath = `playwright.config.${shouldUseTypescript ? "ts" : "js"}`;
+  if (!(0, import_node_fs3.existsSync)(filePath)) {
+    return;
+  }
+  updateStatus(`Changing webServer port in ${blue(filePath)}`);
+  transformFile(filePath, {
+    visitObjectExpression: function(n2) {
+      const portProp = n2.node.properties.find((prop) => {
+        if (!("key" in prop) || !("name" in prop.key)) {
+          return false;
+        }
+        return prop.key.name === "port";
+      });
+      if (!portProp || !("value" in portProp) || !("value" in portProp.value)) {
+        return this.traverse(n2);
+      }
+      portProp.value.value = 8788;
+      return false;
+    }
+  });
+};
 var updateTypeDefinitions2 = (ctx) => {
   if (!usesTypescript(ctx)) {
     return;
@@ -76831,7 +76846,7 @@ var config25 = {
 var c3_default35 = config25;
 
 // ../wrangler/package.json
-var version2 = "0.0.0-9098a3b03";
+var version2 = "0.0.0-90fa58b5b";
 
 // src/git.ts
 var offerGit = async (ctx) => {
@@ -77920,6 +77935,9 @@ var processArgument = async (args, key, promptConfig) => {
 };
 
 // src/deploy.ts
+var import_promises4 = require("node:fs/promises");
+var import_node_os5 = require("node:os");
+var import_node_path5 = require("node:path");
 var import_toml2 = __toESM(require_toml());
 
 // src/helpers/poll.ts
@@ -79238,23 +79256,34 @@ var runDeploy = async (ctx) => {
       JSON.stringify(ctx.commitMessage)
     ] : []
   ];
-  const result = await runCommand(deployCmd, {
-    silent: true,
+  const outputFile = (0, import_node_path5.join)(
+    await (0, import_promises4.mkdtemp)((0, import_node_path5.join)((0, import_node_os5.tmpdir)(), "c3-wrangler-deploy-")),
+    "output.json"
+  );
+  await runCommand(deployCmd, {
     cwd: ctx.project.path,
     env: {
       CLOUDFLARE_ACCOUNT_ID: ctx.account.id,
-      NODE_ENV: "production"
+      NODE_ENV: "production",
+      WRANGLER_OUTPUT_FILE_PATH: outputFile
     },
     startText: "Deploying your application",
     doneText: `${brandColor("deployed")} ${dim(
       `via \`${quoteShellArgs(baseDeployCmd)}\``
     )}`
   });
-  const deployedUrlRegex = /https:\/\/.+\.(pages|workers)\.dev/;
-  const deployedUrlMatch = result.match(deployedUrlRegex);
-  if (deployedUrlMatch) {
-    ctx.deployment.url = deployedUrlMatch[0];
-  } else {
+  try {
+    const contents = readFile(outputFile);
+    const entries = contents.split("\n").filter(Boolean).map((entry) => JSON.parse(entry));
+    const url = entries.find((entry) => entry.type === "deploy")?.targets?.[0] ?? entries.find((entry) => entry.type === "pages-deploy")?.url;
+    const deployedUrlRegex = /https:\/\/.+\.(pages|workers)\.dev/;
+    const deployedUrlMatch = url?.match(deployedUrlRegex);
+    if (deployedUrlMatch) {
+      ctx.deployment.url = deployedUrlMatch[0];
+    } else {
+      throw new Error("Failed to find deployment url.");
+    }
+  } catch {
     throw new Error("Failed to find deployment url.");
   }
   if (ctx.deployment.url?.endsWith(".pages.dev")) {