create-cloudflare 2.6.2 → 2.7.0

package/dist/cli.js

@@ -60107,7 +60107,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "2.6.2";
+var version = "2.7.0";
 var devDependencies = {
   "@babel/parser": "^7.21.3",
   "@babel/types": "^7.21.4",
@@ -60136,14 +60136,13 @@ var devDependencies = {
   glob: "^10.3.3",
   haikunator: "^2.1.2",
   open: "^8.4.0",
-  pnpm: "^8.6.11",
+  pnpm: "^8.10.0",
   recast: "^0.22.0",
   semver: "^7.5.1",
   "shell-quote": "^1.8.1",
   typescript: "^5.0.2",
   undici: "5.20.0",
   "vite-tsconfig-paths": "^4.0.8",
-  vitest: "^0.30.0",
   "which-pm-runs": "^1.1.0",
   wrangler: "workspace:*",
   yargs: "^17.7.1",
@@ -60387,7 +60386,11 @@ var retry = async ({
   }
   throw error;
 };
-var runFrameworkGenerator = async (ctx, cmd) => {
+var runFrameworkGenerator = async (ctx, argString) => {
+  const cli = getFrameworkCli(ctx, true);
+  const { npm: npm14, dlx: dlx2 } = detectPackageManager();
+  let cmd = `${npm14 === "yarn" ? "npx" : dlx2} ${cli} ${argString}`;
+  const env3 = npm14 === "yarn" ? { npm_config_user_agent: "yarn" } : {};
   if (ctx.framework?.args?.length) {
     cmd = `${cmd} ${quote(ctx.framework.args)}`;
   }
@@ -60399,7 +60402,7 @@ var runFrameworkGenerator = async (ctx, cmd) => {
     const flags = ctx.framework?.config.testFlags ?? [];
     cmd = `${cmd} ${quote(flags)}`;
   }
-  await runCommand(cmd);
+  await runCommand(cmd, { env: env3 });
 };
 var installPackages = async (packages, config14) => {
   const { npm: npm14 } = detectPackageManager();
@@ -60426,25 +60429,42 @@ var installPackages = async (packages, config14) => {
     silent: true
   });
 };
-var npmInstall = async () => {
+var resetPackageManager = async (ctx) => {
   const { npm: npm14 } = detectPackageManager();
+  if (!needsPackageManagerReset(ctx)) {
+    return;
+  }
+  const nodeModulesPath = import_path5.default.join(ctx.project.path, "node_modules");
+  if ((0, import_fs5.existsSync)(nodeModulesPath))
+    (0, import_fs5.rmSync)(nodeModulesPath, { recursive: true });
+  const lockfilePath = import_path5.default.join(ctx.project.path, "package-lock.json");
+  if ((0, import_fs5.existsSync)(lockfilePath))
+    (0, import_fs5.rmSync)(lockfilePath);
   await runCommand(`${npm14} install`, {
     silent: true,
+    cwd: ctx.project.path,
     startText: "Installing dependencies",
     doneText: `${brandColor("installed")} ${dim(`via \`${npm14} install\``)}`
   });
 };
-var resetPackageManager = async (ctx) => {
+var needsPackageManagerReset = (ctx) => {
+  const { npm: npm14 } = detectPackageManager();
+  const projectPath = ctx.project.path;
+  switch (npm14) {
+    case "npm":
+      return false;
+    case "yarn":
+      return !(0, import_fs5.existsSync)(import_path5.default.join(projectPath, "yarn.lock"));
+    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"));
+  }
+};
+var npmInstall = async () => {
   const { npm: npm14 } = detectPackageManager();
-  if (npm14 === "npm")
-    return;
-  const nodeModulesPath = import_path5.default.join(ctx.project.path, "node_modules");
-  (0, import_fs5.rmSync)(nodeModulesPath, { recursive: true });
-  const lockfilePath = import_path5.default.join(ctx.project.path, "package-lock.json");
-  (0, import_fs5.rmSync)(lockfilePath);
   await runCommand(`${npm14} install`, {
     silent: true,
-    cwd: ctx.project.path,
     startText: "Installing dependencies",
     doneText: `${brandColor("installed")} ${dim(`via \`${npm14} install\``)}`
   });
@@ -60465,9 +60485,9 @@ var installWrangler = async () => {
   });
 };
 var isLoggedIn = async () => {
-  const { npx: npx6 } = detectPackageManager();
+  const { npx: npx5 } = detectPackageManager();
   try {
-    const output = await runCommand(`${npx6} wrangler whoami`, {
+    const output = await runCommand(`${npx5} wrangler whoami`, {
       silent: true
     });
     return /You are logged in/.test(output);
@@ -60476,7 +60496,7 @@ var isLoggedIn = async () => {
   }
 };
 var wranglerLogin = async () => {
-  const { npx: npx6 } = detectPackageManager();
+  const { npx: npx5 } = detectPackageManager();
   const s = spinner();
   s.start(`Logging into Cloudflare ${dim("checking authentication status")}`);
   const alreadyLoggedIn = await isLoggedIn();
@@ -60484,7 +60504,7 @@ var wranglerLogin = async () => {
   if (alreadyLoggedIn)
     return true;
   s.start(`Logging into Cloudflare ${dim("This will open a browser window")}`);
-  const output = await runCommand(`${npx6} wrangler login`, {
+  const output = await runCommand(`${npx5} wrangler login`, {
     silent: true
   });
   const success = /Successfully logged in/.test(output);
@@ -60493,8 +60513,8 @@ var wranglerLogin = async () => {
   return success;
 };
 var listAccounts = async () => {
-  const { npx: npx6 } = detectPackageManager();
-  const output = await runCommand(`${npx6} wrangler whoami`, {
+  const { npx: npx5 } = detectPackageManager();
+  const output = await runCommand(`${npx5} wrangler whoami`, {
     silent: true
   });
   const accounts = {};
@@ -60595,38 +60615,30 @@ var compatDateFlag = async () => {
 };
 
 // src/frameworks/angular/index.ts
-var { dlx, npx, npm } = detectPackageManager();
+var { npm } = detectPackageManager();
 var generate = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(
-    ctx,
-    `${dlx} ${cli} new ${ctx.project.name} --standalone`
-  );
+  await runFrameworkGenerator(ctx, `${ctx.project.name} --ssr`);
   logRaw("");
 };
 var configure = async (ctx) => {
   process.chdir(ctx.project.path);
-  await runCommand(`${npx} ng analytics disable`, {
-    silent: true
-  });
-  await addSSRAdapter();
-  await installCFWorker(ctx);
-  await updateAppCode();
   updateAngularJson(ctx);
+  await updateAppCode();
+  await installCFWorker(ctx);
 };
 var config = {
   generate,
   configure,
   displayName: "Angular",
   getPackageScripts: async () => ({
-    process: "node ./tools/copy-worker-files.mjs && node ./tools/copy-client-files.mjs && node ./tools/bundle.mjs",
-    "pages:build": `${npm} run build:ssr && ${npm} run process`,
     start: `${npm} run pages:build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+    process: "node ./tools/copy-files.mjs && node ./tools/alter-polyfills.mjs",
+    "pages:build": `ng build && ${npm} run process`,
     deploy: `${npm} run pages:build && wrangler pages deploy dist/cloudflare`
   }),
   deployCommand: "deploy",
   devCommand: "start",
-  testFlags: ["--routing", "--style", "sass"]
+  testFlags: ["--ssr", "--style", "sass"]
 };
 var angular_default = config;
 async function installCFWorker(ctx) {
@@ -60640,15 +60652,7 @@ async function installCFWorker(ctx) {
   );
   s.stop(`${brandColor("copied")} ${dim("adapter code")}`);
   await installPackages(
-    [
-      "@cloudflare/workers-types",
-      "@esbuild-plugins/node-globals-polyfill",
-      "@esbuild-plugins/node-modules-polyfill",
-      "@miniflare/tre@next",
-      "esbuild",
-      "fast-glob",
-      "wrangler@beta"
-    ],
+    ["@cloudflare/workers-types", "@miniflare/tre@next", "wrangler@beta"],
     {
       dev: true,
       startText: "Installing adapter dependencies",
@@ -60656,59 +60660,50 @@ async function installCFWorker(ctx) {
     }
   );
 }
-async function addSSRAdapter() {
-  const cmd = `${npx} ng add @nguniversal/express-engine`;
-  await runCommand(`${cmd} --skip-confirmation`, {
-    silent: true,
-    startText: "Installing Angular SSR",
-    doneText: `${brandColor("installed")} ${dim(`via \`${cmd}\``)}`
-  });
-}
 async function updateAppCode() {
   const s = spinner();
   s.start(`Updating application code`);
   const appConfigPath = "src/app/app.config.ts";
   const appConfig = readFile((0, import_node_path.resolve)(appConfigPath));
-  const newAppConfig = "import { provideClientHydration } from '@angular/platform-browser';\nimport { provideHttpClient, withFetch } from '@angular/common/http';\n" + appConfig.replace(
+  const newAppConfig = "import { provideHttpClient, withFetch } from '@angular/common/http';\n" + appConfig.replace(
     "providers: [",
-    "providers: [provideHttpClient(withFetch()), provideClientHydration(), "
+    "providers: [provideHttpClient(withFetch()), "
   );
   writeFile2((0, import_node_path.resolve)(appConfigPath), newAppConfig);
-  await (0, import_promises.rm)((0, import_node_path.resolve)("server.ts"));
   s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
+  s.start(`Updating package.json`);
+  const packageJsonPath = (0, import_node_path.resolve)("package.json");
+  const packageManifest = readJSON(packageJsonPath);
+  delete packageManifest["dependencies"]["@angular/ssr"];
+  delete packageManifest["dependencies"]["express"];
+  writeFile2(packageJsonPath, JSON.stringify(packageManifest, null, 2));
+  s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
 }
 function updateAngularJson(ctx) {
   const s = spinner();
   s.start(`Updating angular.json config`);
   const angularJson = readJSON((0, import_node_path.resolve)("angular.json"));
   const architectSection = angularJson.projects[ctx.project.name].architect;
-  architectSection.build.options.outputPath = "dist/browser";
+  architectSection.build.options.outputPath = "dist";
   architectSection.build.options.assets.push("src/_routes.json");
-  architectSection.server.options.outputPath = "dist/server";
-  architectSection.server.options.main = "src/main.server.ts";
-  delete architectSection["serve-ssr"];
   writeFile2((0, import_node_path.resolve)("angular.json"), JSON.stringify(angularJson, null, 2));
   s.stop(`${brandColor(`updated`)} ${dim(`\`angular.json\``)}`);
 }
 
 // src/frameworks/astro/index.ts
-var { npx: npx2, dlx: dlx2 } = detectPackageManager();
+var { npx } = detectPackageManager();
 var generate2 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(
-    ctx,
-    `${dlx2} ${cli} ${ctx.project.name} --no-install`
-  );
+  await runFrameworkGenerator(ctx, `${ctx.project.name} --no-install`);
   logRaw("");
 };
 var configure2 = async (ctx) => {
   process.chdir(ctx.project.path);
   await npmInstall();
-  await runCommand(`${npx2} astro add cloudflare -y`, {
+  await runCommand(`${npx} astro add cloudflare -y`, {
     silent: true,
     startText: "Installing adapter",
     doneText: `${brandColor("installed")} ${dim(
-      `via \`${npx2} astro add cloudflare\``
+      `via \`${npx} astro add cloudflare\``
     )}`
   });
 };
@@ -60733,10 +60728,9 @@ var config2 = {
 var astro_default = config2;
 
 // src/frameworks/docusaurus/index.ts
-var { npm: npm2, dlx: dlx3 } = detectPackageManager();
+var { npm: npm2 } = detectPackageManager();
 var generate3 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(ctx, `${dlx3} ${cli} ${ctx.project.name} classic`);
+  await runFrameworkGenerator(ctx, `${ctx.project.name} classic`);
 };
 var config3 = {
   generate: generate3,
@@ -60750,7 +60744,7 @@ var config3 = {
 var docusaurus_default = config3;
 
 // src/frameworks/gatsby/index.ts
-var { npm: npm3, dlx: dlx4 } = detectPackageManager();
+var { npm: npm3 } = detectPackageManager();
 var generate4 = async (ctx) => {
   const defaultTemplate = "https://github.com/gatsbyjs/gatsby-starter-blog";
   const useTemplate = await inputPrompt({
@@ -60768,11 +60762,7 @@ var generate4 = async (ctx) => {
       defaultValue: defaultTemplate
     });
   }
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(
-    ctx,
-    `${dlx4} ${cli} new ${ctx.project.name} ${templateUrl}`
-  );
+  await runFrameworkGenerator(ctx, `new ${ctx.project.name} ${templateUrl}`);
 };
 var config4 = {
   generate: generate4,
@@ -60785,12 +60775,10 @@ var config4 = {
 var gatsby_default = config4;
 
 // src/frameworks/hono/index.ts
-var { dlx: dlx5 } = detectPackageManager();
 var generate5 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
   await runFrameworkGenerator(
     ctx,
-    `${dlx5} ${cli} ${ctx.project.name} --template cloudflare-workers`
+    `${ctx.project.name} --template cloudflare-workers`
   );
   logRaw("");
 };
@@ -60854,11 +60842,10 @@ export async function GET(request) {
 `;
 
 // src/frameworks/next/index.ts
-var { npm: npm4, npx: npx3, dlx: dlx6 } = detectPackageManager();
+var { npm: npm4, npx: npx2 } = detectPackageManager();
 var generate6 = async (ctx) => {
   const projectName = ctx.project.name;
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(ctx, `${dlx6} ${cli} ${projectName}`);
+  await runFrameworkGenerator(ctx, `${projectName}`);
 };
 var getApiTemplate = (apiPath, isTypescript) => {
   const isAppDir = /\/app\/api$/.test(apiPath);
@@ -60943,7 +60930,7 @@ var config6 = {
     const isNpmOrBun = isNpm || isBun;
     const nextOnPagesScope = isNpmOrBun ? "@cloudflare/" : "";
     const nextOnPagesCommand = `${nextOnPagesScope}next-on-pages`;
-    const pmCommand = isNpmOrBun ? npx3 : npm4;
+    const pmCommand = isNpmOrBun ? npx2 : npm4;
     const pagesDeployCommand = isNpm ? "npm run" : isBun ? "bun" : pmCommand;
     return {
       "pages:build": `${pmCommand} ${nextOnPagesCommand}`,
@@ -60967,13 +60954,12 @@ var config6 = {
 var next_default = config6;
 
 // src/frameworks/nuxt/index.ts
-var { npm: npm5, dlx: dlx7 } = detectPackageManager();
+var { npm: npm5 } = detectPackageManager();
 var generate7 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
   const gitFlag = ctx.args.git ? `--gitInit` : `--no-gitInit`;
   await runFrameworkGenerator(
     ctx,
-    `${dlx7} ${cli} init ${ctx.project.name} --packageManager ${npm5} ${gitFlag}`
+    `init ${ctx.project.name} --packageManager ${npm5} ${gitFlag}`
   );
   logRaw("");
 };
@@ -61003,22 +60989,22 @@ var package_default = {
     "additionally it also contains a map that maps frameworks to their respective clis"
   ],
   dependencies: {
-    "@angular/cli": "16.2.2",
-    "create-astro": "4.3.0",
-    "create-docusaurus": "2.4.3",
+    "create-astro": "4.5.1",
+    "@angular/create": "17.0.0-rc.4",
+    "create-docusaurus": "3.0.0",
     "create-hono": "0.3.2",
     "create-next-app": "13.4.19",
-    "create-qwik": "1.2.14",
+    "create-qwik": "1.2.17",
     "create-react-app": "5.0.1",
-    "create-remix": "2.1.0",
-    "create-solid": "0.3.8",
+    "create-remix": "2.2.0",
+    "create-solid": "0.3.9",
     "create-svelte": "5.1.1",
     "create-vue": "3.8.0",
-    gatsby: "5.12.8",
-    nuxi: "3.9.0"
+    gatsby: "5.12.9",
+    nuxi: "3.9.1"
   },
   frameworkCliMap: {
-    angular: "@angular/cli",
+    angular: "@angular/create",
     astro: "create-astro",
     docusaurus: "create-docusaurus",
     gatsby: "gatsby",
@@ -61035,15 +61021,14 @@ var package_default = {
 };
 
 // src/frameworks/qwik/index.ts
-var { npm: npm6, npx: npx4, dlx: dlx8 } = detectPackageManager();
+var { npm: npm6, npx: npx3 } = detectPackageManager();
 var generate8 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(ctx, `${dlx8} ${cli} basic ${ctx.project.name}`);
+  await runFrameworkGenerator(ctx, `basic ${ctx.project.name}`);
 };
 var configure5 = async (ctx) => {
   process.chdir(ctx.project.path);
   await npmInstall();
-  const cmd = `${npx4} qwik add cloudflare-pages`;
+  const cmd = `${npx3} qwik add cloudflare-pages`;
   endSection(`Running ${cmd}`);
   await runCommand(cmd);
 };
@@ -61059,18 +61044,13 @@ var config8 = {
 var qwik_default = config8;
 
 // src/frameworks/react/index.ts
-var { npm: npm7, dlx: dlx9 } = detectPackageManager();
+var { npm: npm7 } = detectPackageManager();
 var generate9 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(ctx, `${dlx9} ${cli} ${ctx.project.name}`);
+  await runFrameworkGenerator(ctx, `${ctx.project.name}`);
   logRaw("");
 };
-var configure6 = async (ctx) => {
-  await resetPackageManager(ctx);
-};
 var config9 = {
   generate: generate9,
-  configure: configure6,
   displayName: "React",
   getPackageScripts: async () => ({
     "pages:dev": `wrangler pages dev ${await compatDateFlag()} --port 3000 -- ${npm7} start`,
@@ -61080,12 +61060,11 @@ var config9 = {
 var react_default = config9;
 
 // src/frameworks/remix/index.ts
-var { npm: npm8, dlx: dlx10 } = detectPackageManager();
+var { npm: npm8 } = detectPackageManager();
 var generate10 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
   await runFrameworkGenerator(
     ctx,
-    `${dlx10} ${cli} ${ctx.project.name} --template https://github.com/remix-run/remix/tree/main/templates/cloudflare-pages`
+    `${ctx.project.name} --template https://github.com/remix-run/remix/tree/main/templates/cloudflare-pages`
   );
   logRaw("");
 };
@@ -61112,13 +61091,12 @@ export default defineConfig({
 `;
 
 // src/frameworks/solid/index.ts
-var { npm: npm9, dlx: dlx11 } = detectPackageManager();
+var { npm: npm9 } = detectPackageManager();
 var generate11 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(ctx, `${dlx11} ${cli} ${ctx.project.name}`);
+  await runFrameworkGenerator(ctx, `${ctx.project.name}`);
   logRaw("");
 };
-var configure7 = async (ctx) => {
+var configure6 = async (ctx) => {
   process.chdir(ctx.project.path);
   const pkg = "solid-start-cloudflare-pages";
   await installPackages([pkg], {
@@ -61134,7 +61112,7 @@ var configure7 = async (ctx) => {
 };
 var config11 = {
   generate: generate11,
-  configure: configure7,
+  configure: configure6,
   displayName: "Solid",
   getPackageScripts: async () => ({
     "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 3000 -- ${npm9} run dev`,
@@ -61190,13 +61168,12 @@ interface Platform {
 `;
 
 // src/frameworks/svelte/index.ts
-var { npm: npm10, dlx: dlx12 } = detectPackageManager();
+var { npm: npm10 } = detectPackageManager();
 var generate12 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(ctx, `${dlx12} ${cli} ${ctx.project.name}`);
+  await runFrameworkGenerator(ctx, `${ctx.project.name}`);
   logRaw("");
 };
-var configure8 = async (ctx) => {
+var configure7 = async (ctx) => {
   process.chdir(ctx.project.path);
   await npmInstall();
   const pkg = `@sveltejs/adapter-cloudflare`;
@@ -61231,7 +61208,7 @@ var configure8 = async (ctx) => {
 };
 var config12 = {
   generate: generate12,
-  configure: configure8,
+  configure: configure7,
   displayName: "Svelte",
   getPackageScripts: async () => ({
     "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 5173 -- ${npm10} run dev`,
@@ -61241,10 +61218,9 @@ var config12 = {
 var svelte_default = config12;
 
 // src/frameworks/vue/index.ts
-var { npm: npm11, dlx: dlx13 } = detectPackageManager();
+var { npm: npm11 } = detectPackageManager();
 var generate13 = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(ctx, `${dlx13} ${cli} ${ctx.project.name}`);
+  await runFrameworkGenerator(ctx, `${ctx.project.name}`);
 };
 var config13 = {
   generate: generate13,
@@ -61416,16 +61392,19 @@ function secondsSince(start) {
 }
 
 // ../wrangler/package.json
-var version2 = "3.15.0";
+var version2 = "3.16.0";
 
 // src/common.ts
 var { name, npm: npm12 } = detectPackageManager();
 var validateProjectDirectory = (relativePath, args) => {
   const path3 = (0, import_path7.resolve)(relativePath);
   const existsAlready = (0, import_fs8.existsSync)(path3);
-  const isEmpty = existsAlready && (0, import_fs8.readdirSync)(path3).length === 0;
-  if (existsAlready && !isEmpty) {
-    return `Directory \`${relativePath}\` already exists and is not empty. Please choose a new name.`;
+  if (existsAlready) {
+    for (const file of (0, import_fs8.readdirSync)(path3)) {
+      if (!isAllowedExistingFile(file)) {
+        return `Directory \`${relativePath}\` already exists and contains files that might conflict. Please choose a new name.`;
+      }
+    }
   }
   if (!args.existingScript) {
     const projectName = (0, import_path7.basename)(path3);
@@ -61442,6 +61421,46 @@ var validateProjectDirectory = (relativePath, args) => {
     }
   }
 };
+var isAllowedExistingFile = (file) => {
+  const allowedExistingFiles = /* @__PURE__ */ new Set([
+    ".DS_Store",
+    ".git",
+    ".gitattributes",
+    ".gitignore",
+    ".gitlab-ci.yml",
+    ".hg",
+    ".hgcheck",
+    ".hgignore",
+    ".idea",
+    ".npmignore",
+    ".travis.yml",
+    ".vscode",
+    "Thumbs.db",
+    "docs",
+    "mkdocs.yml",
+    "npm-debug.log",
+    "yarn-debug.log",
+    "yarn-error.log",
+    "yarnrc.yml",
+    ".yarn",
+    ".gitkeep"
+  ]);
+  if (allowedExistingFiles.has(file))
+    return true;
+  const allowedExistingPatters = [
+    /readme(\.md)?$/i,
+    /license(\.md)?$/i,
+    /\.iml$/,
+    /^npm-debug\.log/,
+    /^yarn-debug\.log/,
+    /^yarn-error\.log/
+  ];
+  for (const regex2 of allowedExistingPatters) {
+    if (regex2.test(file))
+      return true;
+  }
+  return false;
+};
 var setupProjectDirectory = (args) => {
   const path3 = (0, import_path7.resolve)(args.projectName);
   const err = validateProjectDirectory(path3, args);
@@ -61774,7 +61793,7 @@ async function getProductionBranch(cwd) {
 // src/pages.ts
 var CREATE_PROJECT_RETRIES = 3;
 var VERIFY_PROJECT_RETRIES = 3;
-var { npx: npx5 } = detectPackageManager();
+var { npx: npx4 } = detectPackageManager();
 var defaultFrameworkConfig = {
   deployCommand: "pages:deploy",
   devCommand: "pages:dev"
@@ -61801,11 +61820,12 @@ var runPagesGenerator = async (args) => {
     type: frameworkConfig.type,
     originalCWD
   };
-  const { generate: generate14, configure: configure9 } = FrameworkMap[framework];
+  const { generate: generate14, configure: configure8 } = FrameworkMap[framework];
   await generate14({ ...ctx });
   startSection("Configuring your application for Cloudflare", "Step 2 of 3");
-  if (configure9) {
-    await configure9({ ...ctx });
+  await resetPackageManager(ctx);
+  if (configure8) {
+    await configure8({ ...ctx });
   }
   await updatePackageScripts(ctx);
   await offerGit(ctx);
@@ -61887,7 +61907,7 @@ var createProject = async (ctx) => {
     );
     const compatFlagsArg = compatFlags ? `--compatibility-flags ${compatFlags}` : "";
     const productionBranch = await getProductionBranch(ctx.project.path);
-    const cmd = `${npx5} wrangler pages project create ${ctx.project.name} --production-branch ${productionBranch} ${compatFlagsArg}`;
+    const cmd = `${npx4} wrangler pages project create ${ctx.project.name} --production-branch ${productionBranch} ${compatFlagsArg}`;
     await retry(
       {
         times: CREATE_PROJECT_RETRIES,
@@ -61912,7 +61932,7 @@ var createProject = async (ctx) => {
     crash("Failed to create pages project. See output above.");
   }
   try {
-    const verifyProject = `${npx5} wrangler pages deployment list --project-name ${ctx.project.name}`;
+    const verifyProject = `${npx4} wrangler pages deployment list --project-name ${ctx.project.name}`;
     await retry(
       { times: VERIFY_PROJECT_RETRIES },
       async () => runCommand(verifyProject, {
@@ -61936,7 +61956,7 @@ var import_promises2 = require("fs/promises");
 var import_os = require("os");
 var import_path9 = require("path");
 var import_process4 = require("process");
-var { dlx: dlx14 } = detectPackageManager();
+var { dlx } = detectPackageManager();
 var runWorkersGenerator = async (args) => {
   const originalCWD = process.cwd();
   const { name: name2, path: path3 } = setupProjectDirectory(args);
@@ -62005,7 +62025,7 @@ async function copyExistingWorkerFiles(ctx) {
       (0, import_path9.join)((0, import_os.tmpdir)(), "c3-wrangler-init--from-dash-")
     );
     await runCommand(
-      `${dlx14} wrangler@3 init --from-dash ${ctx.args.existingScript} -y --no-delegate-c3`,
+      `${dlx} wrangler@3 init --from-dash ${ctx.args.existingScript} -y --no-delegate-c3`,
       {
         silent: true,
         cwd: tempdir,
@@ -62105,26 +62125,61 @@ var parseArgs = async (argv) => {
     doubleDashesIdx < 0 ? void 0 : doubleDashesIdx
   );
   const additionalArgs = doubleDashesIdx < 0 ? [] : argv.slice(doubleDashesIdx + 1);
-  const yargsObj = yargs_default(hideBin(c3Args)).scriptName("create-cloudflare").usage("$0 [args]").positional("name", { type: "string" }).option("type", { type: "string" }).option("framework", { type: "string" }).option("deploy", { type: "boolean" }).option("ts", { type: "boolean" }).option("git", { type: "boolean" }).option("open", {
+  const yargsObj = yargs_default(hideBin(c3Args)).scriptName("create-cloudflare").usage("$0 [args]").positional("directory", {
+    type: "string",
+    description: "The directory where the application should be created. The name of the application is taken from the directory name"
+  }).option("type", {
+    type: "string",
+    description: "The type of application that should be created"
+  }).option("framework", {
+    type: "string",
+    description: "The type of framework to use to create a web application (when using this option `--type` is ignored)"
+  }).option("deploy", {
+    type: "boolean",
+    description: "Deploy your application after it has been created"
+  }).option("ts", {
+    type: "boolean",
+    description: "Use TypeScript in your application"
+  }).option("git", {
+    type: "boolean",
+    description: "Initialize a local git repository for your application"
+  }).option("open", {
     type: "boolean",
     default: true,
-    description: "opens your browser after your deployment, set --no-open to disable"
+    description: "Opens the deployed application in your browser (this option is ignored if the application is not deployed)"
   }).option("existing-script", {
     type: "string",
     hidden: templateMap["pre-existing"].hidden
   }).option("accept-defaults", {
     alias: "y",
-    type: "boolean"
+    type: "boolean",
+    description: "Use all the default C3 options (each can also be overridden by specifying it)"
   }).option("auto-update", {
     type: "boolean",
     default: C3_DEFAULTS.autoUpdate,
-    description: "Automatically uses the latest version of `create-cloudflare`. Set --no-auto-update to disable"
-  }).option("wrangler-defaults", { type: "boolean", hidden: true }).version(version).strictOptions().alias("h", "help").help();
-  const args = await yargsObj.argv;
+    description: "Automatically uses the latest version of C3"
+  }).option("wrangler-defaults", { type: "boolean", hidden: true }).version(version).alias("v", "version").strictOptions().exitProcess(false).alias("h", "help").help();
+  let args = null;
+  try {
+    args = await yargsObj.argv;
+  } catch {
+  }
+  if (args === null) {
+    showMoreInfoNote();
+    process.exit(1);
+  }
+  if (args.version) {
+    process.exit(0);
+  }
+  if (args.help) {
+    showMoreInfoNote();
+    process.exit(0);
+  }
   const positionalArgs = args._;
   if (positionalArgs.length > 1) {
     yargsObj.showHelp();
     console.error("\nToo many positional arguments provided");
+    showMoreInfoNote();
     process.exit(1);
   }
   return {
@@ -62150,6 +62205,13 @@ var processArgument = async (args, name2, promptConfig) => {
   value = await inputPrompt(promptConfig);
   return value;
 };
+var showMoreInfoNote = () => {
+  const c3CliArgsDocsPage = "https://developers.cloudflare.com/pages/get-started/c3/#cli-arguments";
+  console.log(
+    `
+For more information regarding how to invoke C3 please visit ${c3CliArgsDocsPage}`
+  );
+};
 
 // src/cli.ts
 var import_semver2 = __toESM(require_semver2());
@@ -62209,9 +62271,12 @@ var runCli = async (args) => {
     options: templateOptions,
     defaultValue: C3_DEFAULTS.type
   });
-  if (!type || !Object.keys(templateMap).includes(type)) {
+  if (!type) {
     return crash("An application type must be specified to continue.");
   }
+  if (!Object.keys(templateMap).includes(type)) {
+    return crash(`Unknown application type provided: ${type}.`);
+  }
   const validatedArgs = {
     ...args,
     type,