create-cloudflare 0.0.0-9d8509e0 → 0.0.0-a5e7c0be

package/dist/cli.js

@@ -60737,7 +60737,44 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-9d8509e0";
+var version = "0.0.0-a5e7c0be";
+var devDependencies = {
+  "@babel/parser": "^7.21.3",
+  "@babel/types": "^7.21.4",
+  "@clack/prompts": "^0.6.3",
+  "@cloudflare/eslint-config-worker": "*",
+  "@cloudflare/workers-tsconfig": "*",
+  "@cloudflare/workers-types": "^4.20230419.0",
+  "@types/command-exists": "^1.2.0",
+  "@types/cross-spawn": "^6.0.2",
+  "@types/dns2": "^2.0.3",
+  "@types/esprima": "^4.0.3",
+  "@types/node": "^18.15.3",
+  "@types/which-pm-runs": "^1.0.0",
+  "@types/yargs": "^17.0.22",
+  "@typescript-eslint/eslint-plugin": "^5.55.0",
+  "@typescript-eslint/parser": "^5.55.0",
+  chalk: "^5.2.0",
+  "command-exists": "^1.2.9",
+  "cross-spawn": "^7.0.3",
+  dns2: "^2.1.0",
+  esbuild: "^0.17.12",
+  execa: "^7.1.1",
+  haikunator: "^2.1.2",
+  "log-update": "^5.0.1",
+  open: "^8.4.0",
+  pnpm: "^8.6.11",
+  recast: "^0.22.0",
+  semver: "^7.5.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: "*",
+  yargs: "^17.7.1",
+  yarn: "^1.22.19"
+};
 
 // src/common.ts
 var import_fs6 = require("fs");
@@ -60753,7 +60790,19 @@ var import_cross_spawn = __toESM(require_cross_spawn());
 var import_semver = __toESM(require_semver2());
 var import_which_pm_runs = __toESM(require_which_pm_runs());
 var detectPackageManager = () => {
-  const { name, version: version2 } = (0, import_which_pm_runs.default)() ?? { name: "npm", version: "0.0.0" };
+  let { name, version: version2 } = (0, import_which_pm_runs.default)() ?? { name: "npm", version: "0.0.0" };
+  if (process.env.TEST_PM) {
+    switch (process.env.TEST_PM) {
+      case "pnpm":
+        name = "pnpm";
+        version2 = devDependencies["pnpm"].replace("^", "");
+        break;
+      case "yarn":
+        name = "yarn";
+        version2 = devDependencies["yarn"].replace("^", "");
+        break;
+    }
+  }
   switch (name) {
     case "pnpm":
       if (import_semver.default.gt(version2, "6.0.0")) {
@@ -60934,6 +60983,21 @@ var npmInstall = async () => {
     doneText: `${brandColor("installed")} ${dim(`via \`${npm12} install\``)}`
   });
 };
+var resetPackageManager = async (ctx) => {
+  const { npm: npm12 } = detectPackageManager();
+  if (npm12 === "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(`${npm12} install`, {
+    silent: true,
+    cwd: ctx.project.path,
+    startText: "Installing dependencies",
+    doneText: `${brandColor("installed")} ${dim(`via \`${npm12} install\``)}`
+  });
+};
 var installWrangler = async () => {
   const { npm: npm12 } = detectPackageManager();
   if ((0, import_fs5.existsSync)(import_path5.default.resolve("node_modules", "wrangler"))) {
@@ -61206,7 +61270,7 @@ var printSummary = async (ctx) => {
     ],
     [
       `Read the documentation`,
-      `https://developers.cloudflare.com/${ctx.framework ? "pages" : "workers"}`
+      `https://developers.cloudflare.com/${ctx.framework ? ctx.framework.config.type === "workers" ? "workers" : "pages" : "workers"}`
     ],
     [`Stuck? Join us at`, `https://discord.gg/cloudflaredev`]
   ];
@@ -61243,6 +61307,7 @@ var printSummary = async (ctx) => {
     }
   }
   endSection("See you again soon!");
+  process.exit(0);
 };
 var offerGit = async (ctx) => {
   const gitInstalled = await isGitInstalled();
@@ -61617,7 +61682,7 @@ var generate5 = async (ctx) => {
   const version2 = getFrameworkVersion(ctx);
   await runFrameworkGenerator(
     ctx,
-    `${dlx5} create-hono@${version2} ${ctx.project.name} --template cloudflare-pages`
+    `${dlx5} create-hono@${version2} ${ctx.project.name} --template cloudflare-workers`
   );
   logRaw("");
 };
@@ -61626,7 +61691,8 @@ var config5 = {
   displayName: "Hono",
   packageScripts: {},
   deployCommand: "deploy",
-  devCommand: "dev"
+  devCommand: "dev",
+  type: "workers"
 };
 var hono_default = config5;
 
@@ -61767,7 +61833,7 @@ var config6 = {
   configure: configure3,
   displayName: "Next",
   packageScripts: {
-    "pages:build": `${npx3} @cloudflare/next-on-pages@1`,
+    "pages:build": `${dlx6} @cloudflare/next-on-pages@1`,
     "pages:deploy": `${npm5} run pages:build && wrangler pages deploy .vercel/output/static`,
     "pages:watch": `${npx3} @cloudflare/next-on-pages@1 --watch`,
     "pages:dev": `${npx3} wrangler pages dev .vercel/output/static --compatibility-flag=nodejs_compat`
@@ -61850,8 +61916,12 @@ var generate9 = async (ctx) => {
   );
   logRaw("");
 };
+var configure6 = async (ctx) => {
+  await resetPackageManager(ctx);
+};
 var config9 = {
   generate: generate9,
+  configure: configure6,
   displayName: "React",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --port 3000 -- ${npm7} start`,
@@ -61904,7 +61974,7 @@ var generate11 = async (ctx) => {
   await runFrameworkGenerator(ctx, `${dlx11} create-solid@${version2}`);
   logRaw("");
 };
-var configure6 = async () => {
+var configure7 = async () => {
   const pkg = "solid-start-cloudflare-pages";
   await installPackages([pkg], {
     dev: true,
@@ -61919,7 +61989,7 @@ var configure6 = async () => {
 };
 var config11 = {
   generate: generate11,
-  configure: configure6,
+  configure: configure7,
   displayName: "Solid",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 3000 -- ${npm9} run dev`,
@@ -61984,7 +62054,7 @@ var generate12 = async (ctx) => {
   );
   logRaw("");
 };
-var configure7 = async (ctx) => {
+var configure8 = async (ctx) => {
   process.chdir(ctx.project.path);
   await npmInstall();
   const pkg = `@sveltejs/adapter-cloudflare`;
@@ -62019,7 +62089,7 @@ var configure7 = async (ctx) => {
 };
 var config12 = {
   generate: generate12,
-  configure: configure7,
+  configure: configure8,
   displayName: "Svelte",
   packageScripts: {
     "pages:dev": `wrangler pages dev ${compatDateFlag()} --proxy 5173 -- ${npm10} run dev`,
@@ -62037,7 +62107,7 @@ var versionMap_default = {
   hono: "0.2.6",
   next: "13.4.2",
   nuxt: "3.4.2",
-  qwik: "1.1.x",
+  qwik: "1.2.7",
   react: "5.0.1",
   remix: "1.16.0",
   solid: "0.2.26",
@@ -62117,11 +62187,11 @@ var runPagesGenerator = async (args) => {
     },
     args
   };
-  const { generate: generate14, configure: configure8 } = FrameworkMap[framework];
+  const { generate: generate14, configure: configure9 } = FrameworkMap[framework];
   await generate14({ ...ctx });
   startSection("Configuring your application for Cloudflare", "Step 2 of 3");
-  if (configure8) {
-    await configure8({ ...ctx });
+  if (configure9) {
+    await configure9({ ...ctx });
   }
   await updatePackageScripts(ctx);
   await offerGit(ctx);
@@ -62189,6 +62259,8 @@ var updatePackageScripts = async (ctx) => {
 var createProject = async (ctx) => {
   if (ctx.args.deploy === false)
     return;
+  if (ctx.framework?.config.type === "workers")
+    return;
   if (!ctx.account?.id) {
     crash("Failed to read Cloudflare account.");
     return;
@@ -62202,7 +62274,9 @@ var createProject = async (ctx) => {
     await retry(
       CREATE_PROJECT_RETRIES,
       async () => runCommand(cmd, {
-        silent: true,
+        // Make this command more verbose in test mode to aid
+        // troubleshooting API errors
+        silent: process.env.VITEST == void 0,
         cwd: ctx.project.path,
         env: { CLOUDFLARE_ACCOUNT_ID },
         startText: "Creating Pages project",
@@ -62210,7 +62284,7 @@ var createProject = async (ctx) => {
       })
     );
   } catch (error) {
-    crash("Failed to create pages application. See output above.");
+    crash("Failed to create pages project. See output above.");
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-cloudflare",
-	"version": "0.0.0-9d8509e0",
+	"version": "0.0.0-a5e7c0be",
 	"description": "A CLI for creating and deploying new applications to Cloudflare.",
 	"keywords": [
 		"cloudflare",
@@ -26,14 +26,16 @@
 		"templates"
 	],
 	"scripts": {
-		"build": "node scripts/build.js",
+		"build": "node -r esbuild-register scripts/build.ts",
 		"check:lint": "eslint .",
 		"check:type": "tsc",
 		"lint": "eslint",
 		"prepublishOnly": "npm run build",
-		"test:e2e": "npm run build && vitest run --config ./vitest-e2e.config.ts",
+		"test:e2e:cleanup": "node -r esbuild-register scripts/e2eCleanup.ts",
+		"test:e2e:npm": "npm run build && TEST_PM=npm vitest run --config ./vitest-e2e.config.ts",
+		"test:e2e:pnpm": "npm run build && TEST_PM=pnpm vitest run --config ./vitest-e2e.config.ts",
 		"test:unit": "vitest run --config ./vitest.config.ts",
-		"watch": "node scripts/build.js --watch"
+		"watch": "node -r esbuild-register scripts/build.ts --watch"
 	},
 	"devDependencies": {
 		"@babel/parser": "^7.21.3",
@@ -60,6 +62,7 @@
 		"haikunator": "^2.1.2",
 		"log-update": "^5.0.1",
 		"open": "^8.4.0",
+		"pnpm": "^8.6.11",
 		"recast": "^0.22.0",
 		"semver": "^7.5.1",
 		"typescript": "^5.0.2",
@@ -68,7 +71,8 @@
 		"vitest": "^0.30.0",
 		"which-pm-runs": "^1.1.0",
 		"wrangler": "*",
-		"yargs": "^17.7.1"
+		"yargs": "^17.7.1",
+		"yarn": "^1.22.19"
 	},
 	"engines": {
 		"node": ">=16.13.0"