create-cloudflare 2.21.2 → 2.21.4

package/dist/cli.js

@@ -3902,7 +3902,7 @@ var init_args = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "2.21.2";
+    version = "2.21.4";
   }
 });
 
@@ -24714,19 +24714,19 @@ 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",
+        "create-astro": "4.8.0",
+        "create-analog": "1.3.1",
         "@angular/create": "17.3.7",
-        "create-docusaurus": "3.1.1",
-        "create-hono": "0.7.0",
+        "create-docusaurus": "3.3.2",
+        "create-hono": "0.7.3",
         "create-next-app": "14.1.0",
         "create-qwik": "1.5.4",
         "create-react-app": "5.0.1",
-        "create-remix": "2.8.1",
+        "create-remix": "2.9.2",
         "create-solid": "0.5.5",
-        "create-svelte": "6.0.10",
+        "create-svelte": "6.1.2",
         "create-vue": "3.10.2",
-        gatsby: "5.13.4",
+        gatsby: "5.13.5",
         nuxi: "3.11.1"
       },
       frameworkCliMap: {
@@ -24757,6 +24757,7 @@ var init_frameworks = __esm({
     init_colors();
     init_command();
     init_packageManagers();
+    init_git();
     init_package2();
     getFrameworkCli = (ctx, withVersion = true) => {
       if (!ctx.template) {
@@ -24782,6 +24783,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 = "3.58.0";
+  }
+});
+
+// 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;
     };
   }
 });
@@ -77948,200 +78166,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 = "3.57.0";
-
-// 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 +79369,9 @@ var runDeploy = async (ctx) => {
   }
 };
 
+// src/cli.ts
+init_git();
+
 // src/pages.ts
 init_cli();
 init_colors();
@@ -79369,6 +79397,7 @@ var retry = async (config14, fn) => {
 };
 
 // src/pages.ts
+init_git();
 var CREATE_PROJECT_RETRIES = 3;
 var VERIFY_PROJECT_RETRIES = 3;
 var { npx } = detectPackageManager();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.21.2",
+  "version": "2.21.4",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -29,7 +29,7 @@
     "@babel/parser": "^7.21.3",
     "@babel/types": "^7.21.4",
     "@clack/prompts": "^0.6.3",
-    "@cloudflare/workers-types": "^4.20240512.0",
+    "@cloudflare/workers-types": "^4.20240524.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -67,7 +67,7 @@
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.57.0"
+    "wrangler": "3.58.0"
   },
   "engines": {
     "node": ">=18.14.1"
@@ -82,6 +82,10 @@
     "check:type": "tsc",
     "lint": "eslint",
     "test:e2e": "vitest run --config ./vitest-e2e.config.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",

package/templates/hello-world-durable-object/js/src/index.js

@@ -32,7 +32,7 @@ export class MyDurableObject extends DurableObject {
 
 	/**
 	 * The Durable Object exposes an RPC method sayHello which will be invoked when when a Durable
-	 *  Object instance receives a request from a Worker via the same method invokation on the stub
+	 *  Object instance receives a request from a Worker via the same method invocation on the stub
 	 *
 	 * @param {string} name - The name provided to a Durable Object instance from a Worker
 	 * @returns {Promise<string>} The greeting to be sent back to the Worker

package/templates/hello-world-durable-object/js/wrangler.toml

@@ -1,6 +1,6 @@
 #:schema node_modules/wrangler/config-schema.json
 name = "<TBD>"
-main = "src/index.ts"
+main = "src/index.js"
 compatibility_date = "<TBD>"
 
 # Automatically place your workloads in an optimal location to minimize latency.

package/templates/hello-world-durable-object/ts/src/index.ts

@@ -49,7 +49,7 @@ export class MyDurableObject extends DurableObject {
 
 	/**
 	 * The Durable Object exposes an RPC method sayHello which will be invoked when when a Durable
-	 *  Object instance receives a request from a Worker via the same method invokation on the stub
+	 *  Object instance receives a request from a Worker via the same method invocation on the stub
 	 *
 	 * @param name - The name provided to a Durable Object instance from a Worker
 	 * @returns The greeting to be sent back to the Worker