create-cloudflare 0.0.0-a5231dec → 0.0.0-a676f55a

package/dist/cli.js

@@ -1595,12 +1595,22 @@ var init_colors = __esm({
   }
 });
 
+// ../cli/streams.ts
+var stdout, stderr;
+var init_streams = __esm({
+  "../cli/streams.ts"() {
+    stdout = process.stdout;
+    stderr = process.stderr;
+  }
+});
+
 // ../cli/index.ts
 var import_process, shapes, status, space, logRaw, log, newline, updateStatus, startSection, endSection, cancel, warn, stripAnsi, crash, error;
 var init_cli = __esm({
   "../cli/index.ts"() {
     import_process = require("process");
     init_colors();
+    init_streams();
     shapes = {
       diamond: "\u25C7",
       dash: "\u2500",
@@ -1630,7 +1640,7 @@ var init_cli = __esm({
       return hidden("\u200A".repeat(n2));
     };
     logRaw = (msg) => {
-      process.stdout.write(`${msg}
+      stdout.write(`${msg}
 `);
     };
     log = (msg) => {
@@ -1683,10 +1693,10 @@ var init_cli = __esm({
       error(msg, extra);
       (0, import_process.exit)(1);
     };
-    error = (msg, extra) => {
+    error = (msg, extra, corner = shapes.corners.bl) => {
       if (msg) {
-        process.stderr.write(
-          `${gray(shapes.corners.bl)} ${status.error} ${dim(msg)}
+        stderr.write(
+          `${gray(corner)} ${status.error} ${dim(msg)}
 ${extra ? space() + extra + "\n" : ""}`
         );
       }
@@ -3404,6 +3414,15 @@ var init_select_list = __esm({
 });
 
 // ../cli/interactive.ts
+function acceptDefault(promptConfig, renderers, initialValue) {
+  const error2 = promptConfig.validate?.(initialValue);
+  if (error2) {
+    crash(error2);
+  }
+  const lines = renderers.submit({ value: initialValue });
+  logRaw(lines.join("\n"));
+  return initialValue;
+}
 var logUpdate2, grayBar, blCorner, leftT, inputPrompt, renderSubmit, handleCancel, getRenderers, getTextRenderers, getSelectRenderers, getSelectListRenderers, getConfirmRenderers, spinnerFrames, ellipsisFrames, spinner, isInteractive;
 var init_interactive = __esm({
   "../cli/interactive.ts"() {
@@ -3411,31 +3430,43 @@ var init_interactive = __esm({
     init_log_update();
     init_colors();
     init_select_list();
+    init_streams();
     init_cli();
-    logUpdate2 = createLogUpdate(process.stdout);
+    logUpdate2 = createLogUpdate(stdout);
     grayBar = gray(shapes.bar);
     blCorner = gray(shapes.corners.bl);
     leftT = gray(shapes.leftT);
     inputPrompt = async (promptConfig) => {
-      const renderers = getRenderers(promptConfig);
+      const renderers = {
+        ...getRenderers(promptConfig),
+        ...promptConfig.renderers
+      };
       let prompt;
       const dispatchRender = (props, p2) => {
         const renderedLines = renderers[props.state](props, p2);
         return renderedLines.join("\n");
       };
       if (promptConfig.type === "select") {
+        const initialValue = String(promptConfig.defaultValue);
+        if (promptConfig.acceptDefault) {
+          return acceptDefault(promptConfig, renderers, initialValue);
+        }
         prompt = new ED({
           ...promptConfig,
           options: promptConfig.options.filter((o) => !o.hidden),
-          initialValue: String(promptConfig.defaultValue),
+          initialValue,
           render() {
             return dispatchRender(this, prompt);
           }
         });
       } else if (promptConfig.type === "confirm") {
+        const initialValue = Boolean(promptConfig.defaultValue);
+        if (promptConfig.acceptDefault) {
+          return acceptDefault(promptConfig, renderers, initialValue);
+        }
         prompt = new sD({
           ...promptConfig,
-          initialValue: Boolean(promptConfig.defaultValue),
+          initialValue,
           active: promptConfig.activeText || "",
           inactive: promptConfig.inactiveText || "",
           render() {
@@ -3449,6 +3480,9 @@ var init_interactive = __esm({
         } else if (promptConfig.defaultValue !== void 0) {
           initialValues = [String(promptConfig.defaultValue)];
         }
+        if (promptConfig.acceptDefault) {
+          return acceptDefault(promptConfig, renderers, initialValues);
+        }
         prompt = new iD({
           ...promptConfig,
           options: promptConfig.options,
@@ -3458,19 +3492,27 @@ var init_interactive = __esm({
           }
         });
       } else if (promptConfig.type === "list") {
+        const initialValue = String(promptConfig.defaultValue);
+        if (promptConfig.acceptDefault) {
+          return acceptDefault(promptConfig, renderers, initialValue);
+        }
         prompt = new SelectRefreshablePrompt({
           ...promptConfig,
           onRefresh: promptConfig.onRefresh ?? (() => Promise.resolve(promptConfig.options)),
-          initialValue: String(promptConfig.defaultValue),
+          initialValue,
           render() {
             return dispatchRender(this, prompt);
           }
         });
       } else {
+        const initialValue = promptConfig.initialValue ?? String(promptConfig.defaultValue ?? "");
+        if (promptConfig.acceptDefault) {
+          return acceptDefault(promptConfig, renderers, initialValue);
+        }
         prompt = new oD({
           ...promptConfig,
           initialValue: promptConfig.initialValue,
-          defaultValue: String(promptConfig.defaultValue),
+          defaultValue: String(promptConfig.defaultValue ?? ""),
           render() {
             return dispatchRender(this, prompt);
           }
@@ -3510,14 +3552,10 @@ var init_interactive = __esm({
       }
     };
     getTextRenderers = (config13) => {
-      const {
-        defaultValue,
-        question,
-        helpText: _helpText,
-        format: _format
-      } = config13;
-      const helpText = _helpText ?? "";
-      const format4 = _format ?? ((val) => String(val));
+      const { question } = config13;
+      const helpText = config13.helpText ?? "";
+      const format4 = config13.format ?? ((val) => String(val));
+      const defaultValue = config13.defaultValue?.toString() ?? "";
       return {
         initial: () => [
           `${blCorner} ${bold(question)} ${dim(helpText)}`,
@@ -3527,9 +3565,7 @@ var init_interactive = __esm({
         ],
         active: ({ value }) => [
           `${blCorner} ${bold(question)} ${dim(helpText)}`,
-          `${space(2)}${format4(
-            value || dim(typeof defaultValue === "string" ? defaultValue : ``)
-          )}`,
+          `${space(2)}${format4(value || dim(defaultValue))}`,
           ``
           // extra line for readability
         ],
@@ -3541,7 +3577,7 @@ var init_interactive = __esm({
           ``
           // extra line for readability
         ],
-        submit: ({ value }) => renderSubmit(config13, format4(value)),
+        submit: ({ value }) => renderSubmit(config13, format4(value ?? "")),
         cancel: handleCancel
       };
     };
@@ -3555,10 +3591,11 @@ var init_interactive = __esm({
           const { label: optionLabel, value: optionValue } = opt;
           const active = i === cursor;
           const isInListOfValues = Array.isArray(value) && value.includes(optionValue);
-          const color = isInListOfValues || active ? blue : dim;
+          const color = isInListOfValues || active ? blue : white;
           const text = active ? color.underline(optionLabel) : color(optionLabel);
+          const sublabel = opt.sublabel ? color.grey(opt.sublabel) : "";
           const indicator = isInListOfValues || active && !Array.isArray(value) ? color(shapes.radioActive) : color(shapes.radioInactive);
-          return `${space(2)}${indicator} ${text}`;
+          return `${space(2)}${indicator} ${text} ${sublabel}`;
         };
         const renderOptionCondition = (_2, i) => {
           if (options.length <= maxItemsPerPage) {
@@ -3610,7 +3647,7 @@ ${space(2)}${dim("...")}` : ""}`,
       const { question, helpText: _helpText } = config13;
       let options = config13.options;
       const helpText = _helpText ?? "";
-      const { rows } = process.stdout;
+      const { rows } = stdout;
       const defaultRenderer = ({ cursor, value }, prompt) => {
         if (prompt instanceof SelectRefreshablePrompt) {
           options = prompt.options;
@@ -3814,7 +3851,7 @@ var init_args = __esm({
 var version, devDependencies;
 var init_package = __esm({
   "package.json"() {
-    version = "0.0.0-a5231dec";
+    version = "0.0.0-a676f55a";
     devDependencies = {
       "@babel/parser": "^7.21.3",
       "@babel/types": "^7.21.4",
@@ -24217,14 +24254,14 @@ var init_package2 = __esm({
       ],
       dependencies: {
         "create-astro": "4.7.3",
-        "@angular/create": "17.2.2",
+        "@angular/create": "17.2.3",
         "create-docusaurus": "3.1.1",
         "create-hono": "0.5.0",
         "create-next-app": "14.1.0",
         "create-qwik": "1.4.5",
         "create-react-app": "5.0.1",
         "create-remix": "2.8.0",
-        "create-solid": "0.4.10",
+        "create-solid": "0.5.3",
         "create-svelte": "6.0.9",
         "create-vue": "3.9.2",
         gatsby: "5.13.3",
@@ -24297,7 +24334,8 @@ var init_packages = __esm({
     import_which_pm_runs = __toESM(require_which_pm_runs());
     init_package();
     detectPackageManager = () => {
-      let { name: name2, version: version3 } = (0, import_which_pm_runs.default)() ?? { name: "npm", version: "0.0.0" };
+      const pmInfo = (0, import_which_pm_runs.default)();
+      let { name: name2, version: version3 } = pmInfo ?? { name: "npm", version: "0.0.0" };
       if (process.env.TEST_PM) {
         switch (process.env.TEST_PM) {
           case "pnpm":
@@ -25811,7 +25849,7 @@ var init_poll = __esm({
 var version2;
 var init_package3 = __esm({
   "../wrangler/package.json"() {
-    version2 = "3.30.1";
+    version2 = "3.34.2";
   }
 });
 
@@ -27872,7 +27910,7 @@ var require_toml = __commonJS({
 });
 
 // src/helpers/files.ts
-var import_fs5, import_path5, import_toml, copyFile, writeFile2, readFile, readJSON, writeJSON, probePaths, usesTypescript, eslintRcExts, usesEslint, compatDateFlag;
+var import_fs5, import_path5, import_toml, copyFile, writeFile2, appendFile, readFile, directoryExists, readJSON, writeJSON, probePaths, usesTypescript, eslintRcExts, usesEslint, compatDateFlag;
 var init_files = __esm({
   "src/helpers/files.ts"() {
     import_fs5 = __toESM(require("fs"));
@@ -27894,6 +27932,13 @@ var init_files = __esm({
         crash(error2);
       }
     };
+    appendFile = (path3, content) => {
+      try {
+        import_fs5.default.appendFileSync(path3, content);
+      } catch (error2) {
+        crash(error2);
+      }
+    };
     readFile = (path3) => {
       try {
         return import_fs5.default.readFileSync(path3, "utf-8");
@@ -27901,6 +27946,17 @@ var init_files = __esm({
         return crash(error2);
       }
     };
+    directoryExists = (path3) => {
+      try {
+        const stat = (0, import_fs5.statSync)(path3);
+        return stat.isDirectory();
+      } catch (error2) {
+        if (error2.code === "ENOENT") {
+          return false;
+        }
+        return crash(error2);
+      }
+    };
     readJSON = (path3) => {
       const contents = readFile(path3);
       return contents ? JSON.parse(contents) : contents;
@@ -31115,10 +31171,6 @@ var init_command = __esm({
         )}`
       );
       logRaw("");
-      if (process.env.VITEST) {
-        const flags = ctx.template.testFlags ?? [];
-        cmd.push(...flags);
-      }
       await runCommand(cmd, { env: env2 });
     };
     installPackages = async (packages, config13) => {
@@ -37987,8 +38039,8 @@ var require_index_688c5d50 = __commonJS({
         }
         var fs$appendFile = fs3.appendFile;
         if (fs$appendFile)
-          fs3.appendFile = appendFile;
-        function appendFile(path4, data, options, cb) {
+          fs3.appendFile = appendFile2;
+        function appendFile2(path4, data, options, cb) {
           if (typeof options === "function")
             cb = options, options = null;
           return go$appendFile(path4, data, options, cb);
@@ -41823,12 +41875,12 @@ var require_index_688c5d50 = __commonJS({
     }
     function exec2(command2) {
       return new Promise((fulfil, reject) => {
-        child_process__default["default"].exec(command2, (err, stdout, stderr) => {
+        child_process__default["default"].exec(command2, (err, stdout2, stderr2) => {
           if (err) {
             reject(err);
             return;
           }
-          fulfil({ stdout, stderr });
+          fulfil({ stdout: stdout2, stderr: stderr2 });
         });
       });
     }
@@ -42198,8 +42250,8 @@ var require_index_688c5d50 = __commonJS({
     }
     async function fetchRefs(repo) {
       try {
-        const { stdout } = await exec2(`git ls-remote ${repo.url}`);
-        return stdout.split("\n").filter(Boolean).map((row) => {
+        const { stdout: stdout2 } = await exec2(`git ls-remote ${repo.url}`);
+        return stdout2.split("\n").filter(Boolean).map((row) => {
           const [hash, ref] = row.split("	");
           if (ref === "HEAD") {
             return {
@@ -42377,19 +42429,18 @@ var init_c3 = __esm({
       copyFiles: {
         path: "./templates"
       },
+      devScript: "start",
+      deployScript: "deploy",
       generate,
       configure,
       transformPackageJson: async () => ({
         scripts: {
-          start: `${npm3} run pages:build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+          start: `${npm3} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+          build: `ng build && ${npm3} run process`,
           process: "node ./tools/copy-files.mjs && node ./tools/alter-polyfills.mjs",
-          "pages:build": `ng build && ${npm3} run process`,
-          deploy: `${npm3} run pages:build && wrangler pages deploy dist/cloudflare`
+          deploy: `${npm3} run build && wrangler pages deploy dist/cloudflare`
         }
-      }),
-      deployScript: "deploy",
-      devScript: "start",
-      testFlags: ["--style", "sass"]
+      })
     };
     c3_default = config;
   }
@@ -73597,16 +73648,7 @@ var init_c32 = __esm({
           preview: `astro build && wrangler pages dev ./dist`,
           ...usesTypescript(ctx) && { "build-cf-types": `wrangler types` }
         }
-      }),
-      testFlags: [
-        "--skip-houston",
-        "--no-install",
-        "--no-git",
-        "--template",
-        "blog",
-        "--typescript",
-        "strict"
-      ]
+      })
     };
     c3_default2 = config2;
   }
@@ -73621,7 +73663,6 @@ var npm4, generate3, config3, c3_default3;
 var init_c33 = __esm({
   "templates/docusaurus/c3.ts"() {
     init_command();
-    init_files();
     init_packages();
     ({ npm: npm4 } = detectPackageManager());
     generate3 = async (ctx) => {
@@ -73635,11 +73676,11 @@ var init_c33 = __esm({
       generate: generate3,
       transformPackageJson: async () => ({
         scripts: {
-          "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 3000 -- ${npm4} run start`,
-          "pages:deploy": `${npm4} run build && wrangler pages deploy ./build`
+          deploy: `${npm4} run build && wrangler pages deploy ./build`
         }
       }),
-      testFlags: [`--package-manager`, npm4]
+      devScript: "start",
+      deployScript: "deploy"
     };
     c3_default3 = config3;
   }
@@ -73655,7 +73696,6 @@ var init_c34 = __esm({
   "templates/gatsby/c3.ts"() {
     init_interactive();
     init_command();
-    init_files();
     init_packages();
     ({ npm: npm5 } = detectPackageManager());
     generate4 = async (ctx) => {
@@ -73685,10 +73725,13 @@ var init_c34 = __esm({
       generate: generate4,
       transformPackageJson: async () => ({
         scripts: {
-          "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 8000 -- ${npm5} run develop`,
-          "pages:deploy": `${npm5} run build && wrangler pages deploy ./public`
+          deploy: `${npm5} run build && wrangler pages deploy ./public`,
+          preview: `${npm5} run build && wrangler pages dev ./public`
         }
-      })
+      }),
+      devScript: "develop",
+      deployScript: "deploy",
+      previewScript: "preview"
     };
     c3_default4 = config4;
   }
@@ -73851,9 +73894,6 @@ var init_c36 = __esm({
       id: "next",
       platform: "pages",
       displayName: "Next",
-      devScript: "dev",
-      previewScript: "preview",
-      deployScript: "deploy",
       generate: generate6,
       configure: configure3,
       copyFiles: {
@@ -73901,16 +73941,9 @@ var init_c36 = __esm({
           }
         };
       },
-      testFlags: [
-        "--typescript",
-        "--no-install",
-        "--eslint",
-        "--tailwind",
-        "--src-dir",
-        "--app",
-        "--import-alias",
-        "@/*"
-      ],
+      devScript: "dev",
+      previewScript: "preview",
+      deployScript: "deploy",
       compatibilityFlags: ["nodejs_compat"]
     };
   }
@@ -73921,7 +73954,7 @@ var c3_exports7 = {};
 __export(c3_exports7, {
   default: () => c3_default7
 });
-var recast3, npm7, generate7, configure4, updateNuxtConfig, config6, c3_default7;
+var recast3, npm7, pm, generate7, configure4, updateEnvTypes, updateNuxtConfig, config6, c3_default7;
 var init_c37 = __esm({
   "templates/nuxt/c3.ts"() {
     init_cli();
@@ -73932,7 +73965,8 @@ var init_c37 = __esm({
     init_files();
     init_packages();
     recast3 = __toESM(require_main3());
-    ({ npm: npm7 } = detectPackageManager());
+    init_workers();
+    ({ npm: npm7, name: pm } = detectPackageManager());
     generate7 = async (ctx) => {
       const gitFlag = ctx.args.git ? `--gitInit` : `--no-gitInit`;
       await runFrameworkGenerator(ctx, [
@@ -73945,13 +73979,32 @@ var init_c37 = __esm({
       writeFile2("./.node-version", "17");
       logRaw("");
     };
-    configure4 = async () => {
-      await installPackages(["nitro-cloudflare-dev"], {
+    configure4 = async (ctx) => {
+      const packages = ["nitro-cloudflare-dev"];
+      if (pm === "pnpm") {
+        packages.push("h3");
+      }
+      await installPackages(packages, {
         dev: true,
         startText: "Installing nitro module `nitro-cloudflare-dev`",
         doneText: `${brandColor("installed")} ${dim(`via \`${npm7} install\``)}`
       });
       updateNuxtConfig();
+      updateEnvTypes(ctx);
+    };
+    updateEnvTypes = (ctx) => {
+      const filepath = "env.d.ts";
+      const s = spinner();
+      s.start(`Updating ${filepath}`);
+      let file = readFile(filepath);
+      let typesEntrypoint = `@cloudflare/workers-types/`;
+      const latestEntrypoint = getLatestTypesEntrypoint(ctx);
+      if (latestEntrypoint) {
+        typesEntrypoint += `/${latestEntrypoint}`;
+      }
+      file = file.replace("WORKERS_TYPES_ENTRYPOINT", typesEntrypoint);
+      writeFile2("env.d.ts", file);
+      s.stop(`${brandColor(`updated`)} ${dim(`\`${filepath}\``)}`);
     };
     updateNuxtConfig = () => {
       const s = spinner();
@@ -73992,8 +74045,6 @@ var init_c37 = __esm({
       copyFiles: {
         path: "./templates"
       },
-      devScript: "dev",
-      deployScript: "deploy",
       generate: generate7,
       configure: configure4,
       transformPackageJson: async () => ({
@@ -74002,7 +74053,10 @@ var init_c37 = __esm({
           preview: `${npm7} run build && wrangler pages dev ./dist`,
           "build-cf-types": `wrangler types`
         }
-      })
+      }),
+      devScript: "dev",
+      deployScript: "deploy",
+      previewScript: "preview"
     };
     c3_default7 = config6;
   }
@@ -74114,8 +74168,6 @@ var init_c38 = __esm({
       copyFiles: {
         path: "./templates"
       },
-      devScript: "dev",
-      deployScript: "deploy",
       generate: generate8,
       configure: configure5,
       transformPackageJson: async () => ({
@@ -74124,7 +74176,10 @@ var init_c38 = __esm({
           preview: `${npm8} run build && wrangler pages dev ./dist`,
           "build-cf-types": `wrangler types`
         }
-      })
+      }),
+      devScript: "dev",
+      deployScript: "deploy",
+      previewScript: "preview"
     };
     c3_default8 = config7;
   }
@@ -74140,7 +74195,6 @@ var init_c39 = __esm({
   "templates/react/c3.ts"() {
     init_cli();
     init_command();
-    init_files();
     init_packages();
     ({ npm: npm9 } = detectPackageManager());
     generate9 = async (ctx) => {
@@ -74155,10 +74209,13 @@ var init_c39 = __esm({
       generate: generate9,
       transformPackageJson: async () => ({
         scripts: {
-          "pages:dev": `wrangler pages dev ${await compatDateFlag()} --port 3000 -- ${npm9} start`,
-          "pages:deploy": `${npm9} run build && wrangler pages deploy ./build`
+          deploy: `${npm9} run build && wrangler pages deploy ./build`,
+          preview: `${npm9} run build && wrangler pages dev ./build`
         }
-      })
+      }),
+      devScript: "dev",
+      deployScript: "deploy",
+      previewScript: "preview"
     };
     c3_default9 = config8;
   }
@@ -74221,8 +74278,7 @@ var init_c310 = __esm({
       }),
       devScript: "dev",
       deployScript: "deploy",
-      previewScript: "preview",
-      testFlags: ["--typescript", "--no-install", "--no-git-init"]
+      previewScript: "preview"
     };
     c3_default10 = config9;
   }
@@ -74245,7 +74301,7 @@ var init_c311 = __esm({
     recast5 = __toESM(require_main3());
     ({ npm: npm11 } = detectPackageManager());
     generate11 = async (ctx) => {
-      await runFrameworkGenerator(ctx, [ctx.project.name]);
+      await runFrameworkGenerator(ctx, ["-p", ctx.project.name, "-s"]);
       logRaw("");
     };
     configure7 = async (ctx) => {
@@ -74298,10 +74354,10 @@ var init_c311 = __esm({
           deploy: `${npm11} run build && wrangler pages deploy ./dist`
         }
       }),
+      compatibilityFlags: ["nodejs_compat"],
       devScript: "dev",
       deployScript: "deploy",
-      previewScript: "preview",
-      compatibilityFlags: ["nodejs_compat"]
+      previewScript: "preview"
     };
     c3_default11 = config10;
   }
@@ -74431,7 +74487,6 @@ var npm13, generate13, config12, c3_default13;
 var init_c313 = __esm({
   "templates/vue/c3.ts"() {
     init_command();
-    init_files();
     init_packages();
     ({ npm: npm13 } = detectPackageManager());
     generate13 = async (ctx) => {
@@ -74445,11 +74500,13 @@ var init_c313 = __esm({
       generate: generate13,
       transformPackageJson: async () => ({
         scripts: {
-          "pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 5173 -- ${npm13} run dev`,
-          "pages:deploy": `${npm13} run build && wrangler pages deploy ./dist`
+          deploy: `${npm13} run build && wrangler pages deploy ./dist`,
+          preview: `${npm13} run build && wrangler pages dev ./dist`
         }
       }),
-      testFlags: ["--ts"]
+      devScript: "dev",
+      deployScript: "deploy",
+      previewScript: "preview"
     };
     c3_default13 = config12;
   }
@@ -74727,7 +74784,7 @@ async function copyTemplateFiles(ctx) {
   }
   s.stop(`${brandColor("files")} ${dim("copied to project directory")}`);
 }
-var import_fs10, import_promises2, import_os2, import_path12, import_deepmerge, import_degit, defaultSelectVariant, getFrameworkMap, getTemplateMap, selectTemplate, selectFramework, shouldUseTs, processRemoteTemplate, validateTemplate, validateTemplateSrcDirectory, inferTemplateConfig, inferCopyFilesDefinition, downloadRemoteTemplate, updatePackageName, updatePackageScripts, getTemplatePath, isVariantInfo, getCopyFilesDestinationDir;
+var import_fs10, import_promises2, import_os2, import_path12, import_deepmerge, import_degit, defaultSelectVariant, getFrameworkMap, getTemplateMap, selectTemplate, selectFramework, shouldUseTs, processRemoteTemplate, validateTemplate, validateTemplateSrcDirectory, inferTemplateConfig, inferCopyFilesDefinition, downloadRemoteTemplate, updatePackageName, updatePackageScripts, getTemplatePath, isVariantInfo, getCopyFilesDestinationDir, addWranglerToGitIgnore;
 var init_templates = __esm({
   "src/templates.ts"() {
     import_fs10 = require("fs");
@@ -74985,6 +75042,45 @@ var init_templates = __esm({
       }
       return copyFiles.destinationDir(ctx);
     };
+    addWranglerToGitIgnore = (ctx) => {
+      const gitIgnorePath = `${ctx.project.path}/.gitignore`;
+      const gitIgnorePreExisted = (0, import_fs10.existsSync)(gitIgnorePath);
+      const gitDirExists = directoryExists(`${ctx.project.path}/.git`);
+      if (!gitIgnorePreExisted && !gitDirExists) {
+        return;
+      }
+      if (!gitIgnorePreExisted) {
+        writeFile2(gitIgnorePath, "");
+      }
+      const existingGitIgnoreContent = readFile(gitIgnorePath);
+      const wranglerGitIgnoreFiles = [".wrangler", ".dev.vars"];
+      const wranglerGitIgnoreFilesToAdd = wranglerGitIgnoreFiles.filter(
+        (file) => !existingGitIgnoreContent.match(
+          new RegExp(`
+${file}${file === ".wrangler" ? "/?" : ""}\\s+(#'*)?`)
+        )
+      );
+      if (wranglerGitIgnoreFilesToAdd.length === 0) {
+        return;
+      }
+      const s = spinner();
+      s.start("Adding Wrangler files to the .gitignore file");
+      const linesToAppend = [
+        "",
+        ...!existingGitIgnoreContent.match(/\n\s*$/) ? [""] : []
+      ];
+      if (wranglerGitIgnoreFilesToAdd.length === wranglerGitIgnoreFiles.length) {
+        linesToAppend.push("# wrangler files");
+      }
+      wranglerGitIgnoreFilesToAdd.forEach((line) => linesToAppend.push(line));
+      linesToAppend.push("");
+      appendFile(gitIgnorePath, linesToAppend.join("\n"));
+      s.stop(
+        `${brandColor(gitIgnorePreExisted ? "updated" : "created")} ${dim(
+          ".gitignore file"
+        )}`
+      );
+    };
   }
 });
 
@@ -80121,6 +80217,7 @@ var configure9 = async (ctx) => {
   if (template.configure) {
     await template.configure({ ...ctx });
   }
+  addWranglerToGitIgnore(ctx);
   await updatePackageScripts(ctx);
   await offerGit(ctx);
   await gitCommit(ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-a5231dec",
+  "version": "0.0.0-a676f55a",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -66,9 +66,9 @@
     "which-pm-runs": "^1.1.0",
     "yargs": "^17.7.1",
     "yarn": "^1.22.19",
-    "@cloudflare/cli": "1.1.1",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.30.1"
+    "wrangler": "3.34.2",
+    "@cloudflare/cli": "1.1.1"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/angular/c3.ts

@@ -81,19 +81,18 @@ const config: TemplateConfig = {
 	copyFiles: {
 		path: "./templates",
 	},
+	devScript: "start",
+	deployScript: "deploy",
 	generate,
 	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			start: `${npm} run pages:build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+			start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()} --experimental-local`,
+			build: `ng build && ${npm} run process`,
 			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`,
+			deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
 		},
 	}),
-	deployScript: "deploy",
-	devScript: "start",
-	testFlags: ["--style", "sass"],
 };
 export default config;

package/templates/astro/c3.ts

@@ -107,14 +107,5 @@ const config: TemplateConfig = {
 			...(usesTypescript(ctx) && { "build-cf-types": `wrangler types` }),
 		},
 	}),
-	testFlags: [
-		"--skip-houston",
-		"--no-install",
-		"--no-git",
-		"--template",
-		"blog",
-		"--typescript",
-		"strict",
-	],
 };
 export default config;

package/templates/common/js/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/common/ts/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/docusaurus/c3.ts

@@ -1,5 +1,4 @@
 import { runFrameworkGenerator } from "helpers/command";
-import { compatDateFlag } from "helpers/files";
 import { detectPackageManager } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
@@ -18,10 +17,10 @@ const config: TemplateConfig = {
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 3000 -- ${npm} run start`,
-			"pages:deploy": `${npm} run build && wrangler pages deploy ./build`,
+			deploy: `${npm} run build && wrangler pages deploy ./build`,
 		},
 	}),
-	testFlags: [`--package-manager`, npm],
+	devScript: "start",
+	deployScript: "deploy",
 };
 export default config;

package/templates/gatsby/c3.ts

@@ -1,6 +1,5 @@
 import { inputPrompt } from "@cloudflare/cli/interactive";
 import { runFrameworkGenerator } from "helpers/command";
-import { compatDateFlag } from "helpers/files";
 import { detectPackageManager } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
@@ -38,9 +37,12 @@ const config: TemplateConfig = {
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 8000 -- ${npm} run develop`,
-			"pages:deploy": `${npm} run build && wrangler pages deploy ./public`,
+			deploy: `${npm} run build && wrangler pages deploy ./public`,
+			preview: `${npm} run build && wrangler pages dev ./public`,
 		},
 	}),
+	devScript: "develop",
+	deployScript: "deploy",
+	previewScript: "preview",
 };
 export default config;

package/templates/hello-world/js/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/hello-world/js/package.json

@@ -8,6 +8,8 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"wrangler": "^3.0.0"
+		"wrangler": "^3.0.0",
+		"vitest": "1.3.0",
+		"@cloudflare/vitest-pool-workers": "^0.1.0"
 	}
 }

package/templates/hello-world/js/test/index.spec.js

@@ -0,0 +1,20 @@
+import { env, createExecutionContext, waitOnExecutionContext, SELF } from "cloudflare:test";
+import { describe, it, expect } from "vitest";
+import worker from "../src";
+
+describe("Hello World worker", () => {
+  it("responds with Hello World! (unit style)", async () => {
+    const request = new Request("http://example.com");
+    // Create an empty context to pass to `worker.fetch()`.
+    const ctx = createExecutionContext();
+    const response = await worker.fetch(request, env, ctx);
+    // Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
+    await waitOnExecutionContext(ctx);
+    expect(await response.text()).toMatchInlineSnapshot(`"Hello World!"`);
+  });
+
+  it("responds with Hello World! (integration style)", async () => {
+   const response = await SELF.fetch(request, env, ctx);
+   expect(await response.text()).toMatchInlineSnapshot(`"Hello World!"`);
+ });
+});

package/templates/hello-world/js/vitest.config.js

@@ -0,0 +1,11 @@
+import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
+
+export default defineWorkersConfig({
+  test: {
+    poolOptions: {
+      workers: {
+        wrangler: { configPath: "./wrangler.toml" },
+      },
+    },
+  },
+});

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

@@ -1,6 +1,7 @@
 name = "<TBD>"
 main = "src/index.js"
 compatibility_date = "<TBD>"
+compatibility_flags = ["nodejs_compat"]
 
 # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
 # Note: Use secrets to store sensitive data.

package/templates/hello-world/ts/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

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

@@ -5,10 +5,13 @@
 	"scripts": {
 		"deploy": "wrangler deploy",
 		"dev": "wrangler dev",
-		"start": "wrangler dev"
+		"start": "wrangler dev",
+		"test": "vitest"
 	},
 	"devDependencies": {
 		"typescript": "^5.0.4",
-		"wrangler": "^3.0.0"
+		"wrangler": "^3.0.0",
+		"vitest": "1.3.0",
+		"@cloudflare/vitest-pool-workers": "^0.1.0"
 	}
 }

package/templates/hello-world/ts/test/index.spec.ts

@@ -0,0 +1,25 @@
+// test/index.spec.ts
+import { env, createExecutionContext, waitOnExecutionContext, SELF } from "cloudflare:test";
+import { describe, it, expect } from "vitest";
+import worker from "../src/index";
+
+// For now, you'll need to do something like this to get a correctly-typed
+// `Request` to pass to `worker.fetch()`.
+const IncomingRequest = Request<unknown, IncomingRequestCfProperties>;
+
+describe("Hello World worker", () => {
+  it("responds with Hello World! (unit style)", async () => {
+    const request = new IncomingRequest("http://example.com");
+    // Create an empty context to pass to `worker.fetch()`.
+    const ctx = createExecutionContext();
+    const response = await worker.fetch(request, env, ctx);
+    // Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
+    await waitOnExecutionContext(ctx);
+    expect(await response.text()).toMatchInlineSnapshot(`"Hello World!"`);
+  });
+
+  it("responds with Hello World! (integration style)", async () => {
+   const response = await SELF.fetch("https://example.com");
+   expect(await response.text()).toMatchInlineSnapshot(`"Hello World!"`);
+ });
+});

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

@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "@cloudflare/workers-types/experimental",
+      "@cloudflare/vitest-pool-workers"
+    ]
+  },
+  "include": ["./**/*.ts", "../src/env.d.ts"],
+  "exclude": []
+}

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

@@ -26,7 +26,7 @@
 		/* Modules */
 		"module": "es2022" /* Specify what module code is generated. */,
 		// "rootDir": "./",                                  /* Specify the root folder within your source files. */
-		"moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
+		"moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
 		// "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
 		// "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
 		// "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
@@ -97,5 +97,6 @@
 		/* Completeness */
 		// "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
 		"skipLibCheck": true /* Skip type checking all .d.ts files. */
-	}
+	},
+	"exclude": ["test"]
 }

package/templates/hello-world/ts/vitest.config.ts

@@ -0,0 +1,11 @@
+import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
+
+export default defineWorkersConfig({
+  test: {
+    poolOptions: {
+      workers: {
+        wrangler: { configPath: "./wrangler.toml" },
+      },
+    },
+  },
+});

package/templates/hello-world/ts/wrangler.toml

@@ -1,6 +1,7 @@
 name = "<TBD>"
 main = "src/index.ts"
 compatibility_date = "<TBD>"
+compatibility_flags = ["nodejs_compat"]
 
 # Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
 # Note: Use secrets to store sensitive data.

package/templates/hello-world-durable-object/js/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

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

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/next/c3.ts

@@ -158,9 +158,6 @@ export default {
 	id: "next",
 	platform: "pages",
 	displayName: "Next",
-	devScript: "dev",
-	previewScript: "preview",
-	deployScript: "deploy",
 	generate,
 	configure,
 	copyFiles: {
@@ -212,15 +209,8 @@ export default {
 			},
 		};
 	},
-	testFlags: [
-		"--typescript",
-		"--no-install",
-		"--eslint",
-		"--tailwind",
-		"--src-dir",
-		"--app",
-		"--import-alias",
-		"@/*",
-	],
+	devScript: "dev",
+	previewScript: "preview",
+	deployScript: "deploy",
 	compatibilityFlags: ["nodejs_compat"],
 } as TemplateConfig;

package/templates/nuxt/c3.ts

@@ -3,13 +3,14 @@ import { brandColor, dim } from "@cloudflare/cli/colors";
 import { spinner } from "@cloudflare/cli/interactive";
 import { transformFile } from "helpers/codemod";
 import { installPackages, runFrameworkGenerator } from "helpers/command";
-import { writeFile } from "helpers/files";
+import { readFile, writeFile } from "helpers/files";
 import { detectPackageManager } from "helpers/packages";
 import * as recast from "recast";
+import { getLatestTypesEntrypoint } from "../../src/workers";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
 
-const { npm } = detectPackageManager();
+const { npm, name: pm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
 	const gitFlag = ctx.args.git ? `--gitInit` : `--no-gitInit`;
@@ -27,13 +28,44 @@ const generate = async (ctx: C3Context) => {
 	logRaw(""); // newline
 };
 
-const configure = async () => {
-	await installPackages(["nitro-cloudflare-dev"], {
+const configure = async (ctx: C3Context) => {
+	const packages = ["nitro-cloudflare-dev"];
+
+	// When using pnpm, explicitly add h3 package so the H3Event type declaration can be updated.
+	// Package managers other than pnpm will hoist the dependency, as will pnpm with `--shamefully-hoist`
+	if (pm === "pnpm") {
+		packages.push("h3");
+	}
+
+	await installPackages(packages, {
 		dev: true,
 		startText: "Installing nitro module `nitro-cloudflare-dev`",
 		doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
 	});
 	updateNuxtConfig();
+
+	updateEnvTypes(ctx);
+};
+
+const updateEnvTypes = (ctx: C3Context) => {
+	const filepath = "env.d.ts";
+
+	const s = spinner();
+	s.start(`Updating ${filepath}`);
+
+	let file = readFile(filepath);
+
+	let typesEntrypoint = `@cloudflare/workers-types/`;
+	const latestEntrypoint = getLatestTypesEntrypoint(ctx);
+	if (latestEntrypoint) {
+		typesEntrypoint += `/${latestEntrypoint}`;
+	}
+
+	// Replace placeholder with actual types entrypoint
+	file = file.replace("WORKERS_TYPES_ENTRYPOINT", typesEntrypoint);
+	writeFile("env.d.ts", file);
+
+	s.stop(`${brandColor(`updated`)} ${dim(`\`${filepath}\``)}`);
 };
 
 const updateNuxtConfig = () => {
@@ -85,8 +117,6 @@ const config: TemplateConfig = {
 	copyFiles: {
 		path: "./templates",
 	},
-	devScript: "dev",
-	deployScript: "deploy",
 	generate,
 	configure,
 	transformPackageJson: async () => ({
@@ -96,5 +126,8 @@ const config: TemplateConfig = {
 			"build-cf-types": `wrangler types`,
 		},
 	}),
+	devScript: "dev",
+	deployScript: "deploy",
+	previewScript: "preview",
 };
 export default config;

package/templates/nuxt/templates/env.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="WORKERS_TYPES_ENTRYPOINT" />
+
+declare module "h3" {
+  interface H3EventContext {
+    cf: CfProperties;
+    cloudflare: {
+      request: Request;
+      env: Env;
+      context: ExecutionContext;
+    };
+  }
+}
+
+export {};

package/templates/nuxt/templates/worker-configuration.d.ts

@@ -0,0 +1,3 @@
+// Generated by Wrangler on Fri Feb 16 2024 15:52:18 GMT-0600 (Central Standard Time)
+// After adding bindings to `wrangler.toml`, regenerate this interface via `npm build-cf-types`
+interface Env {}

package/templates/pre-existing/js/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/queues/js/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/queues/ts/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/qwik/c3.ts

@@ -130,8 +130,6 @@ const config: TemplateConfig = {
 	copyFiles: {
 		path: "./templates",
 	},
-	devScript: "dev",
-	deployScript: "deploy",
 	generate,
 	configure,
 	transformPackageJson: async () => ({
@@ -141,5 +139,8 @@ const config: TemplateConfig = {
 			"build-cf-types": `wrangler types`,
 		},
 	}),
+	devScript: "dev",
+	deployScript: "deploy",
+	previewScript: "preview",
 };
 export default config;

package/templates/react/c3.ts

@@ -1,6 +1,5 @@
 import { logRaw } from "@cloudflare/cli";
 import { runFrameworkGenerator } from "helpers/command";
-import { compatDateFlag } from "helpers/files";
 import { detectPackageManager } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
@@ -21,9 +20,12 @@ const config: TemplateConfig = {
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --port 3000 -- ${npm} start`,
-			"pages:deploy": `${npm} run build && wrangler pages deploy ./build`,
+			deploy: `${npm} run build && wrangler pages deploy ./build`,
+			preview: `${npm} run build && wrangler pages dev ./build`,
 		},
 	}),
+	devScript: "dev",
+	deployScript: "deploy",
+	previewScript: "preview",
 };
 export default config;

package/templates/remix/c3.ts

@@ -62,6 +62,5 @@ const config: TemplateConfig = {
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
-	testFlags: ["--typescript", "--no-install", "--no-git-init"],
 };
 export default config;

package/templates/scheduled/js/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/scheduled/ts/.editorconfig

@@ -3,7 +3,6 @@ root = true
 
 [*]
 indent_style = tab
-tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

package/templates/solid/c3.ts

@@ -12,7 +12,8 @@ const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
 	// Run the create-solid command
-	await runFrameworkGenerator(ctx, [ctx.project.name]);
+	// -s flag forces solid-start
+	await runFrameworkGenerator(ctx, ["-p", ctx.project.name, "-s"]);
 
 	logRaw("");
 };
@@ -72,9 +73,9 @@ const config: TemplateConfig = {
 			deploy: `${npm} run build && wrangler pages deploy ./dist`,
 		},
 	}),
+	compatibilityFlags: ["nodejs_compat"],
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
-	compatibilityFlags: ["nodejs_compat"],
 };
 export default config;

package/templates/vue/c3.ts

@@ -1,5 +1,4 @@
 import { runFrameworkGenerator } from "helpers/command";
-import { compatDateFlag } from "helpers/files";
 import { detectPackageManager } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
@@ -18,10 +17,12 @@ const config: TemplateConfig = {
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 5173 -- ${npm} run dev`,
-			"pages:deploy": `${npm} run build && wrangler pages deploy ./dist`,
+			deploy: `${npm} run build && wrangler pages deploy ./dist`,
+			preview: `${npm} run build && wrangler pages dev ./dist`,
 		},
 	}),
-	testFlags: ["--ts"],
+	devScript: "dev",
+	deployScript: "deploy",
+	previewScript: "preview",
 };
 export default config;