create-cloudflare 0.0.0-5dd95736 → 0.0.0-5e0f3d07

package/dist/cli.js

@@ -1715,16 +1715,17 @@ var init_cli = __esm({
       // current default for backcompat -- TODO: change default to shapes.bar once all callees have been updated
       shape = shapes.corners.bl,
       // current default for backcompat -- TODO: change default to true once all callees have been updated
-      multiline = false
+      multiline = false,
+      newlineBefore = true
     } = {}) => {
       logRaw(
         format(msg, {
           firstLinePrefix: gray(shape) + space() + status.warning,
           linePrefix: gray(shapes.bar),
-          newlineBefore: true,
           formatLine: (line) => dim(line),
           // for backcompat but it's not ideal for this to be "dim"
-          multiline
+          multiline,
+          newlineBefore
         })
       );
     };
@@ -3902,7 +3903,7 @@ var init_args = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.0.0-5dd95736";
+    version = "0.0.0-5e0f3d07";
   }
 });
 
@@ -24714,20 +24715,20 @@ var init_package2 = __esm({
         "additionally it also contains a map that maps frameworks to their respective clis"
       ],
       dependencies: {
-        "create-astro": "4.7.5",
-        "create-analog": "1.2.0",
-        "@angular/create": "17.3.7",
-        "create-docusaurus": "3.1.1",
-        "create-hono": "0.7.0",
+        "create-astro": "4.8.0",
+        "create-analog": "1.3.1",
+        "@angular/create": "18.0.4",
+        "create-docusaurus": "3.4.0",
+        "create-hono": "0.8.1",
         "create-next-app": "14.1.0",
-        "create-qwik": "1.5.4",
+        "create-qwik": "1.5.7",
         "create-react-app": "5.0.1",
-        "create-remix": "2.8.1",
-        "create-solid": "0.5.5",
-        "create-svelte": "6.0.10",
-        "create-vue": "3.10.2",
-        gatsby: "5.13.4",
-        nuxi: "3.11.1"
+        "create-remix": "2.9.2",
+        "create-solid": "0.5.11",
+        "create-svelte": "6.3.1",
+        "create-vue": "3.10.3",
+        gatsby: "5.13.6",
+        nuxi: "3.12.0"
       },
       frameworkCliMap: {
         analog: "create-analog",
@@ -24757,6 +24758,7 @@ var init_frameworks = __esm({
     init_colors();
     init_command();
     init_packageManagers();
+    init_git();
     init_package2();
     getFrameworkCli = (ctx, withVersion = true) => {
       if (!ctx.template) {
@@ -24782,6 +24784,223 @@ var init_frameworks = __esm({
       );
       logRaw("");
       await runCommand(cmd, { env: env2 });
+      if (process.env.SAVE_DIFFS) {
+        const cmdEnv = {
+          silent: true,
+          cwd: ctx.project.path
+        };
+        if (!isInsideGitRepo(ctx.project.path)) {
+          await runCommand(["git", "init"], cmdEnv);
+          await runCommand(["git", "add", "."], cmdEnv);
+          const commitMessage = `Initial commit by ${cli}`;
+          await runCommand(["git", "commit", "-m", commitMessage], cmdEnv);
+        }
+      }
+    };
+  }
+});
+
+// ../wrangler/package.json
+var version2;
+var init_package3 = __esm({
+  "../wrangler/package.json"() {
+    version2 = "0.0.0-5e0f3d07";
+  }
+});
+
+// src/git.ts
+async function getGitVersion() {
+  try {
+    const rawGitVersion = await runCommand(["git", "--version"], {
+      useSpinner: false,
+      silent: true
+    });
+    const gitVersion = rawGitVersion.replace(/^git\s+version\s+/, "");
+    return gitVersion;
+  } catch {
+    return null;
+  }
+}
+async function isGitInstalled() {
+  return await getGitVersion() !== null;
+}
+async function isGitConfigured() {
+  try {
+    const userName = await runCommand(["git", "config", "user.name"], {
+      useSpinner: false,
+      silent: true
+    });
+    if (!userName) {
+      return false;
+    }
+    const email = await runCommand(["git", "config", "user.email"], {
+      useSpinner: false,
+      silent: true
+    });
+    if (!email) {
+      return false;
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function isInsideGitRepo(cwd) {
+  try {
+    const output = await runCommand(["git", "status"], {
+      cwd,
+      useSpinner: false,
+      silent: true,
+      captureOutput: true
+    });
+    return output.includes("not a git repository") === false;
+  } catch (err) {
+    return false;
+  }
+}
+async function initializeGit(cwd) {
+  const s = spinner();
+  s.start("Initializing git repo");
+  try {
+    const defaultBranchName = await runCommand(
+      ["git", "config", "--get", "init.defaultBranch"],
+      { useSpinner: false, silent: true, cwd }
+    );
+    await runCommand(
+      ["git", "init", "--initial-branch", defaultBranchName.trim() ?? "main"],
+      // branch names can't contain spaces, so this is safe
+      { useSpinner: false, silent: true, cwd }
+    );
+  } catch {
+    await runCommand(["git", "init"], { useSpinner: false, silent: true, cwd });
+  } finally {
+    s.stop(`${brandColor("initialized")} ${dim(`git`)}`);
+  }
+}
+async function getProductionBranch(cwd) {
+  try {
+    const productionBranch = await runCommand(
+      ["git", "branch", "--show-current"],
+      {
+        silent: true,
+        cwd,
+        useSpinner: false,
+        captureOutput: true
+      }
+    );
+    return productionBranch.trim();
+  } catch (err) {
+  }
+  return "main";
+}
+var offerGit, gitCommit, createCommitMessage;
+var init_git = __esm({
+  "src/git.ts"() {
+    init_cli();
+    init_args();
+    init_colors();
+    init_interactive();
+    init_frameworks();
+    init_cli2();
+    init_command();
+    init_packageManagers();
+    init_package3();
+    init_package();
+    offerGit = async (ctx) => {
+      const gitInstalled = await isGitInstalled();
+      if (!gitInstalled) {
+        if (ctx.args.git) {
+          updateStatus(
+            "Couldn't find `git` installed on your machine. Continuing without git."
+          );
+        }
+        ctx.args.git = false;
+        return;
+      }
+      const gitConfigured = await isGitConfigured();
+      if (!gitConfigured) {
+        if (ctx.args.git) {
+          updateStatus(
+            "Must configure `user.name` and user.email` to use git. Continuing without git."
+          );
+        }
+        ctx.args.git = false;
+        return;
+      }
+      const insideGitRepo = await isInsideGitRepo(ctx.project.path);
+      if (insideGitRepo) {
+        ctx.args.git = true;
+        return;
+      }
+      ctx.args.git = await processArgument(ctx.args, "git", {
+        type: "confirm",
+        question: "Do you want to use git for version control?",
+        label: "git",
+        defaultValue: C3_DEFAULTS.git
+      });
+      if (ctx.args.git) {
+        await initializeGit(ctx.project.path);
+      }
+    };
+    gitCommit = async (ctx) => {
+      const commitMessage = await createCommitMessage(ctx);
+      if (!ctx.args.git) {
+        return;
+      }
+      if (ctx.gitRepoAlreadyExisted) {
+        return;
+      }
+      const gitInstalled = await isGitInstalled();
+      const gitInitialized = await isInsideGitRepo(ctx.project.path);
+      if (!gitInstalled || !gitInitialized) {
+        return;
+      }
+      const s = spinner();
+      s.start("Committing new files");
+      await runCommand(["git", "add", "."], {
+        silent: true,
+        cwd: ctx.project.path
+      });
+      await runCommand(["git", "commit", "-m", commitMessage], {
+        silent: true,
+        cwd: ctx.project.path
+      });
+      s.stop(`${brandColor("git")} ${dim(`commit`)}`);
+    };
+    createCommitMessage = async (ctx) => {
+      const isPages = ctx.template.platform === "pages";
+      const header = isPages ? "Initialize web application via create-cloudflare CLI" : "Initial commit (by create-cloudflare CLI)";
+      const packageManager = detectPackageManager();
+      const gitVersion = await getGitVersion();
+      const insideRepo = await isInsideGitRepo(ctx.project.path);
+      const showFramework = isPages || ctx.template.id === "hono";
+      const details = [
+        { key: "C3", value: `create-cloudflare@${version}` },
+        { key: "project name", value: ctx.project.name },
+        ...showFramework ? [{ key: "framework", value: ctx.template.id }] : [],
+        ...showFramework ? [{ key: "framework cli", value: getFrameworkCli(ctx) }] : [],
+        {
+          key: "package manager",
+          value: `${packageManager.name}@${packageManager.version}`
+        },
+        {
+          key: "wrangler",
+          value: `wrangler@${version2}`
+        },
+        {
+          key: "git",
+          value: insideRepo ? gitVersion : "N/A"
+        }
+      ];
+      const body = `Details:
+${details.map(({ key, value }) => `  ${key} = ${value}`).join("\n")}
+`;
+      const commitMessage = `${header}
+
+${body}
+`;
+      ctx.commitMessage = commitMessage;
+      return commitMessage;
     };
   }
 });
@@ -70590,7 +70809,7 @@ var require_typescript2 = __commonJS({
 });
 
 // src/helpers/codemod.ts
-var import_fs11, import_path12, recast, esprimaParser, typescriptParser, parseFile, transformFile, loadSnippets, loadTemplateSnippets;
+var import_fs11, import_path12, recast, esprimaParser, typescriptParser, parseFile, transformFile, loadSnippets, loadTemplateSnippets, mergeObjectProperties, getPropertyName;
 var init_codemod = __esm({
   "src/helpers/codemod.ts"() {
     import_fs11 = require("fs");
@@ -70642,6 +70861,33 @@ var init_codemod = __esm({
     loadTemplateSnippets = (ctx) => {
       return loadSnippets(getTemplatePath(ctx));
     };
+    mergeObjectProperties = (sourceObject, newProperties) => {
+      newProperties.forEach((newProp) => {
+        const newPropName = getPropertyName(newProp);
+        if (!newPropName) {
+          return false;
+        }
+        const indexOfExisting = sourceObject.properties.findIndex(
+          (p2) => p2.type === "ObjectProperty" && getPropertyName(p2) === newPropName
+        );
+        const existing = sourceObject.properties[indexOfExisting];
+        if (!existing) {
+          sourceObject.properties.push(newProp);
+          return;
+        }
+        if (existing.type === "ObjectProperty" && existing.value.type === "ObjectExpression" && newProp.value.type === "ObjectExpression") {
+          mergeObjectProperties(
+            existing.value,
+            newProp.value.properties
+          );
+          return;
+        }
+        sourceObject.properties[indexOfExisting] = newProp;
+      });
+    };
+    getPropertyName = (newProp) => {
+      return newProp.key.type === "Identifier" ? newProp.key.name : newProp.key.type === "StringLiteral" ? newProp.key.value : null;
+    };
   }
 });
 
@@ -71386,9 +71632,10 @@ var init_c38 = __esm({
         visitCallExpression: function(n2) {
           const callee = n2.node.callee;
           if (callee.name === "defineNuxtConfig") {
-            const obj = n2.node.arguments[0];
-            obj.properties.push(presetDef);
-            obj.properties.push(moduleDef);
+            mergeObjectProperties(
+              n2.node.arguments[0],
+              [presetDef, moduleDef]
+            );
           }
           return this.traverse(n2);
         }
@@ -71673,8 +71920,9 @@ var init_c312 = __esm({
             return this.traverse(n2);
           }
           const b2 = recast6.types.builders;
-          n2.node.arguments = [
-            b2.objectExpression([
+          mergeObjectProperties(
+            n2.node.arguments[0],
+            [
               b2.objectProperty(
                 b2.identifier("server"),
                 b2.objectExpression([
@@ -71693,8 +71941,8 @@ var init_c312 = __esm({
                   )
                 ])
               )
-            ])
-          ];
+            ]
+          );
           return false;
         }
       });
@@ -71921,18 +72169,18 @@ var init_c316 = __esm({
   }
 });
 
-// templates/hello-world-durable-object/c3.ts
+// templates/common/c3.ts
 var c3_exports17 = {};
 __export(c3_exports17, {
   default: () => c3_default17
 });
 var c3_default17;
 var init_c317 = __esm({
-  "templates/hello-world-durable-object/c3.ts"() {
+  "templates/common/c3.ts"() {
     c3_default17 = {
       configVersion: 1,
-      id: "hello-world-durable-object",
-      displayName: '"Hello World" Durable Object',
+      id: "common",
+      displayName: "Example router & proxy Worker",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -71948,18 +72196,18 @@ var init_c317 = __esm({
   }
 });
 
-// templates/common/c3.ts
+// templates/scheduled/c3.ts
 var c3_exports18 = {};
 __export(c3_exports18, {
   default: () => c3_default18
 });
 var c3_default18;
 var init_c318 = __esm({
-  "templates/common/c3.ts"() {
+  "templates/scheduled/c3.ts"() {
     c3_default18 = {
       configVersion: 1,
-      id: "common",
-      displayName: "Example router & proxy Worker",
+      id: "scheduled",
+      displayName: "Scheduled Worker (Cron Trigger)",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -71975,18 +72223,18 @@ var init_c318 = __esm({
   }
 });
 
-// templates/scheduled/c3.ts
+// templates/queues/c3.ts
 var c3_exports19 = {};
 __export(c3_exports19, {
   default: () => c3_default19
 });
 var c3_default19;
 var init_c319 = __esm({
-  "templates/scheduled/c3.ts"() {
+  "templates/queues/c3.ts"() {
     c3_default19 = {
       configVersion: 1,
-      id: "scheduled",
-      displayName: "Scheduled Worker (Cron Trigger)",
+      id: "queues",
+      displayName: "Queue consumer & producer Worker",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -71997,23 +72245,33 @@ var init_c319 = __esm({
             path: "./ts"
           }
         }
+      },
+      bindings: {
+        queues: [
+          {
+            boundVariable: "MY_QUEUE",
+            defaultValue: "my-queue",
+            producer: true,
+            consumer: true
+          }
+        ]
       }
     };
   }
 });
 
-// templates/queues/c3.ts
+// templates/hello-world-durable-object/c3.ts
 var c3_exports20 = {};
 __export(c3_exports20, {
   default: () => c3_default20
 });
 var c3_default20;
 var init_c320 = __esm({
-  "templates/queues/c3.ts"() {
+  "templates/hello-world-durable-object/c3.ts"() {
     c3_default20 = {
       configVersion: 1,
-      id: "queues",
-      displayName: "Queue consumer & producer Worker",
+      id: "hello-world-durable-object",
+      displayName: "Co-ordination / multiplayer API (using Durable Objects)",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -72024,16 +72282,6 @@ var init_c320 = __esm({
             path: "./ts"
           }
         }
-      },
-      bindings: {
-        queues: [
-          {
-            boundVariable: "MY_QUEUE",
-            defaultValue: "my-queue",
-            producer: true,
-            consumer: true
-          }
-        ]
       }
     };
   }
@@ -72206,12 +72454,12 @@ var init_templates = __esm({
       return {
         "hello-world": (await Promise.resolve().then(() => (init_c315(), c3_exports15))).default,
         "hello-world-python": (await Promise.resolve().then(() => (init_c316(), c3_exports16))).default,
-        "hello-world-durable-object": (await Promise.resolve().then(() => (init_c317(), c3_exports17))).default,
         // Dummy record -- actual template config resolved in `selectFramework`
         "web-framework": { displayName: "Website or web app" },
-        common: (await Promise.resolve().then(() => (init_c318(), c3_exports18))).default,
-        scheduled: (await Promise.resolve().then(() => (init_c319(), c3_exports19))).default,
-        queues: (await Promise.resolve().then(() => (init_c320(), c3_exports20))).default,
+        common: (await Promise.resolve().then(() => (init_c317(), c3_exports17))).default,
+        scheduled: (await Promise.resolve().then(() => (init_c318(), c3_exports18))).default,
+        queues: (await Promise.resolve().then(() => (init_c319(), c3_exports19))).default,
+        "hello-world-durable-object": (await Promise.resolve().then(() => (init_c320(), c3_exports20))).default,
         openapi: (await Promise.resolve().then(() => (init_c321(), c3_exports21))).default,
         // Dummy record -- actual template config resolved in `processRemoteTemplate`
         "remote-template": {
@@ -77948,200 +78196,7 @@ init_colors();
 init_cli2();
 init_command();
 init_packageManagers();
-
-// src/git.ts
-init_cli();
-init_args();
-init_colors();
-init_interactive();
-init_frameworks();
-init_cli2();
-init_command();
-init_packageManagers();
-
-// ../wrangler/package.json
-var version2 = "0.0.0-5dd95736";
-
-// src/git.ts
-init_package();
-var offerGit = async (ctx) => {
-  const gitInstalled = await isGitInstalled();
-  if (!gitInstalled) {
-    if (ctx.args.git) {
-      updateStatus(
-        "Couldn't find `git` installed on your machine. Continuing without git."
-      );
-    }
-    ctx.args.git = false;
-    return;
-  }
-  const gitConfigured = await isGitConfigured();
-  if (!gitConfigured) {
-    if (ctx.args.git) {
-      updateStatus(
-        "Must configure `user.name` and user.email` to use git. Continuing without git."
-      );
-    }
-    ctx.args.git = false;
-    return;
-  }
-  const insideGitRepo = await isInsideGitRepo(ctx.project.path);
-  if (insideGitRepo) {
-    return;
-  }
-  ctx.args.git = await processArgument(ctx.args, "git", {
-    type: "confirm",
-    question: "Do you want to use git for version control?",
-    label: "git",
-    defaultValue: C3_DEFAULTS.git
-  });
-  if (ctx.args.git) {
-    await initializeGit(ctx.project.path);
-  }
-};
-var gitCommit = async (ctx) => {
-  const commitMessage = await createCommitMessage(ctx);
-  if (ctx.gitRepoAlreadyExisted) {
-    return;
-  }
-  const gitInstalled = await isGitInstalled();
-  const gitInitialized = await isInsideGitRepo(ctx.project.path);
-  if (!gitInstalled || !gitInitialized) {
-    return;
-  }
-  const s = spinner();
-  s.start("Committing new files");
-  await runCommand(["git", "add", "."], {
-    silent: true,
-    cwd: ctx.project.path
-  });
-  await runCommand(["git", "commit", "-m", commitMessage], {
-    silent: true,
-    cwd: ctx.project.path
-  });
-  s.stop(`${brandColor("git")} ${dim(`commit`)}`);
-};
-var createCommitMessage = async (ctx) => {
-  const isPages = ctx.template.platform === "pages";
-  const header = isPages ? "Initialize web application via create-cloudflare CLI" : "Initial commit (by create-cloudflare CLI)";
-  const packageManager = detectPackageManager();
-  const gitVersion = await getGitVersion();
-  const insideRepo = await isInsideGitRepo(ctx.project.path);
-  const showFramework = isPages || ctx.template.id === "hono";
-  const details = [
-    { key: "C3", value: `create-cloudflare@${version}` },
-    { key: "project name", value: ctx.project.name },
-    ...showFramework ? [{ key: "framework", value: ctx.template.id }] : [],
-    ...showFramework ? [{ key: "framework cli", value: getFrameworkCli(ctx) }] : [],
-    {
-      key: "package manager",
-      value: `${packageManager.name}@${packageManager.version}`
-    },
-    {
-      key: "wrangler",
-      value: `wrangler@${version2}`
-    },
-    {
-      key: "git",
-      value: insideRepo ? gitVersion : "N/A"
-    }
-  ];
-  const body = `Details:
-${details.map(({ key, value }) => `  ${key} = ${value}`).join("\n")}
-`;
-  const commitMessage = `${header}
-
-${body}
-`;
-  ctx.commitMessage = commitMessage;
-  return commitMessage;
-};
-async function getGitVersion() {
-  try {
-    const rawGitVersion = await runCommand(["git", "--version"], {
-      useSpinner: false,
-      silent: true
-    });
-    const gitVersion = rawGitVersion.replace(/^git\s+version\s+/, "");
-    return gitVersion;
-  } catch {
-    return null;
-  }
-}
-async function isGitInstalled() {
-  return await getGitVersion() !== null;
-}
-async function isGitConfigured() {
-  try {
-    const userName = await runCommand(["git", "config", "user.name"], {
-      useSpinner: false,
-      silent: true
-    });
-    if (!userName) {
-      return false;
-    }
-    const email = await runCommand(["git", "config", "user.email"], {
-      useSpinner: false,
-      silent: true
-    });
-    if (!email) {
-      return false;
-    }
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function isInsideGitRepo(cwd) {
-  try {
-    const output = await runCommand(["git", "status"], {
-      cwd,
-      useSpinner: false,
-      silent: true,
-      captureOutput: true
-    });
-    return output.includes("not a git repository") === false;
-  } catch (err) {
-    return false;
-  }
-}
-async function initializeGit(cwd) {
-  const s = spinner();
-  s.start("Initializing git repo");
-  try {
-    const defaultBranchName = await runCommand(
-      ["git", "config", "--get", "init.defaultBranch"],
-      { useSpinner: false, silent: true, cwd }
-    );
-    await runCommand(
-      ["git", "init", "--initial-branch", defaultBranchName.trim() ?? "main"],
-      // branch names can't contain spaces, so this is safe
-      { useSpinner: false, silent: true, cwd }
-    );
-  } catch {
-    await runCommand(["git", "init"], { useSpinner: false, silent: true, cwd });
-  } finally {
-    s.stop(`${brandColor("initialized")} ${dim(`git`)}`);
-  }
-}
-async function getProductionBranch(cwd) {
-  try {
-    const productionBranch = await runCommand(
-      ["git", "branch", "--show-current"],
-      {
-        silent: true,
-        cwd,
-        useSpinner: false,
-        captureOutput: true
-      }
-    );
-    return productionBranch.trim();
-  } catch (err) {
-  }
-  return "main";
-}
-
-// src/deploy.ts
+init_git();
 init_accounts();
 
 // src/wrangler/config.ts
@@ -79344,6 +79399,9 @@ var runDeploy = async (ctx) => {
   }
 };
 
+// src/cli.ts
+init_git();
+
 // src/pages.ts
 init_cli();
 init_colors();
@@ -79369,6 +79427,7 @@ var retry = async (config14, fn) => {
 };
 
 // src/pages.ts
+init_git();
 var CREATE_PROJECT_RETRIES = 3;
 var VERIFY_PROJECT_RETRIES = 3;
 var { npx } = detectPackageManager();