create-cloudflare 0.0.0-93150aa0 → 0.0.0-93437141

package/dist/cli.js

@@ -3810,8 +3810,10 @@ ${grayBar} ${msg}`);
             }
             clearLoop();
           } else {
-            logUpdate2(`
+            if (msg !== void 0) {
+              logUpdate2(`
 ${grayBar} ${msg}`);
+            }
             newline();
           }
         }
@@ -3851,7 +3853,7 @@ var init_args = __esm({
 var version, devDependencies;
 var init_package = __esm({
   "package.json"() {
-    version = "0.0.0-93150aa0";
+    version = "0.0.0-93437141";
     devDependencies = {
       "@babel/parser": "^7.21.3",
       "@babel/types": "^7.21.4",
@@ -3859,7 +3861,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 +24558,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",
@@ -70807,10 +70809,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 +71268,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 +71854,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 +71869,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 +71903,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 +77109,7 @@ init_command();
 init_packageManagers();
 
 // ../wrangler/package.json
-var version2 = "3.35.0";
+var version2 = "3.39.0";
 
 // src/git.ts
 init_package();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-93150aa0",
+  "version": "0.0.0-93437141",
   "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",
@@ -68,7 +68,7 @@
     "yarn": "^1.22.19",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.35.0"
+    "wrangler": "3.39.0"
   },
   "engines": {
     "node": ">=18.14.1"

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