create-cloudflare 0.0.0-db8b5fe5 → 0.0.0-dcb1ea6b

package/dist/angular/templates/tools/alter-polyfills.mjs

@@ -22,11 +22,6 @@ for (let index = 0; index < 2; index++) {
 }
 
 // Add needed polyfills
-serverPolyfillsData.unshift(
-	`globalThis['process'] = {};`,
-	`globalThis['global'] = globalThis;`,
-	// Needed as performance.mark is not a function in worker.
-	`performance.mark = () => {};`
-);
+serverPolyfillsData.unshift(`globalThis['process'] = {};`);
 
 fs.writeFileSync(serverPolyfillsFile, serverPolyfillsData.join(EOL));

package/dist/cli.js

@@ -60107,7 +60107,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-db8b5fe5";
+var version = "0.0.0-dcb1ea6b";
 var devDependencies = {
   "@babel/parser": "^7.21.3",
   "@babel/types": "^7.21.4",
@@ -60143,7 +60143,6 @@ var devDependencies = {
   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\``)}`
   });
@@ -60595,10 +60615,9 @@ var compatDateFlag = async () => {
 };
 
 // src/frameworks/angular/index.ts
-var { dlx, npm } = detectPackageManager();
+var { npm } = detectPackageManager();
 var generate = async (ctx) => {
-  const cli = getFrameworkCli(ctx);
-  await runFrameworkGenerator(ctx, `${dlx} ${cli} ${ctx.project.name} --ssr`);
+  await runFrameworkGenerator(ctx, `${ctx.project.name} --ssr`);
   logRaw("");
 };
 var configure = async (ctx) => {
@@ -60672,13 +60691,9 @@ function updateAngularJson(ctx) {
 }
 
 // src/frameworks/astro/index.ts
-var { npx, 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) => {
@@ -60713,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,
@@ -60730,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({
@@ -60748,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,
@@ -60765,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("");
 };
@@ -60834,11 +60842,10 @@ export async function GET(request) {
 `;
 
 // src/frameworks/next/index.ts
-var { npm: npm4, npx: npx2, 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);
@@ -60947,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("");
 };
@@ -60983,16 +60989,16 @@ var package_default = {
     "additionally it also contains a map that maps frameworks to their respective clis"
   ],
   dependencies: {
-    "create-astro": "4.4.1",
-    "@angular/create": "17.0.0-rc.3",
+    "create-astro": "4.5.1",
+    "@angular/create": "17.0.1",
     "create-docusaurus": "3.0.0",
     "create-hono": "0.3.2",
-    "create-next-app": "13.4.19",
-    "create-qwik": "1.2.15",
+    "create-next-app": "14.0.3",
+    "create-qwik": "1.2.17",
     "create-react-app": "5.0.1",
     "create-remix": "2.2.0",
-    "create-solid": "0.3.8",
-    "create-svelte": "5.1.1",
+    "create-solid": "0.3.9",
+    "create-svelte": "5.2.0",
     "create-vue": "3.8.0",
     gatsby: "5.12.9",
     nuxi: "3.9.1"
@@ -61015,10 +61021,9 @@ var package_default = {
 };
 
 // src/frameworks/qwik/index.ts
-var { npm: npm6, npx: npx3, 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);
@@ -61039,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`,
@@ -61060,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("");
 };
@@ -61092,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], {
@@ -61114,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`,
@@ -61170,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`;
@@ -61211,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`,
@@ -61221,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,
@@ -61396,7 +61392,7 @@ function secondsSince(start) {
 }
 
 // ../wrangler/package.json
-var version2 = "3.15.0";
+var version2 = "3.16.0";
 
 // src/common.ts
 var { name, npm: npm12 } = detectPackageManager();
@@ -61666,6 +61662,8 @@ var offerGit = async (ctx) => {
 };
 var gitCommit = async (ctx) => {
   const commitMessage = await createCommitMessage(ctx);
+  if (ctx.gitRepoAlreadyExisted)
+    return;
   if (!await isGitInstalled() || !await isInsideGitRepo(ctx.project.path))
     return;
   await runCommands({
@@ -61822,13 +61820,15 @@ var runPagesGenerator = async (args) => {
     },
     args,
     type: frameworkConfig.type,
-    originalCWD
+    originalCWD,
+    gitRepoAlreadyExisted: await isInsideGitRepo((0, import_path8.dirname)(path3))
   };
-  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);
@@ -61959,14 +61959,15 @@ 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);
   const ctx = {
     project: { name: name2, path: path3 },
     args,
-    originalCWD
+    originalCWD,
+    gitRepoAlreadyExisted: await isInsideGitRepo((0, import_path9.dirname)(path3))
   };
   ctx.args.ts = await processArgument(ctx.args, "ts", {
     type: "confirm",
@@ -62028,7 +62029,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-db8b5fe5",
+  "version": "0.0.0-dcb1ea6b",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -58,13 +58,12 @@
     "typescript": "^5.0.2",
     "undici": "5.20.0",
     "vite-tsconfig-paths": "^4.0.8",
-    "vitest": "^0.30.0",
     "which-pm-runs": "^1.1.0",
     "yargs": "^17.7.1",
     "yarn": "^1.22.19",
     "@cloudflare/cli": "1.0.0",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.15.0"
+    "wrangler": "3.16.0",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "engines": {
     "node": ">=18.14.1"
@@ -75,11 +74,13 @@
     "check:type": "tsc",
     "lint": "eslint",
     "test:e2e:cleanup": "node -r esbuild-register scripts/e2eCleanup.ts",
-    "test:e2e:npm": "pnpm run build && TEST_PM=npm vitest run --config ./vitest-e2e.config.ts",
-    "test:e2e:pnpm": "pnpm run build && TEST_PM=pnpm vitest run --config ./vitest-e2e.config.ts",
-    "test:e2e:bun": "pnpm run build && TEST_PM=bun 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"
+    "watch": "node -r esbuild-register scripts/build.ts --watch",
+    "test:ci": "vitest run --config ./vitest.config.ts"
   }
 }