create-cloudflare 0.0.0-e8aaa3930 → 0.0.0-e9106dfa5

package/templates/vue/workers/ts/src/components/HelloWorld.vue

@@ -0,0 +1,44 @@
+<script setup lang="ts">
+defineProps<{
+  msg: string
+}>()
+</script>
+
+<template>
+  <div class="greetings">
+    <h1 class="green">{{ msg }}</h1>
+    <h3>
+      You’ve successfully created a project with
+      <a href="https://vite.dev/" target="_blank" rel="noopener">Vite</a> +
+      <a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a> +
+      <a href="https://developers.cloudflare.com/workers/" target="_blank" rel="noopener"
+        >Cloudflare Workers</a
+      >. What's next?
+    </h3>
+  </div>
+</template>
+
+<style scoped>
+h1 {
+  font-weight: 500;
+  font-size: 2.6rem;
+  position: relative;
+  top: -10px;
+}
+
+h3 {
+  font-size: 1.2rem;
+}
+
+.greetings h1,
+.greetings h3 {
+  text-align: center;
+}
+
+@media (min-width: 1024px) {
+  .greetings h1,
+  .greetings h3 {
+    text-align: left;
+  }
+}
+</style>

package/templates/vue/workers/ts/tsconfig.worker.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.node.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.worker.tsbuildinfo",
+    "types": ["@cloudflare/workers-types/2023-07-01", "./worker-configuration.d.ts","vite/client"],
+  },
+  "include": ["server"],
+}

package/templates/vue/workers/ts/vite.config.ts

@@ -0,0 +1,21 @@
+import { fileURLToPath, URL } from 'node:url'
+
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
+import vueDevTools from 'vite-plugin-vue-devtools'
+
+import { cloudflare } from "@cloudflare/vite-plugin"
+
+// https://vite.dev/config/
+export default defineConfig({
+	plugins: [
+		vue(),
+		vueDevTools(),
+		cloudflare()
+	],
+	resolve: {
+		alias: {
+			'@': fileURLToPath(new URL('./src', import.meta.url))
+		},
+	},
+})

package/templates/vue/workers/ts/worker-configuration.d.ts

@@ -0,0 +1,6 @@
+// Generated by Wrangler by running `wrangler types`
+// After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
+
+interface Env {
+	ASSETS: Fetcher;
+}

package/templates/vue/workers/ts/wrangler.jsonc

@@ -0,0 +1,12 @@
+{
+	"name": "<TBD>",
+	"compatibility_date": "<TBD>",
+	"main": "server/index.ts",
+	"assets": {
+		"not_found_handling": "single-page-application",
+		"binding": "ASSETS"
+	},
+	"observability": {
+		"enabled": true
+	}
+}

package/templates-experimental/next/c3.ts

@@ -1,25 +1,18 @@
 import { brandColor, dim } from "@cloudflare/cli/colors";
+import { spinner } from "@cloudflare/cli/interactive";
 import { runFrameworkGenerator } from "frameworks/index";
+import { readFile, usesTypescript, writeFile } from "helpers/files";
 import { installPackages } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
 import type { C3Context } from "types";
 
 const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [
-		ctx.project.name,
-		"--ts",
-		"--tailwind",
-		"--eslint",
-		"--app",
-		"--import-alias",
-		"@/*",
-		"--src-dir",
-	]);
+	await runFrameworkGenerator(ctx, [ctx.project.name]);
 };
 
-const configure = async () => {
+const configure = async (ctx: C3Context) => {
 	const packages = [
-		"@opennextjs/cloudflare@0.3.x",
+		"@opennextjs/cloudflare@0.5.x",
 		"@cloudflare/workers-types",
 	];
 	await installPackages(packages, {
@@ -27,16 +20,39 @@ const configure = async () => {
 		startText: "Adding the Cloudflare adapter",
 		doneText: `${brandColor(`installed`)} ${dim(packages.join(", "))}`,
 	});
+
+	const usesTs = usesTypescript(ctx);
+
+	updateNextConfig(usesTs);
+};
+
+const updateNextConfig = (usesTs: boolean) => {
+	const s = spinner();
+
+	const configFile = `next.config.${usesTs ? "ts" : "mjs"}`;
+	s.start(`Updating \`${configFile}\``);
+
+	const configContent = readFile(configFile);
+
+	const updatedConfigFile =
+		configContent +
+		`
+		// added by create cloudflare to enable calling \`getCloudflareContext()\` in \`next dev\`
+		import { initOpenNextCloudflareForDev } from '@opennextjs/cloudflare';
+		initOpenNextCloudflareForDev();
+		`.replace(/\n\t*/g, "\n");
+
+	writeFile(configFile, updatedConfigFile);
+
+	s.stop(`${brandColor(`updated`)} ${dim(`\`${configFile}\``)}`);
 };
 
 export default {
 	configVersion: 1,
 	id: "next",
 	frameworkCli: "create-next-app",
-	// TODO: here we need to specify a version of create-next-app which is different from the
-	//       standard one used in the stable Next.js template, that's because our open-next adapter
-	//       is not yet fully ready for Next.js 15, once it is we should remove the following
-	frameworkCliPinnedVersion: "^14.2.23",
+	// TODO: Stop using a pinned version when the template graduates.
+	frameworkCliPinnedVersion: "~15.2.2",
 	platform: "workers",
 	displayName: "Next.js (using Node.js compat + Workers Assets)",
 	path: "templates-experimental/next",

package/templates-experimental/next/templates/open-next.config.ts

@@ -1,28 +1,6 @@
-import cache from "@opennextjs/cloudflare/kvCache";
+import { defineCloudflareConfig } from "@opennextjs/cloudflare";
+import kvIncrementalCache from "@opennextjs/cloudflare/kv-cache";
 
-const config = {
-  default: {
-    override: {
-      wrapper: "cloudflare-node",
-      converter: "edge",
-      incrementalCache: async () => cache,
-      tagCache: "dummy",
-      queue: "dummy",
-    },
-  },
-
-  middleware: {
-    external: true,
-    override: {
-      wrapper: "cloudflare-edge",
-      converter: "edge",
-      proxyExternalRequest: "fetch",
-    },
-  },
-
-  dangerous: {
-    enableCacheInterception: false,
-  },
-};
-
-export default config;
+export default defineCloudflareConfig({
+  incrementalCache: kvIncrementalCache,
+});

package/templates-experimental/next/templates/{wrangler.json → wrangler.jsonc}

@@ -5,7 +5,6 @@
   "compatibility_flags": [
     "nodejs_compat"
   ],
-  "minify": true,
   "assets": {
     "binding": "ASSETS",
     "directory": ".open-next/assets"

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

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-}

package/templates/hono/snippets/appDeclaration.ts

@@ -1 +0,0 @@
-new Hono<{ Bindings: CloudflareBindings }>()

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

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface CloudflareBindings {
-}

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

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-}

package/templates/pre-existing/js/wrangler.json

@@ -1,5 +0,0 @@
-{
-  "name": "<TBD>",
-  "main": "src/index.js",
-  "compatibility_date": "<TBD>"
-}

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

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-}

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

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-}

package/templates/solid/templates/wrangler.json

@@ -1,8 +0,0 @@
-{
-  "name": "<TBD>",
-  "compatibility_date": "<TBD>",
-  "compatibility_flags": [
-    "nodejs_compat"
-  ],
-  "pages_build_output_dir": "./dist"
-}

package/templates-experimental/astro/templates/ts/public/.assetsignore

@@ -1,4 +0,0 @@
-_worker.js
-_routes.json
-_headers
-_redirects

package/templates-experimental/hello-world-durable-object-with-assets/ts/worker-configuration.d.ts

@@ -1,5 +0,0 @@
-// Generated by Wrangler by running `wrangler types`
-
-interface Env {
-	MY_DURABLE_OBJECT: DurableObjectNamespace<import("./src/index").MyDurableObject>;
-}

package/templates-experimental/hello-world-with-assets/c3.ts

@@ -1,22 +0,0 @@
-export default {
-	configVersion: 1,
-	id: "hello-world-with-assets",
-	path: "templates-experimental/hello-world-with-assets",
-	displayName: "Hello World - Worker with Assets",
-	description:
-		"Get started with a basic Worker that also serves static assets, in the language of your choice",
-	platform: "workers",
-	copyFiles: {
-		variants: {
-			js: {
-				path: "./js",
-			},
-			ts: {
-				path: "./ts",
-			},
-			python: {
-				path: "./py",
-			},
-		},
-	},
-};

package/templates-experimental/hello-world-with-assets/ts/worker-configuration.d.ts

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-}

package/templates-experimental/hono/templates/worker-configuration.d.ts

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface CloudflareBindings {
-}

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

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-}

package/templates-experimental/qwik/templates/public/.assetsignore

@@ -1,4 +0,0 @@
-_worker.js
-_routes.json
-_headers
-_redirects

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

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-}

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

@@ -1,4 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-}

package/templates-experimental/svelte/templates/static/.assetsignore

@@ -1,4 +0,0 @@
-_worker.js
-_routes.json
-_headers
-_redirects

package/templates-experimental/vue/templates/wrangler.json

@@ -1,10 +0,0 @@
-{
-  "name": "<TBD>",
-  "compatibility_date": "<TBD>",
-  "assets": {
-    "directory": "./dist"
-  },
-  "observability": {
-    "enabled": true
-  }
-}