create-cloudflare 0.0.0-d4c23d23 → 0.0.0-d4dae6f6

package/dist/cli.js

@@ -3810,8 +3810,10 @@ ${grayBar} ${msg}`);
             }
             clearLoop();
           } else {
-            logUpdate2(`
+            if (msg) {
+              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-d4c23d23";
+    version = "0.0.0-d4dae6f6";
     devDependencies = {
       "@babel/parser": "^7.21.3",
       "@babel/types": "^7.21.4",
@@ -24556,15 +24558,15 @@ 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-remix": "2.8.1",
+        "create-solid": "0.5.5",
         "create-svelte": "6.0.9",
         "create-vue": "3.9.2",
         gatsby: "5.13.3",
@@ -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 = () => {
@@ -70941,7 +70949,7 @@ var init_c36 = __esm({
           }
         }
       },
-      transformPackageJson: async () => {
+      transformPackageJson: async (_2, ctx) => {
         const isNpm = npm4 === "npm";
         const isBun = npm4 === "bun";
         const isNpmOrBun = isNpm || isBun;
@@ -70953,7 +70961,10 @@ var init_c36 = __esm({
           scripts: {
             "pages:build": `${pmCommand} ${nextOnPagesCommand}`,
             preview: `${pagesBuildRunCommand} && wrangler pages dev .vercel/output/static`,
-            deploy: `${pagesBuildRunCommand} && wrangler pages deploy .vercel/output/static`
+            deploy: `${pagesBuildRunCommand} && wrangler pages deploy .vercel/output/static`,
+            ...usesTypescript(ctx) && {
+              "build-cf-types": `wrangler types --env-interface CloudflareEnv env.d.ts`
+            }
           }
         };
       },
@@ -71257,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("");
     };
@@ -77092,7 +77103,7 @@ init_command();
 init_packageManagers();
 
 // ../wrangler/package.json
-var version2 = "3.34.2";
+var version2 = "3.36.0";
 
 // src/git.ts
 init_package();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-d4c23d23",
+  "version": "0.0.0-d4dae6f6",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -67,8 +67,8 @@
     "yargs": "^17.7.1",
     "yarn": "^1.22.19",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.34.2"
+    "wrangler": "3.36.0",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/next/README.md

@@ -52,7 +52,17 @@ In order to enable the example:
   ```
   # KV Example:
   ```
+- If you're using TypeScript run the `build-cf-types` script to update the `env.d.ts` file:
+  ```bash
+  npm run build-cf-types
+  # or
+  yarn build-cf-types
+  # or
+  pnpm build-cf-types
+  # or
+  bun build-cf-types
+  ```
 
 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");
 };
 
@@ -192,7 +208,7 @@ export default {
 			},
 		},
 	},
-	transformPackageJson: async () => {
+	transformPackageJson: async (_, ctx) => {
 		const isNpm = npm === "npm";
 		const isBun = npm === "bun";
 		const isNpmOrBun = isNpm || isBun;
@@ -207,6 +223,9 @@ export default {
 				"pages:build": `${pmCommand} ${nextOnPagesCommand}`,
 				preview: `${pagesBuildRunCommand} && wrangler pages dev .vercel/output/static`,
 				deploy: `${pagesBuildRunCommand} && wrangler pages deploy .vercel/output/static`,
+				...(usesTypescript(ctx) && {
+					"build-cf-types": `wrangler types --env-interface CloudflareEnv env.d.ts`,
+				}),
 			},
 		};
 	},

package/templates/next/env.d.ts

@@ -1,7 +1,5 @@
+// Generated by Wrangler
+// by running `wrangler types --env-interface CloudflareEnv env.d.ts`
+
 interface CloudflareEnv {
-  // Add here the Cloudflare Bindings you want to have available in your application
-  // (for more details on Bindings see: https://developers.cloudflare.com/pages/functions/bindings/)
-  //
-  // KV Example:
-  // MY_KV: KVNamespace
 }

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

@@ -50,4 +50,5 @@ compatibility_flags = ["nodejs_compat"]
 # Docs: https://developers.cloudflare.com/pages/functions/bindings/#service-bindings
 # [[services]]
 # binding = "MY_SERVICE"
-# service = "my-service"
+# service = "my-service"
+

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

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

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

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

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

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

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