create-cloudflare 0.0.0-62f1fce8 → 0.0.0-63216f1e

package/dist/cli.js

@@ -1605,7 +1605,7 @@ var init_streams = __esm({
 });
 
 // ../cli/index.ts
-var import_process, shapes, status, space, logRaw, log, newline, updateStatus, startSection, endSection, cancel, warn, stripAnsi, crash, error;
+var import_process, shapes, status, space, logRaw, log, newline, format, updateStatus, startSection, endSection, cancel, warn, stripAnsi, crash, error;
 var init_cli = __esm({
   "../cli/index.ts"() {
     import_process = require("process");
@@ -1634,7 +1634,8 @@ var init_cli = __esm({
       error: bgRed(` ERROR `),
       warning: bgYellow(` WARNING `),
       info: bgBlue(` INFO `),
-      success: bgGreen(` SUCCESS `)
+      success: bgGreen(` SUCCESS `),
+      cancel: white.bgRed(` X `)
     };
     space = (n2 = 1) => {
       return hidden("\u200A".repeat(n2));
@@ -1650,15 +1651,32 @@ var init_cli = __esm({
     newline = () => {
       log("");
     };
+    format = (msg, {
+      linePrefix = gray(shapes.bar),
+      firstLinePrefix = linePrefix,
+      newlineBefore = false,
+      newlineAfter = false,
+      formatLine = (line) => white(line),
+      multiline = true
+    } = {}) => {
+      const lines = multiline ? msg.split("\n") : [msg];
+      const formattedLines = lines.map(
+        (line, i) => (i === 0 ? firstLinePrefix : linePrefix) + space() + formatLine(line)
+      );
+      if (newlineBefore)
+        formattedLines.unshift(linePrefix);
+      if (newlineAfter)
+        formattedLines.push(linePrefix);
+      return formattedLines.join("\n");
+    };
     updateStatus = (msg, printNewLine = true) => {
-      const lines = msg.split("\n");
-      const restLines = lines.slice(1).map((ln) => `${gray(shapes.bar)} ${white(ln)}`);
-      logRaw(`${gray(shapes.leftT)} ${lines[0]}`);
-      if (restLines.length) {
-        logRaw(restLines.join("\n"));
-      }
-      if (printNewLine)
-        newline();
+      logRaw(
+        format(msg, {
+          firstLinePrefix: gray(shapes.leftT),
+          linePrefix: gray(shapes.bar),
+          newlineAfter: printNewLine
+        })
+      );
     };
     startSection = (heading, subheading, printNewLine = true) => {
       logRaw(
@@ -1673,13 +1691,39 @@ var init_cli = __esm({
 `
       );
     };
-    cancel = (msg) => {
-      newline();
-      logRaw(`${gray(shapes.corners.bl)} ${white.bgRed(` X `)} ${dim(msg)}`);
+    cancel = (msg, {
+      // current default is backcompat and makes sense going forward too
+      shape = shapes.corners.bl,
+      // current default for backcompat -- TODO: change default to true once all callees have been updated
+      multiline = false
+    } = {}) => {
+      logRaw(
+        format(msg, {
+          firstLinePrefix: `${gray(shape)} ${status.cancel}`,
+          linePrefix: gray(shapes.bar),
+          newlineBefore: true,
+          formatLine: (line) => dim(line),
+          // for backcompat but it's not ideal for this to be "dim"
+          multiline
+        })
+      );
     };
-    warn = (msg) => {
-      newline();
-      logRaw(`${gray(shapes.corners.bl)} ${status.warning} ${dim(msg)}`);
+    warn = (msg, {
+      // current default for backcompat -- TODO: change default to shapes.bar once all callees have been updated
+      shape = shapes.corners.bl,
+      // current default for backcompat -- TODO: change default to true once all callees have been updated
+      multiline = false
+    } = {}) => {
+      logRaw(
+        format(msg, {
+          firstLinePrefix: gray(shape) + space() + status.warning,
+          linePrefix: gray(shapes.bar),
+          newlineBefore: true,
+          formatLine: (line) => dim(line),
+          // for backcompat but it's not ideal for this to be "dim"
+          multiline
+        })
+      );
     };
     stripAnsi = (str) => {
       const pattern = [
@@ -3554,18 +3598,18 @@ var init_interactive = __esm({
     getTextRenderers = (config13) => {
       const { question } = config13;
       const helpText = config13.helpText ?? "";
-      const format4 = config13.format ?? ((val) => String(val));
+      const format5 = config13.format ?? ((val) => String(val));
       const defaultValue = config13.defaultValue?.toString() ?? "";
       return {
         initial: () => [
           `${blCorner} ${bold(question)} ${dim(helpText)}`,
-          `${space(2)}${gray(format4(defaultValue))}`,
+          `${space(2)}${gray(format5(defaultValue))}`,
           ``
           // extra line for readability
         ],
         active: ({ value }) => [
           `${blCorner} ${bold(question)} ${dim(helpText)}`,
-          `${space(2)}${format4(value || dim(defaultValue))}`,
+          `${space(2)}${format5(value || dim(defaultValue))}`,
           ``
           // extra line for readability
         ],
@@ -3573,11 +3617,11 @@ var init_interactive = __esm({
           `${leftT} ${status.error} ${dim(error2)}`,
           `${grayBar}`,
           `${blCorner} ${question} ${dim(helpText)}`,
-          `${space(2)}${format4(value)}`,
+          `${space(2)}${format5(value)}`,
           ``
           // extra line for readability
         ],
-        submit: ({ value }) => renderSubmit(config13, format4(value ?? "")),
+        submit: ({ value }) => renderSubmit(config13, format5(value ?? "")),
         cancel: handleCancel
       };
     };
@@ -3810,8 +3854,10 @@ ${grayBar} ${msg}`);
             }
             clearLoop();
           } else {
-            logUpdate2(`
+            if (msg !== void 0) {
+              logUpdate2(`
 ${grayBar} ${msg}`);
+            }
             newline();
           }
         }
@@ -3851,7 +3897,7 @@ var init_args = __esm({
 var version, devDependencies;
 var init_package = __esm({
   "package.json"() {
-    version = "0.0.0-62f1fce8";
+    version = "0.0.0-63216f1e";
     devDependencies = {
       "@babel/parser": "^7.21.3",
       "@babel/types": "^7.21.4",
@@ -3859,7 +3905,7 @@ var init_package = __esm({
       "@cloudflare/cli": "workspace:*",
       "@cloudflare/eslint-config-worker": "*",
       "@cloudflare/workers-tsconfig": "workspace:*",
-      "@cloudflare/workers-types": "^4.20230419.0",
+      "@cloudflare/workers-types": "^4.20240320.1",
       "@iarna/toml": "^3.0.0",
       "@types/command-exists": "^1.2.0",
       "@types/cross-spawn": "^6.0.2",
@@ -24556,19 +24602,19 @@ var init_package2 = __esm({
         "additionally it also contains a map that maps frameworks to their respective clis"
       ],
       dependencies: {
-        "create-astro": "4.7.3",
+        "create-astro": "4.7.4",
         "@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.5.3",
-        "create-svelte": "6.0.9",
+        "create-remix": "2.8.1",
+        "create-solid": "0.5.5",
+        "create-svelte": "6.0.10",
         "create-vue": "3.9.2",
         gatsby: "5.13.3",
-        nuxi: "3.10.1"
+        nuxi: "3.11.1"
       },
       frameworkCliMap: {
         angular: "@angular/create",
@@ -37936,12 +37982,12 @@ var require_index_688c5d50 = __commonJS({
             args.unshift("%O");
           }
           let index = 0;
-          args[0] = args[0].replace(/%([a-zA-Z%])/g, (match2, format4) => {
+          args[0] = args[0].replace(/%([a-zA-Z%])/g, (match2, format5) => {
             if (match2 === "%%") {
               return "%";
             }
             index++;
-            const formatter = createDebug.formatters[format4];
+            const formatter = createDebug.formatters[format5];
             if (typeof formatter === "function") {
               const val = args[index];
               match2 = formatter.call(self2, val);
@@ -70613,9 +70659,9 @@ var init_c32 = __esm({
           n2.node.arguments = [
             b2.objectExpression([
               b2.objectProperty(
-                b2.identifier("runtime"),
+                b2.identifier("platformProxy"),
                 b2.objectExpression([
-                  b2.objectProperty(b2.identifier("mode"), b2.stringLiteral("local"))
+                  b2.objectProperty(b2.identifier("enabled"), b2.booleanLiteral(true))
                 ])
               )
             ])
@@ -70807,10 +70853,16 @@ var init_c36 = __esm({
     generate6 = async (ctx) => {
       const projectName = ctx.project.name;
       await runFrameworkGenerator(ctx, [projectName]);
-      copyFile(
-        (0, import_path13.join)(getTemplatePath(ctx), "wrangler.toml"),
-        (0, import_path13.join)(ctx.project.path, "wrangler.toml")
+      const wranglerToml = readFile((0, import_path13.join)(getTemplatePath(ctx), "wrangler.toml"));
+      const newTomlContent = wranglerToml.replace(
+        /#\s+\[\[kv_namespaces\]\]\n#\s+binding\s+=\s+"MY_KV_NAMESPACE"\n#\s+id\s+=\s+"[a-zA-Z0-9]+?"/,
+        ($1) => `# KV Example:
+${$1}`
       );
+      if (!/# KV Example/.test(newTomlContent)) {
+        crash("Failed to properly generate the wrangler.toml file");
+      }
+      writeFile2((0, import_path13.join)(ctx.project.path, "wrangler.toml"), newTomlContent);
       updateStatus("Created wrangler.toml file");
     };
     updateNextConfig = () => {
@@ -71260,7 +71312,7 @@ var init_c310 = __esm({
       await runFrameworkGenerator(ctx, [
         ctx.project.name,
         "--template",
-        "https://github.com/remix-run/remix/tree/main/templates/vite-cloudflare"
+        "https://github.com/remix-run/remix/tree/main/templates/cloudflare"
       ]);
       logRaw("");
     };
@@ -71846,7 +71898,7 @@ var init_templates = __esm({
         "hello-world": (await Promise.resolve().then(() => (init_c314(), c3_exports14))).default,
         "hello-world-durable-object": (await Promise.resolve().then(() => (init_c315(), c3_exports15))).default,
         // Dummy record -- actual template config resolved in `selectFramework`
-        webFramework: { displayName: "Website or web app" },
+        "web-framework": { displayName: "Website or web app" },
         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,
@@ -71861,13 +71913,19 @@ var init_templates = __esm({
     selectTemplate = async (args) => {
       if (!args.type) {
         if (args.framework) {
-          args.type = "webFramework";
+          args.type = "web-framework";
         } else if (args.existingScript) {
           args.type = "pre-existing";
         } else if (args.template) {
           args.type = "remote-template";
         }
       }
+      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 templateMap = await getTemplateMap();
       const templateOptions = Object.entries(templateMap).map(
         ([value, { displayName, hidden: hidden2 }]) => ({
@@ -71889,7 +71947,7 @@ var init_templates = __esm({
       if (!Object.keys(templateMap).includes(type)) {
         return crash(`Unknown application type provided: ${type}.`);
       }
-      if (type === "webFramework") {
+      if (type === "web-framework") {
         return selectFramework(args);
       }
       if (type === "remote-template") {
@@ -77095,7 +77153,7 @@ init_command();
 init_packageManagers();
 
 // ../wrangler/package.json
-var version2 = "3.34.2";
+var version2 = "3.41.0";
 
 // src/git.ts
 init_package();
@@ -79165,7 +79223,7 @@ var CharacterCodes;
 })(CharacterCodes || (CharacterCodes = {}));
 
 // ../../node_modules/.pnpm/jsonc-parser@3.2.0/node_modules/jsonc-parser/lib/esm/impl/format.js
-function format3(documentText, range, options) {
+function format4(documentText, range, options) {
   let initialIndentLevel;
   let formatText;
   let formatTextStart;
@@ -79966,7 +80024,7 @@ function withFormatting(text, edit, options) {
       end++;
     }
   }
-  const edits = format3(newText, { offset: begin, length: end - begin }, { ...options.formattingOptions, keepLines: false });
+  const edits = format4(newText, { offset: begin, length: end - begin }, { ...options.formattingOptions, keepLines: false });
   for (let i = edits.length - 1; i >= 0; i--) {
     const edit2 = edits[i];
     newText = applyEdit(newText, edit2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-62f1fce8",
+  "version": "0.0.0-63216f1e",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -30,7 +30,7 @@
     "@babel/types": "^7.21.4",
     "@clack/prompts": "^0.6.3",
     "@cloudflare/eslint-config-worker": "*",
-    "@cloudflare/workers-types": "^4.20230419.0",
+    "@cloudflare/workers-types": "^4.20240320.1",
     "@iarna/toml": "^3.0.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -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.34.2",
-    "@cloudflare/cli": "1.1.1"
+    "wrangler": "3.41.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/astro/c3.ts

@@ -46,9 +46,9 @@ const updateAstroConfig = () => {
 			n.node.arguments = [
 				b.objectExpression([
 					b.objectProperty(
-						b.identifier("runtime"),
+						b.identifier("platformProxy"),
 						b.objectExpression([
-							b.objectProperty(b.identifier("mode"), b.stringLiteral("local")),
+							b.objectProperty(b.identifier("enabled"), b.booleanLiteral(true)),
 						])
 					),
 				]),

package/templates/astro/snippets/runtimeDeclaration.ts

@@ -1,4 +1,5 @@
-type Runtime = import("@astrojs/cloudflare").DirectoryRuntime<Env>;
+type Runtime = import("@astrojs/cloudflare").Runtime<Env>;
+
 declare namespace App {
 	interface Locals extends Runtime {}
 }

package/templates/next/README.md

@@ -65,4 +65,4 @@ In order to enable the example:
 
 After doing this you can run the `dev` or `preview` script and visit the `/api/hello` route to see the example in action.
 
-Finally, if you also want to see the example work in the deployed application make sure to add a `MY_KV` binding to your Pages application in its [dashboard kv bindings settings section](https://dash.cloudflare.com/?to=/:account/pages/view/:pages-project/settings/functions#kv_namespace_bindings_section). After having configured it make sure to re-deploy your application.
+Finally, if you also want to see the example work in the deployed application make sure to add a `MY_KV_NAMESPACE` binding to your Pages application in its [dashboard kv bindings settings section](https://dash.cloudflare.com/?to=/:account/pages/view/:pages-project/settings/functions#kv_namespace_bindings_section). After having configured it make sure to re-deploy your application.

package/templates/next/app/js/app/api/hello/route.js

@@ -12,7 +12,7 @@ export async function GET(request) {
   // )
   //
   // KV Example:
-  // const myKv = getRequestContext().env.MY_KV
+  // const myKv = getRequestContext().env.MY_KV_NAMESPACE
   // await myKv.put('suffix', ' from a KV store!')
   // const suffix = await myKv.get('suffix')
   // responseText += suffix

package/templates/next/app/ts/app/api/hello/route.ts

@@ -13,7 +13,7 @@ export async function GET(request: NextRequest) {
   // )
   //
   // KV Example:
-  // const myKv = getRequestContext().env.MY_KV
+  // const myKv = getRequestContext().env.MY_KV_NAMESPACE
   // await myKv.put('suffix', ' from a KV store!')
   // const suffix = await myKv.get('suffix')
   // responseText += suffix

package/templates/next/c3.ts

@@ -27,10 +27,26 @@ const generate = async (ctx: C3Context) => {
 
 	await runFrameworkGenerator(ctx, [projectName]);
 
-	copyFile(
-		join(getTemplatePath(ctx), "wrangler.toml"),
-		join(ctx.project.path, "wrangler.toml")
+	const wranglerToml = readFile(join(getTemplatePath(ctx), "wrangler.toml"));
+
+	// Note: here we add `# KV Example:` to the toml file for the KV example, we don't actually
+	//       include the comment in the template wrangler.toml file just so to keep it identical
+	//       and consistent with that of all the other frameworks
+	//       (instead of making it a special case which needs extra care)
+	const newTomlContent = wranglerToml.replace(
+		/#\s+\[\[kv_namespaces\]\]\n#\s+binding\s+=\s+"MY_KV_NAMESPACE"\n#\s+id\s+=\s+"[a-zA-Z0-9]+?"/,
+		($1) => `# KV Example:\n${$1}`
 	);
+
+	if (!/# KV Example/.test(newTomlContent)) {
+		// This should never happen to users, it is a check mostly so that
+		// if the toml file is changed in a way that breaks the "KV Example" addition
+		// the C3 Next.js e2e runs will fail with this
+		crash("Failed to properly generate the wrangler.toml file");
+	}
+
+	writeFile(join(ctx.project.path, "wrangler.toml"), newTomlContent);
+
 	updateStatus("Created wrangler.toml file");
 };
 

package/templates/next/pages/js/pages/api/hello.js

@@ -14,7 +14,7 @@ export default async function handler(req) {
   // )
   //
   // KV Example:
-  // const myKv = getRequestContext().env.MY_KV
+  // const myKv = getRequestContext().env.MY_KV_NAMESPACE
   // await myKv.put('suffix', ' from a KV store!')
   // const suffix = await myKv.get('suffix')
   // responseText += suffix

package/templates/next/pages/ts/pages/api/hello.ts

@@ -15,7 +15,7 @@ export default async function handler(req: NextRequest) {
   // )
   //
   // KV Example:
-  // const myKv = getRequestContext().env.MY_KV;
+  // const myKv = getRequestContext().env.MY_KV_NAMESPACE
   // await myKv.put('suffix', ' from a KV store!')
   // const suffix = await myKv.get('suffix')
   // responseText += suffix

package/templates/next/wrangler.toml

@@ -52,7 +52,3 @@ compatibility_flags = ["nodejs_compat"]
 # binding = "MY_SERVICE"
 # service = "my-service"
 
-# KV Example:
-# [[kv_namespaces]]
-# binding = "MY_KV"
-# id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

package/templates/remix/c3.ts

@@ -13,7 +13,7 @@ const generate = async (ctx: C3Context) => {
 	await runFrameworkGenerator(ctx, [
 		ctx.project.name,
 		"--template",
-		"https://github.com/remix-run/remix/tree/main/templates/vite-cloudflare",
+		"https://github.com/remix-run/remix/tree/main/templates/cloudflare",
 	]);
 
 	logRaw(""); // newline