create-cloudflare 0.0.0-e55f489db → 0.0.0-e5ae13ade

package/templates/queues/ts/tsconfig.json

@@ -13,8 +13,6 @@
 		"module": "es2022",
     /* Specify how TypeScript looks up a file from a given module specifier. */
 		"moduleResolution": "node",
-    /* Specify type package names to be included without being referenced in a source file. */
-		"types": ["@cloudflare/workers-types"],
     /* Enable importing .json files */
 		"resolveJsonModule": true,
 

package/templates/qwik/pages/c3.ts

@@ -146,5 +146,6 @@ const config: TemplateConfig = {
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "installed",
 };
 export default config;

package/templates/qwik/workers/c3.ts

@@ -148,5 +148,6 @@ const config: TemplateConfig = {
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "installed",
 };
 export default config;

package/templates/qwik/workers/templates/wrangler.jsonc

@@ -3,7 +3,8 @@
   "main": "./dist/_worker.js",
   "compatibility_date": "<TBD>",
   "compatibility_flags": [
-    "nodejs_compat"
+    "nodejs_compat",
+    "global_fetch_strictly_public"
   ],
   "assets": {
     "binding": "ASSET",

package/templates/react/pages/c3.ts

@@ -49,11 +49,13 @@ const config: TemplateConfig = {
 	platform: "pages",
 	hidden: true,
 	path: "templates/react/pages",
+	copyFiles: { path: "./templates" },
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
-			deploy: `${npm} run build && wrangler pages deploy ./dist`,
-			preview: `${npm} run build && wrangler pages dev ./dist`,
+			deploy: `${npm} run build && wrangler pages deploy`,
+			preview: `${npm} run build && wrangler pages dev`,
+			"cf-typegen": `wrangler types`,
 		},
 	}),
 	devScript: "dev",

package/templates/react/pages/templates/wrangler.jsonc

@@ -0,0 +1,5 @@
+{
+	"name": "<TBD>",
+	"compatibility_date": "<TBD>",
+	"pages_build_output_dir": "./dist"
+  }

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

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

package/templates/react-router/c3.ts

@@ -19,24 +19,12 @@ const generate = async (ctx: C3Context) => {
 	logRaw(""); // newline
 };
 
-// TODO: Uncomment this once @react-router/dev updates its peer dependency to Wrangler v4
-// const configure = async () => {
-// 	await installPackages(["wrangler@latest"], {
-// 		dev: true,
-// 		startText: "Updating the Wrangler version",
-// 		doneText: `${brandColor(`updated`)} ${dim("wrangler@latest")}`,
-// 	});
-// };
-
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "react-router",
 	platform: "workers",
 	frameworkCli: "create-react-router",
 	displayName: "React Router (formerly Remix)",
-	copyFiles: {
-		path: "./templates",
-	},
 	generate,
 	// configure,
 	transformPackageJson: async () => ({

package/templates/remix/pages/c3.ts

@@ -65,5 +65,6 @@ const config: TemplateConfig = {
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "installed",
 };
 export default config;

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

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

package/templates/remix/workers/c3.ts

@@ -48,5 +48,6 @@ const config: TemplateConfig = {
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
+	workersTypes: "installed",
 };
 export default config;

package/templates/scheduled/ts/tsconfig.json

@@ -13,8 +13,6 @@
 		"module": "es2022",
     /* Specify how TypeScript looks up a file from a given module specifier. */
 		"moduleResolution": "node",
-    /* Specify type package names to be included without being referenced in a source file. */
-		"types": ["@cloudflare/workers-types"],
     /* Enable importing .json files */
 		"resolveJsonModule": true,
 

package/templates/solid/c3.ts

@@ -77,6 +77,7 @@ const config: TemplateConfig = {
 		scripts: {
 			preview: `${npm} run build && npx wrangler pages dev`,
 			deploy: `${npm} run build && wrangler pages deploy`,
+			"cf-typegen": `wrangler types`,
 		},
 	}),
 	compatibilityFlags: ["nodejs_compat"],

package/templates/svelte/pages/c3.ts

@@ -1,5 +1,4 @@
 import { existsSync } from "node:fs";
-import { platform } from "node:os";
 import { logRaw, updateStatus } from "@cloudflare/cli";
 import { blue, brandColor, dim } from "@cloudflare/cli/colors";
 import { runFrameworkGenerator } from "frameworks/index";
@@ -124,6 +123,7 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 	});
 };
 
+const typesPath = "src/worker-configuration.d.ts";
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
@@ -144,10 +144,9 @@ const config: TemplateConfig = {
 		};
 
 		if (usesTypescript(ctx)) {
-			const mv = platform() === "win32" ? "move" : "mv";
 			scripts = {
 				...scripts,
-				"cf-typegen": `wrangler types && ${mv} worker-configuration.d.ts src/`,
+				"cf-typegen": `wrangler types ${typesPath}`,
 			};
 		}
 
@@ -156,5 +155,6 @@ const config: TemplateConfig = {
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
+	typesPath,
 };
 export default config;

package/templates/svelte/workers/c3.ts

@@ -1,4 +1,3 @@
-import { platform } from "node:os";
 import { logRaw, updateStatus } from "@cloudflare/cli";
 import { blue, brandColor, dim } from "@cloudflare/cli/colors";
 import { runFrameworkGenerator } from "frameworks/index";
@@ -94,6 +93,7 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 	});
 };
 
+const typesPath = "./src/worker-configuration.d.ts";
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
@@ -113,10 +113,9 @@ const config: TemplateConfig = {
 		};
 
 		if (usesTypescript(ctx)) {
-			const mv = platform() === "win32" ? "move" : "mv";
 			scripts = {
 				...scripts,
-				"cf-typegen": `wrangler types && ${mv} worker-configuration.d.ts src/`,
+				"cf-typegen": `wrangler types ${typesPath}`,
 			};
 		}
 
@@ -125,5 +124,6 @@ const config: TemplateConfig = {
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",
+	typesPath,
 };
 export default config;

package/templates/vue/pages/c3.ts

@@ -16,12 +16,14 @@ const config: TemplateConfig = {
 	displayName: "Vue",
 	platform: "pages",
 	hidden: true,
-	path: "templates/pages/vue",
+	path: "templates/vue/pages",
+	copyFiles: { path: "./templates" },
 	generate,
 	transformPackageJson: async () => ({
 		scripts: {
-			deploy: `${npm} run build && wrangler pages deploy ./dist`,
-			preview: `${npm} run build && wrangler pages dev ./dist`,
+			deploy: `${npm} run build && wrangler pages deploy`,
+			preview: `${npm} run build && wrangler pages dev`,
+			"cf-typegen": `wrangler types`,
 		},
 	}),
 	devScript: "dev",

package/templates/vue/pages/templates/wrangler.jsonc

@@ -0,0 +1,5 @@
+{
+	"name": "<TBD>",
+	"compatibility_date": "<TBD>",
+	"pages_build_output_dir": "./dist"
+  }

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

@@ -2,7 +2,7 @@
   "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"],
+    "types": [ "./worker-configuration.d.ts","vite/client"],
   },
   "include": ["server"],
 }

package/templates-experimental/solid/c3.ts

@@ -84,9 +84,9 @@ const config: TemplateConfig = {
 		scripts: {
 			preview: `${npm} run build && npx wrangler dev`,
 			deploy: `${npm} run build && wrangler deploy`,
+			"cf-typegen": `wrangler types`,
 		},
 	}),
-	compatibilityFlags: ["nodejs_compat"],
 	devScript: "dev",
 	deployScript: "deploy",
 	previewScript: "preview",

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

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

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

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

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

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

package/templates/hello-world/ts/worker-configuration.d.ts

@@ -1,8 +0,0 @@
-// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 2905fd8e181cd2f4083a615fa51f1913)
-// After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
-declare namespace Cloudflare {
-	// eslint-disable-next-line @typescript-eslint/no-empty-interface,@typescript-eslint/no-empty-object-type
-	interface Env {
-	}
-}
-interface Env extends Cloudflare.Env {}

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

@@ -1,7 +0,0 @@
-// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 4c81d17e8de07f650cddf73ce751ba8d)
-declare namespace Cloudflare {
-	interface Env {
-		MY_DURABLE_OBJECT: DurableObjectNamespace<import("./src/index").MyDurableObject>;
-	}
-}
-interface Env extends Cloudflare.Env {}

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

@@ -1,8 +0,0 @@
-// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 24be54e90498ce3774054fcb8bb2bc1a)
-declare namespace Cloudflare {
-	interface Env {
-		MY_DURABLE_OBJECT: DurableObjectNamespace<import("./src/index").MyDurableObject>;
-		ASSETS: Fetcher;
-	}
-}
-interface Env extends Cloudflare.Env {}

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

@@ -1,7 +0,0 @@
-// Generated by Wrangler by running `wrangler types --include-runtime=false` (hash: 187132f48ddf0f604882ba8213fe386f)
-declare namespace Cloudflare {
-	interface Env {
-		ASSETS: Fetcher;
-	}
-}
-interface Env extends Cloudflare.Env {}

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

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

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

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

package/templates/next/pages/env.d.ts

@@ -1,5 +0,0 @@
-// Generated by Wrangler
-// by running `wrangler types --env-interface CloudflareEnv env.d.ts`
-
-interface CloudflareEnv {
-}

package/templates/next/workers/templates/cloudflare-env.d.ts

@@ -1,5 +0,0 @@
-// Generated by Wrangler
-// by running `wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts`
-
-interface CloudflareEnv {
-}

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

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

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

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

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

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

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

@@ -1,5 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
-interface Env {
-	MY_QUEUE: Queue;
-}

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

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

package/templates/react-router/templates/worker-configuration.d.ts

@@ -1,8 +0,0 @@
-// Generated by Wrangler
-// After adding bindings to `wrangler.jsonc`, regenerate this interface via `npm run cf-typegen`
-declare namespace Cloudflare {
-	interface Env {
-		VALUE_FROM_CLOUDFLARE: "Hello from Cloudflare";
-	}
-}
-interface Env extends Cloudflare.Env {}

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

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

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

@@ -1,6 +0,0 @@
-// 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;
-}