create-cloudflare 0.0.0-841041de → 0.0.0-86c81ff0

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

@@ -13,7 +13,7 @@ import { worker } from "./paths.mjs";
 const serverPolyfillsFile = join(worker, "polyfills.server.mjs");
 const serverPolyfillsData = fs
 	.readFileSync(serverPolyfillsFile, "utf8")
-	.split(EOL);
+	.split(/\r?\n/);
 
 for (let index = 0; index < 2; index++) {
 	if (serverPolyfillsData[index].includes("createRequire")) {

package/dist/cli.js

@@ -60106,7 +60106,7 @@ var Yargs = YargsFactory(esm_default);
 var yargs_default = Yargs;
 
 // package.json
-var version = "0.0.0-841041de";
+var version = "0.0.0-86c81ff0";
 var devDependencies = {
   "@babel/parser": "^7.21.3",
   "@babel/types": "^7.21.4",
@@ -60371,7 +60371,7 @@ function secondsSince(start) {
 var import_shell_quote = __toESM(require_shell_quote());
 
 // ../wrangler/package.json
-var version2 = "3.17.1";
+var version2 = "3.18.0";
 
 // src/common.ts
 var { name, npm } = detectPackageManager();
@@ -60909,9 +60909,9 @@ var retry = async ({
 };
 var runFrameworkGenerator = async (ctx, args) => {
   const cli = getFrameworkCli(ctx, true);
-  const { npm: npm14, dlx: dlx2 } = detectPackageManager();
-  const cmd = [...npm14 === "yarn" ? ["npx"] : dlx2, cli, ...args];
-  const env3 = npm14 === "yarn" ? { npm_config_user_agent: "yarn" } : {};
+  const { npm: npm15, dlx: dlx2 } = detectPackageManager();
+  const cmd = [...npm15 === "yarn" ? ["npx"] : dlx2, cli, ...args];
+  const env3 = npm15 === "yarn" ? { npm_config_user_agent: "yarn" } : {};
   if (ctx.framework?.args?.length) {
     cmd.push(...ctx.framework.args);
   }
@@ -60926,10 +60926,10 @@ var runFrameworkGenerator = async (ctx, args) => {
   await runCommand(cmd, { env: env3 });
 };
 var installPackages = async (packages, config14) => {
-  const { npm: npm14 } = detectPackageManager();
+  const { npm: npm15 } = detectPackageManager();
   let saveFlag;
   let cmd;
-  switch (npm14) {
+  switch (npm15) {
     case "yarn":
       cmd = "add";
       saveFlag = config14.dev ? "-D" : "";
@@ -60945,13 +60945,13 @@ var installPackages = async (packages, config14) => {
       saveFlag = config14.dev ? "--save-dev" : "--save";
       break;
   }
-  await runCommand([npm14, cmd, saveFlag, ...packages], {
+  await runCommand([npm15, cmd, saveFlag, ...packages], {
     ...config14,
     silent: true
   });
 };
 var resetPackageManager = async (ctx) => {
-  const { npm: npm14 } = detectPackageManager();
+  const { npm: npm15 } = detectPackageManager();
   if (!needsPackageManagerReset(ctx)) {
     return;
   }
@@ -60961,17 +60961,17 @@ var resetPackageManager = async (ctx) => {
   const lockfilePath = import_path6.default.join(ctx.project.path, "package-lock.json");
   if ((0, import_fs6.existsSync)(lockfilePath))
     (0, import_fs6.rmSync)(lockfilePath);
-  await runCommand([npm14, "install"], {
+  await runCommand([npm15, "install"], {
     silent: true,
     cwd: ctx.project.path,
     startText: "Installing dependencies",
-    doneText: `${brandColor("installed")} ${dim(`via \`${npm14} install\``)}`
+    doneText: `${brandColor("installed")} ${dim(`via \`${npm15} install\``)}`
   });
 };
 var needsPackageManagerReset = (ctx) => {
-  const { npm: npm14 } = detectPackageManager();
+  const { npm: npm15 } = detectPackageManager();
   const projectPath = ctx.project.path;
-  switch (npm14) {
+  switch (npm15) {
     case "npm":
       return false;
     case "yarn":
@@ -60983,15 +60983,15 @@ var needsPackageManagerReset = (ctx) => {
   }
 };
 var npmInstall = async () => {
-  const { npm: npm14 } = detectPackageManager();
-  await runCommand([npm14, "install"], {
+  const { npm: npm15 } = detectPackageManager();
+  await runCommand([npm15, "install"], {
     silent: true,
     startText: "Installing dependencies",
-    doneText: `${brandColor("installed")} ${dim(`via \`${npm14} install\``)}`
+    doneText: `${brandColor("installed")} ${dim(`via \`${npm15} install\``)}`
   });
 };
 var installWrangler = async () => {
-  const { npm: npm14 } = detectPackageManager();
+  const { npm: npm15 } = detectPackageManager();
   if ((0, import_fs6.existsSync)(import_path6.default.resolve("node_modules", "wrangler"))) {
     return;
   }
@@ -61001,7 +61001,7 @@ var installWrangler = async () => {
       "A command line tool for building Cloudflare Workers"
     )}`,
     doneText: `${brandColor("installed")} ${dim(
-      `via \`${npm14} install wrangler --save-dev\``
+      `via \`${npm15} install wrangler --save-dev\``
     )}`
   });
 };
@@ -61048,8 +61048,8 @@ var listAccounts = async () => {
   return accounts;
 };
 async function getWorkerdCompatibilityDate() {
-  const { npm: npm14 } = detectPackageManager();
-  return runCommand([npm14, "info", "workerd", "dist-tags.latest"], {
+  const { npm: npm15 } = detectPackageManager();
+  return runCommand([npm15, "info", "workerd", "dist-tags.latest"], {
     silent: true,
     captureOutput: true,
     startText: "Retrieving current workerd compatibility date",
@@ -61086,7 +61086,7 @@ var readJSON = (path3) => {
   const contents = readFile(path3);
   return contents ? JSON.parse(contents) : contents;
 };
-var writeJSON = (path3, object, stringifySpace) => {
+var writeJSON = (path3, object, stringifySpace = 2) => {
   writeFile2(path3, JSON.stringify(object, null, stringifySpace));
 };
 var probePaths = (paths, errorMsg = "Failed to find required file.") => {
@@ -61440,7 +61440,7 @@ var writeEslintrc = async (ctx) => {
   }
   eslintConfig.extends ??= [];
   eslintConfig.extends.push("plugin:eslint-plugin-next-on-pages/recommended");
-  writeJSON(`${ctx.project.name}/.eslintrc.json`, eslintConfig, 2);
+  writeJSON(`${ctx.project.name}/.eslintrc.json`, eslintConfig);
 };
 var config6 = {
   generate: generate6,
@@ -61530,8 +61530,8 @@ var package_default = {
   ],
   dependencies: {
     "create-astro": "4.5.1",
-    "@angular/create": "17.0.3",
-    "create-docusaurus": "3.0.0",
+    "@angular/create": "17.0.5",
+    "create-docusaurus": "3.0.1",
     "create-hono": "0.3.2",
     "create-next-app": "14.0.3",
     "create-qwik": "1.2.19",
@@ -61990,11 +61990,12 @@ var createProject = async (ctx) => {
 };
 
 // src/workers.ts
+var import_fs9 = require("fs");
 var import_promises2 = require("fs/promises");
 var import_os = require("os");
 var import_path9 = require("path");
 var import_process4 = require("process");
-var { dlx } = detectPackageManager();
+var { dlx, npm: npm13 } = detectPackageManager();
 var runWorkersGenerator = async (args) => {
   const originalCWD = process.cwd();
   const { name: name2, path: path3 } = setupProjectDirectory(args);
@@ -62018,6 +62019,7 @@ var runWorkersGenerator = async (args) => {
   startSection("Installing dependencies", "Step 2 of 3");
   (0, import_process4.chdir)(ctx.project.path);
   await npmInstall();
+  await installWorkersTypes(ctx);
   await gitCommit(ctx);
   endSection("Dependencies Installed");
   await offerToDeploy(ctx);
@@ -62099,26 +62101,73 @@ async function copyExistingWorkerFiles(ctx) {
   }
 }
 async function updateFiles(ctx) {
-  const paths = {
-    packagejson: (0, import_path9.resolve)(ctx.project.path, "package.json"),
-    wranglertoml: (0, import_path9.resolve)(ctx.project.path, "wrangler.toml")
-  };
-  const contents = {
-    packagejson: JSON.parse(await (0, import_promises2.readFile)(paths.packagejson, "utf-8")),
-    wranglertoml: await (0, import_promises2.readFile)(paths.wranglertoml, "utf-8")
-  };
-  if (contents.packagejson.name === "<TBD>") {
-    contents.packagejson.name = ctx.project.name;
-  }
-  contents.wranglertoml = contents.wranglertoml.replace(/^name\s*=\s*"<TBD>"/m, `name = "${ctx.project.name}"`).replace(
+  const pkgJsonPath = (0, import_path9.resolve)(ctx.project.path, "package.json");
+  const pkgJson = readJSON(pkgJsonPath);
+  if (pkgJson.name === "<TBD>") {
+    pkgJson.name = ctx.project.name;
+  }
+  writeJSON(pkgJsonPath, pkgJson);
+  const wranglerTomlPath = (0, import_path9.resolve)(ctx.project.path, "wrangler.toml");
+  let wranglerToml = readFile(wranglerTomlPath);
+  wranglerToml = wranglerToml.replace(/^name\s*=\s*"<TBD>"/m, `name = "${ctx.project.name}"`).replace(
     /^compatibility_date\s*=\s*"<TBD>"/m,
     `compatibility_date = "${await getWorkerdCompatibilityDate()}"`
   );
-  await (0, import_promises2.writeFile)(
-    paths.packagejson,
-    JSON.stringify(contents.packagejson, null, 2)
+  writeFile2(wranglerTomlPath, wranglerToml);
+}
+async function installWorkersTypes(ctx) {
+  if (!ctx.args.ts) {
+    return;
+  }
+  await installPackages(["@cloudflare/workers-types"], {
+    dev: true,
+    startText: `Installing @cloudflare/workers-types`,
+    doneText: `${brandColor("installed")} ${dim(`via ${npm13}`)}`
+  });
+  await updateTsConfig(ctx);
+}
+async function updateTsConfig(ctx) {
+  const tsconfigPath = (0, import_path9.join)(ctx.project.path, "tsconfig.json");
+  if (!(0, import_fs9.existsSync)(tsconfigPath)) {
+    return;
+  }
+  const s = spinner();
+  s.start(`Adding latest types to \`tsconfig.json\``);
+  const tsconfig = readFile(tsconfigPath);
+  const entrypointVersion = getLatestTypesEntrypoint(ctx);
+  if (entrypointVersion === null) {
+    s.stop(
+      `${brandColor(
+        "skipped"
+      )} couldn't find latest compatible version of @cloudflare/workers-types`
+    );
+    return;
+  }
+  const typesEntrypoint = `@cloudflare/workers-types/${entrypointVersion}`;
+  const updated = tsconfig.replace(
+    "@cloudflare/workers-types",
+    typesEntrypoint
+  );
+  writeFile2(tsconfigPath, updated);
+  s.stop(`${brandColor("added")} ${dim(typesEntrypoint)}`);
+}
+function getLatestTypesEntrypoint(ctx) {
+  const workersTypesPath = (0, import_path9.resolve)(
+    ctx.project.path,
+    "node_modules",
+    "@cloudflare",
+    "workers-types"
   );
-  await (0, import_promises2.writeFile)(paths.wranglertoml, contents.wranglertoml);
+  try {
+    const entrypoints = (0, import_fs9.readdirSync)(workersTypesPath);
+    const sorted = entrypoints.filter((filename) => filename.match(/(\d{4})-(\d{2})-(\d{2})/)).sort().reverse();
+    if (sorted.length === 0) {
+      return null;
+    }
+    return sorted[0];
+  } catch (error) {
+    return null;
+  }
 }
 
 // src/templateMap.ts
@@ -62262,7 +62311,7 @@ For more information regarding how to invoke C3 please visit ${c3CliArgsDocsPage
 
 // src/cli.ts
 var import_semver2 = __toESM(require_semver2());
-var { npm: npm13 } = detectPackageManager();
+var { npm: npm14 } = detectPackageManager();
 var main = async (argv) => {
   const args = await parseArgs(argv);
   logRaw("");
@@ -62289,10 +62338,10 @@ var isUpdateAvailable = async () => {
 };
 var runLatest = async () => {
   const args = process.argv.slice(2);
-  if (npm13 === "npm") {
+  if (npm14 === "npm") {
     args.unshift("--");
   }
-  await runCommand([npm13, "create", "cloudflare@latest", ...args]);
+  await runCommand([npm14, "create", "cloudflare@latest", ...args]);
 };
 var runCli = async (args) => {
   printBanner();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-841041de",
+  "version": "0.0.0-86c81ff0",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -63,7 +63,7 @@
     "yarn": "^1.22.19",
     "@cloudflare/cli": "1.0.0",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.17.1"
+    "wrangler": "3.18.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/chatgptPlugin/ts/package.json

@@ -11,7 +11,6 @@
 		"@cloudflare/itty-router-openapi": "^1.0.1"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230404.0",
 		"wrangler": "^3.0.0"
 	}
 }

package/templates/common/ts/package.json

@@ -8,7 +8,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
 		"itty-router": "^3.0.12",
 		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"

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

@@ -8,7 +8,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
 		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}

package/templates/openapi/ts/package.json

@@ -11,7 +11,6 @@
 		"@cloudflare/itty-router-openapi": "^1.0.1"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230821.0",
 		"@types/node": "^20.5.7",
 		"@types/service-worker-mock": "^2.0.1",
 		"wrangler": "^3.0.0"

package/templates/queues/ts/package.json

@@ -8,7 +8,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
 		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}

package/templates/scheduled/ts/package.json

@@ -8,7 +8,6 @@
 		"start": "wrangler dev"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230419.0",
 		"typescript": "^5.0.4",
 		"wrangler": "^3.0.0"
 	}