create-cloudflare 2.22.2 → 2.23.0

package/dist/cli.js

@@ -2870,7 +2870,7 @@ var init_args = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "2.22.2";
+    version = "2.23.0";
   }
 });
 
@@ -23653,13 +23653,14 @@ var init_cli2 = __esm({
     };
     C3_DEFAULTS = {
       projectName: new import_haikunator.default().haikunate({ tokenHex: true }),
+      category: "hello-world",
       type: "hello-world",
       framework: "analog",
       autoUpdate: true,
       deploy: true,
       git: true,
       open: true,
-      ts: true,
+      lang: "ts",
       template: "cloudflare/workers-sdk/packages/create-cloudflare/templates/hello-world"
     };
     WRANGLER_DEFAULTS = {
@@ -23684,15 +23685,15 @@ var init_package2 = __esm({
       dependencies: {
         "create-astro": "4.8.0",
         "create-analog": "1.3.1",
-        "@angular/create": "18.1.1",
+        "@angular/create": "18.1.2",
         "create-docusaurus": "3.4.0",
         "create-hono": "0.10.1",
-        "create-next-app": "14.1.0",
+        "create-next-app": "14.2.5",
         "create-qwik": "1.5.7",
         "create-react-app": "5.0.1",
         "create-remix": "2.10.3",
         "create-solid": "0.5.12",
-        "create-svelte": "6.3.3",
+        "create-svelte": "6.3.4",
         "create-vue": "3.10.4",
         gatsby: "5.13.7",
         nuxi: "3.12.0"
@@ -23771,7 +23772,7 @@ var init_frameworks = __esm({
 var version2;
 var init_package3 = __esm({
   "../wrangler/package.json"() {
-    version2 = "3.66.0";
+    version2 = "3.68.0";
   }
 });
 
@@ -23884,16 +23885,6 @@ var init_git = __esm({
         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;
@@ -23905,9 +23896,18 @@ var init_git = __esm({
         label: "git",
         defaultValue: C3_DEFAULTS.git
       });
-      if (ctx.args.git) {
-        await initializeGit(ctx.project.path);
+      if (!ctx.args.git) {
+        return;
       }
+      const gitConfigured = await isGitConfigured();
+      if (!gitConfigured) {
+        updateStatus(
+          "Must configure `user.name` and user.email` to use git. Continuing without git."
+        );
+        ctx.args.git = false;
+        return;
+      }
+      await initializeGit(ctx.project.path);
     };
     gitCommit = async (ctx) => {
       const commitMessage = await createCommitMessage(ctx);
@@ -71101,7 +71101,7 @@ var init_c315 = __esm({
     c3_default15 = {
       configVersion: 1,
       id: "hello-world",
-      displayName: '"Hello World" Worker',
+      displayName: "Hello World Worker",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -71110,6 +71110,9 @@ var init_c315 = __esm({
           },
           ts: {
             path: "./ts"
+          },
+          python: {
+            path: "./py"
           }
         }
       }
@@ -71117,35 +71120,15 @@ var init_c315 = __esm({
   }
 });
 
-// templates/hello-world-python/c3.ts
+// templates/common/c3.ts
 var c3_exports16 = {};
 __export(c3_exports16, {
   default: () => c3_default16
 });
 var c3_default16;
 var init_c316 = __esm({
-  "templates/hello-world-python/c3.ts"() {
-    c3_default16 = {
-      configVersion: 1,
-      id: "hello-world-python",
-      displayName: '"Hello World" Worker (Python)',
-      platform: "workers",
-      copyFiles: {
-        path: "./py"
-      }
-    };
-  }
-});
-
-// templates/common/c3.ts
-var c3_exports17 = {};
-__export(c3_exports17, {
-  default: () => c3_default17
-});
-var c3_default17;
-var init_c317 = __esm({
   "templates/common/c3.ts"() {
-    c3_default17 = {
+    c3_default16 = {
       configVersion: 1,
       id: "common",
       displayName: "Example router & proxy Worker",
@@ -71165,14 +71148,14 @@ var init_c317 = __esm({
 });
 
 // templates/scheduled/c3.ts
-var c3_exports18 = {};
-__export(c3_exports18, {
-  default: () => c3_default18
+var c3_exports17 = {};
+__export(c3_exports17, {
+  default: () => c3_default17
 });
-var c3_default18;
-var init_c318 = __esm({
+var c3_default17;
+var init_c317 = __esm({
   "templates/scheduled/c3.ts"() {
-    c3_default18 = {
+    c3_default17 = {
       configVersion: 1,
       id: "scheduled",
       displayName: "Scheduled Worker (Cron Trigger)",
@@ -71192,14 +71175,14 @@ var init_c318 = __esm({
 });
 
 // templates/queues/c3.ts
-var c3_exports19 = {};
-__export(c3_exports19, {
-  default: () => c3_default19
+var c3_exports18 = {};
+__export(c3_exports18, {
+  default: () => c3_default18
 });
-var c3_default19;
-var init_c319 = __esm({
+var c3_default18;
+var init_c318 = __esm({
   "templates/queues/c3.ts"() {
-    c3_default19 = {
+    c3_default18 = {
       configVersion: 1,
       id: "queues",
       displayName: "Queue consumer & producer Worker",
@@ -71229,17 +71212,17 @@ var init_c319 = __esm({
 });
 
 // templates/hello-world-durable-object/c3.ts
-var c3_exports20 = {};
-__export(c3_exports20, {
-  default: () => c3_default20
+var c3_exports19 = {};
+__export(c3_exports19, {
+  default: () => c3_default19
 });
-var c3_default20;
-var init_c320 = __esm({
+var c3_default19;
+var init_c319 = __esm({
   "templates/hello-world-durable-object/c3.ts"() {
-    c3_default20 = {
+    c3_default19 = {
       configVersion: 1,
       id: "hello-world-durable-object",
-      displayName: "Co-ordination / multiplayer API (using Durable Objects)",
+      displayName: "Hello World Worker Using Durable Objects",
       platform: "workers",
       copyFiles: {
         variants: {
@@ -71256,14 +71239,14 @@ var init_c320 = __esm({
 });
 
 // templates/openapi/c3.ts
-var c3_exports21 = {};
-__export(c3_exports21, {
-  default: () => c3_default21
+var c3_exports20 = {};
+__export(c3_exports20, {
+  default: () => c3_default20
 });
-var c3_default21;
-var init_c321 = __esm({
+var c3_default20;
+var init_c320 = __esm({
   "templates/openapi/c3.ts"() {
-    c3_default21 = {
+    c3_default20 = {
       configVersion: 1,
       id: "openapi",
       displayName: "API starter (OpenAPI compliant)",
@@ -71276,10 +71259,10 @@ var init_c321 = __esm({
 });
 
 // templates/pre-existing/c3.ts
-var c3_exports22 = {};
-__export(c3_exports22, {
+var c3_exports21 = {};
+__export(c3_exports21, {
   copyExistingWorkerFiles: () => copyExistingWorkerFiles,
-  default: () => c3_default22
+  default: () => c3_default21
 });
 async function copyExistingWorkerFiles(ctx) {
   const { dlx } = detectPackageManager();
@@ -71328,8 +71311,8 @@ async function copyExistingWorkerFiles(ctx) {
     (0, import_path14.join)(ctx.project.path, "wrangler.toml")
   );
 }
-var import_promises, import_os, import_path14, c3_default22;
-var init_c322 = __esm({
+var import_promises, import_os, import_path14, c3_default21;
+var init_c321 = __esm({
   "templates/pre-existing/c3.ts"() {
     import_promises = require("fs/promises");
     import_os = require("os");
@@ -71339,7 +71322,7 @@ var init_c322 = __esm({
     init_command();
     init_packageManagers();
     init_accounts();
-    c3_default22 = {
+    c3_default21 = {
       configVersion: 1,
       id: "pre-existing",
       displayName: "Pre-existing Worker (from Dashboard)",
@@ -71382,7 +71365,19 @@ async function copyTemplateFiles(ctx) {
   }
   s.stop(`${brandColor("files")} ${dim("copied to project directory")}`);
 }
-var import_fs12, import_promises2, import_os2, import_path15, import_deepmerge, import_degit, defaultSelectVariant, getFrameworkMap, getTemplateMap, selectTemplate, selectFramework, shouldUseTs, processRemoteTemplate, validateTemplate, validateTemplateSrcDirectory, inferTemplateConfig, inferCopyFilesDefinition, downloadRemoteTemplate, updatePackageName, updatePackageScripts, getTemplatePath, isVariantInfo, getCopyFilesDestinationDir, addWranglerToGitIgnore;
+function inferLanguageArg(args) {
+  if (args.ts === void 0) {
+    return;
+  }
+  const language = args.ts ? "ts" : "js";
+  if (args.lang !== void 0) {
+    crash(
+      "The `--ts` argument cannot be specified in conjunction with the `--lang` argument"
+    );
+  }
+  args.lang = language;
+}
+var import_fs12, import_promises2, import_os2, import_path15, import_deepmerge, import_degit, defaultSelectVariant, getFrameworkMap, getTemplateMap, selectTemplate, selectFramework, selectLanguage, processRemoteTemplate, validateTemplate, validateTemplateSrcDirectory, inferTemplateConfig, inferCopyFilesDefinition, downloadRemoteTemplate, updatePackageName, updatePackageScripts, getTemplatePath, isVariantInfo, getCopyFilesDestinationDir, addWranglerToGitIgnore;
 var init_templates = __esm({
   "src/templates.ts"() {
     import_fs12 = require("fs");
@@ -71399,8 +71394,7 @@ var init_templates = __esm({
     init_files();
     init_validators();
     defaultSelectVariant = async (ctx) => {
-      const typescript = await shouldUseTs(ctx);
-      return typescript ? "ts" : "js";
+      return await selectLanguage(ctx);
     };
     getFrameworkMap = async () => ({
       analog: (await Promise.resolve().then(() => (init_c3(), c3_exports))).default,
@@ -71421,48 +71415,88 @@ var init_templates = __esm({
     getTemplateMap = async () => {
       return {
         "hello-world": (await Promise.resolve().then(() => (init_c315(), c3_exports15))).default,
-        "hello-world-python": (await Promise.resolve().then(() => (init_c316(), c3_exports16))).default,
-        // Dummy record -- actual template config resolved in `selectFramework`
-        "web-framework": { displayName: "Website or web app" },
-        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": {
-          displayName: "Worker built from a template hosted in a git repository"
-        },
-        "pre-existing": (await Promise.resolve().then(() => (init_c322(), c3_exports22))).default
+        common: (await Promise.resolve().then(() => (init_c316(), c3_exports16))).default,
+        scheduled: (await Promise.resolve().then(() => (init_c317(), c3_exports17))).default,
+        queues: (await Promise.resolve().then(() => (init_c318(), c3_exports18))).default,
+        "hello-world-durable-object": (await Promise.resolve().then(() => (init_c319(), c3_exports19))).default,
+        openapi: (await Promise.resolve().then(() => (init_c320(), c3_exports20))).default,
+        "pre-existing": (await Promise.resolve().then(() => (init_c321(), c3_exports21))).default
       };
     };
     selectTemplate = async (args) => {
-      if (!args.type) {
-        if (args.framework) {
+      if (args.framework) {
+        args.type ??= "web-framework";
+      } else if (args.template) {
+        args.type ??= "remote-template";
+      } else if (args.existingScript) {
+        args.type ??= "pre-existing";
+      }
+      switch (args.type) {
+        case "hello-world":
+        case "hello-world-durable-object":
+          args.category ??= "hello-world";
+          break;
+        case "hello-world-python":
+          args.category ??= "hello-world";
+          args.type = "hello-world";
+          args.lang = "python";
+          break;
+        case "webFramework":
+          warn(
+            "The `webFramework` type is deprecated and will be removed in a future version. Please use `web-framework` instead."
+          );
+          args.category ??= "web-framework";
           args.type = "web-framework";
-        } else if (args.existingScript) {
-          args.type = "pre-existing";
-        } else if (args.template) {
-          args.type = "remote-template";
-        }
+          break;
+        case "web-framework":
+        case "remote-template":
+          args.category ??= args.type;
+          break;
+        case "common":
+        case "scheduled":
+        case "queues":
+        case "openapi":
+          args.category ??= "demo";
+          break;
+        case "pre-existing":
+          args.category ??= "others";
+          break;
       }
-      if (args.type && args.type === "webFramework") {
-        warn(
-          "The `webFramework` type is deprecated and will be removed in a future version. Please use `web-framework` instead."
-        );
-        args.type = "web-framework";
+      const category = await processArgument(args, "category", {
+        type: "select",
+        question: "What would you like to start with?",
+        label: "category",
+        options: [
+          { label: "Hello World example", value: "hello-world" },
+          { label: "Framework Starter", value: "web-framework" },
+          { label: "Demo application", value: "demo" },
+          { label: "Template from a Github repo", value: "remote-template" },
+          // This is used only if the type is `pre-existing`
+          { label: "Others", value: "others", hidden: true }
+        ],
+        defaultValue: C3_DEFAULTS.category
+      });
+      if (category === "web-framework") {
+        return selectFramework(args);
+      }
+      if (category === "remote-template") {
+        return processRemoteTemplate(args);
       }
       const templateMap = await getTemplateMap();
       const templateOptions = Object.entries(templateMap).map(
-        ([value, { displayName, hidden: hidden2 }]) => ({
-          value,
-          label: displayName,
-          hidden: hidden2
-        })
+        ([value, { displayName, hidden: hidden2 }]) => {
+          const isHelloWorldExample = value.startsWith("hello-world");
+          const isCategoryMatched = category === "hello-world" ? isHelloWorldExample : !isHelloWorldExample;
+          return {
+            value,
+            label: displayName,
+            hidden: hidden2 || !isCategoryMatched
+          };
+        }
       );
       const type = await processArgument(args, "type", {
         type: "select",
-        question: "What type of application do you want to create?",
+        question: "Which template would you like to use?",
         label: "type",
         options: templateOptions,
         defaultValue: C3_DEFAULTS.type
@@ -71473,12 +71507,6 @@ var init_templates = __esm({
       if (!Object.keys(templateMap).includes(type)) {
         return crash(`Unknown application type provided: ${type}.`);
       }
-      if (type === "web-framework") {
-        return selectFramework(args);
-      }
-      if (type === "remote-template") {
-        return processRemoteTemplate(args);
-      }
       return templateMap[type];
     };
     selectFramework = async (args) => {
@@ -71511,18 +71539,26 @@ var init_templates = __esm({
         ...frameworkMap[framework]
       };
     };
-    shouldUseTs = async (ctx) => {
+    selectLanguage = async (ctx) => {
       if (usesTypescript(ctx)) {
-        return true;
+        return "ts";
       }
       if (ctx.template.generate) {
-        return false;
-      }
-      return processArgument(ctx.args, "ts", {
-        type: "confirm",
-        question: "Do you want to use TypeScript?",
-        label: "typescript",
-        defaultValue: C3_DEFAULTS.ts
+        return "js";
+      }
+      inferLanguageArg(ctx.args);
+      const variants = ctx.template.copyFiles && !isVariantInfo(ctx.template.copyFiles) ? Object.keys(ctx.template.copyFiles.variants) : [];
+      const languageOptions = [
+        { label: "TypeScript", value: "ts" },
+        { label: "JavaScript", value: "js" },
+        { label: "Python", value: "python" }
+      ].filter((option) => variants.includes(option.value));
+      return processArgument(ctx.args, "lang", {
+        type: "select",
+        question: "Which language do you want to use?",
+        label: "lang",
+        options: languageOptions,
+        defaultValue: C3_DEFAULTS.lang
       });
     };
     processRemoteTemplate = async (args) => {
@@ -76923,6 +76959,17 @@ var cliDefinition = {
     }
   ],
   options: [
+    {
+      name: "category",
+      type: "string",
+      description: `Specifies the kind of templates that should be created`,
+      values: [
+        { name: "hello-world", description: "Hello World example" },
+        { name: "web-framework", description: "Framework Starter" },
+        { name: "demo", description: "Demo application" },
+        { name: "remote-template", description: "Template from a Github repo" }
+      ]
+    },
     {
       name: "type",
       alias: "t",
@@ -76931,13 +76978,9 @@ var cliDefinition = {
       description: `
         When using a built-in template, specifies the type of application that should be created.
 
-        Note that "--type" and "--template" are mutually exclusive options. If both are provided, "--type" will be used.
+        Note that "--category" and "--template" are mutually exclusive options. If both are provided, "--category" will be used.
         `,
       values: [
-        {
-          name: "web-framework",
-          description: "A website or web application."
-        },
         {
           name: "hello-world",
           description: "A basic \u201CHello World\u201D Cloudflare Worker."
@@ -76973,7 +77016,7 @@ var cliDefinition = {
       alias: "f",
       type: "string",
       requiresArg: true,
-      description: `The type of framework to use to create a web application (when using this option "--type" is coerced to "web-framework")
+      description: `The type of framework to use to create a web application (when using this option "--category" is coerced to "web-framework")
 
       When using the --framework option, C3 will dispatch to the official creation tool used by the framework (ex. "create-remix" is used for Remix).
 
@@ -76999,6 +77042,12 @@ var cliDefinition = {
         { name: "vue" }
       ]
     },
+    {
+      name: "lang",
+      type: "string",
+      description: `The programming language of the template`,
+      values: [{ name: "ts" }, { name: "js" }, { name: "python" }]
+    },
     {
       name: "deploy",
       type: "boolean",
@@ -77007,7 +77056,8 @@ var cliDefinition = {
     {
       name: "ts",
       type: "boolean",
-      description: "Use TypeScript in your application"
+      description: "Use TypeScript in your application",
+      hidden: true
     },
     {
       name: "git",
@@ -80064,7 +80114,7 @@ var runCli = async (args) => {
   };
   const originalCWD = process.cwd();
   const { name, path: path4 } = setupProjectDirectory(validatedArgs);
-  const template = await selectTemplate(args);
+  const template = await selectTemplate(validatedArgs);
   const ctx = {
     project: { name, path: path4 },
     args: validatedArgs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "2.22.2",
+  "version": "2.23.0",
   "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.20240718.0",
+    "@cloudflare/workers-types": "^4.20240725.0",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -66,8 +66,8 @@
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "wrangler": "3.66.0",
-    "@cloudflare/workers-tsconfig": "0.0.0"
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "wrangler": "3.68.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/hello-world/c3.ts

@@ -1,7 +1,7 @@
 export default {
 	configVersion: 1,
 	id: "hello-world",
-	displayName: '"Hello World" Worker',
+	displayName: "Hello World Worker",
 	platform: "workers",
 	copyFiles: {
 		variants: {
@@ -11,6 +11,9 @@ export default {
 			ts: {
 				path: "./ts",
 			},
+			python: {
+				path: "./py",
+			},
 		},
 	},
 };

package/templates/hello-world/ts/tsconfig.json

@@ -98,5 +98,6 @@
 		// "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
 		"skipLibCheck": true /* Skip type checking all .d.ts files. */
 	},
-	"exclude": ["test"]
+	"exclude": ["test"],
+	"include": ["worker-configuration.d.ts", "src/**/*.ts"]
 }

package/templates/hello-world-durable-object/c3.ts

@@ -1,7 +1,7 @@
 export default {
 	configVersion: 1,
 	id: "hello-world-durable-object",
-	displayName: "Co-ordination / multiplayer API (using Durable Objects)",
+	displayName: "Hello World Worker Using Durable Objects",
 	platform: "workers",
 	copyFiles: {
 		variants: {

package/templates/hello-world-python/c3.ts

@@ -1,9 +0,0 @@
-export default {
-	configVersion: 1,
-	id: "hello-world-python",
-	displayName: '"Hello World" Worker (Python)',
-	platform: "workers",
-	copyFiles: {
-		path: "./py",
-	},
-};