fix some tests

cloudflare · Oct 25, 2024 · 00d6259 · 00d6259
1 parent e937926
commit 00d6259
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/...-cloudflare/templates-experimental/hello-world-durable-object-with-assets/ts/package.json b/...-cloudflare/templates-experimental/hello-world-durable-object-with-assets/ts/package.json
@@ -9,7 +9,7 @@
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {
-		"typescript": "catalog:default",
+		"typescript": "^5.5.2",
 		"wrangler": "^3.60.3"
 	}
 }
diff --git a/packages/create-cloudflare/templates-experimental/hello-world-with-assets/ts/package.json b/packages/create-cloudflare/templates-experimental/hello-world-with-assets/ts/package.json
@@ -11,7 +11,7 @@
 	},
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "^0.5.2",
-		"typescript": "catalog:default",
+		"typescript": "^5.5.2",
 		"vitest": "2.0.5",
 		"wrangler": "^3.60.3"
 	}

diff --git a/packages/create-cloudflare/templates-experimental/svelte/c3.ts b/packages/create-cloudflare/templates-experimental/svelte/c3.ts
@@ -13,7 +13,7 @@ import type { C3Context, PackageJson } from "types";
 const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name]);
+	await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
 
 	logRaw("");
 };
@@ -97,7 +97,7 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
-	frameworkCli: "create-svelte",
+	frameworkCli: "sv",
 	displayName: "Svelte",
 	platform: "workers",
 	copyFiles: {

diff --git a/packages/create-cloudflare/templates/common/ts/package.json b/packages/create-cloudflare/templates/common/ts/package.json
@@ -10,7 +10,7 @@
 	},
 	"devDependencies": {
 		"itty-router": "^3.0.12",
-		"typescript": "catalog:default",
+		"typescript": "^5.5.2",
 		"wrangler": "^3.60.3"
 	}
 }
diff --git a/packages/create-cloudflare/templates/hello-world-durable-object/ts/package.json b/packages/create-cloudflare/templates/hello-world-durable-object/ts/package.json
@@ -9,7 +9,7 @@
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {
-		"typescript": "catalog:default",
+		"typescript": "^5.5.2",
 		"wrangler": "^3.60.3"
 	}
 }
diff --git a/packages/create-cloudflare/templates/hello-world/ts/package.json b/packages/create-cloudflare/templates/hello-world/ts/package.json
@@ -11,7 +11,7 @@
 	},
 	"devDependencies": {
 		"@cloudflare/vitest-pool-workers": "^0.5.2",
-		"typescript": "catalog:default",
+		"typescript": "^5.5.2",
 		"vitest": "2.0.5",
 		"wrangler": "^3.60.3"
 	}

diff --git a/packages/create-cloudflare/templates/queues/ts/package.json b/packages/create-cloudflare/templates/queues/ts/package.json
@@ -9,7 +9,7 @@
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {
-		"typescript": "catalog:default",
+		"typescript": "^5.5.2",
 		"wrangler": "^3.60.3"
 	}
 }
diff --git a/packages/create-cloudflare/templates/scheduled/ts/package.json b/packages/create-cloudflare/templates/scheduled/ts/package.json
@@ -9,7 +9,7 @@
 		"cf-typegen": "wrangler types"
 	},
 	"devDependencies": {
-		"typescript": "catalog:default",
+		"typescript": "^5.5.2",
 		"wrangler": "^3.60.3"
 	}
 }
diff --git a/packages/create-cloudflare/templates/svelte/c3.ts b/packages/create-cloudflare/templates/svelte/c3.ts
@@ -13,7 +13,7 @@ import type { C3Context, PackageJson } from "types";
 const { npm } = detectPackageManager();
 
 const generate = async (ctx: C3Context) => {
-	await runFrameworkGenerator(ctx, [ctx.project.name]);
+	await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
 
 	logRaw("");
 };
@@ -97,7 +97,7 @@ const updateTypeDefinitions = (ctx: C3Context) => {
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "svelte",
-	frameworkCli: "create-svelte",
+	frameworkCli: "sv",
 	displayName: "Svelte",
 	platform: "pages",
 	copyFiles: {

diff --git a/packages/wrangler/src/__tests__/deploy.test.ts b/packages/wrangler/src/__tests__/deploy.test.ts
@@ -4477,7 +4477,7 @@ addEventListener('fetch', event => {});`
 					"ff5016e92f039aa743a4ff7abb3180fa",
 					{
 						// TODO: this should be "text/plain; charset=utf-8", but msw? is stripping the charset part
-						type: "text/plain; charset=utf-8",
+						type: "text/plain",
 					}
 				)
 			);
@@ -4488,7 +4488,7 @@ addEventListener('fetch', event => {});`
 					["Q29udGVudCBvZiBmaWxlLTI="],
 					"7574a8cd3094a050388ac9663af1c1d6",
 					{
-						type: "text/plain; charset=utf-8",
+						type: "text/plain",
 					}
 				)
 			);
@@ -4499,7 +4499,7 @@ addEventListener('fetch', event => {});`
 					["Q29udGVudCBvZiBmaWxlLTE="],
 					"0de3dd5df907418e9730fd2bd747bd5e",
 					{
-						type: "text/plain; charset=utf-8",
+						type: "text/plain",
 					}
 				)
 			);
@@ -4893,7 +4893,7 @@ addEventListener('fetch', event => {});`
 					["Q29udGVudCBvZiBmaWxlLTE="],
 					"0de3dd5df907418e9730fd2bd747bd5e",
 					{
-						type: "text/plain; charset=utf-8",
+						type: "text/plain",
 					}
 				)
 			);
@@ -4905,7 +4905,7 @@ addEventListener('fetch', event => {});`
 					"7574a8cd3094a050388ac9663af1c1d6",
 					{
 						// TODO: this should be "text/plain; charset=utf-8", but msw? is stripping the charset part
-						type: "text/plain; charset=utf-8",
+						type: "text/plain",
 					}
 				)
 			);
@@ -4916,7 +4916,7 @@ addEventListener('fetch', event => {});`
 					["Q29udGVudCBvZiBmaWxlLTM="],
 					"ff5016e92f039aa743a4ff7abb3180fa",
 					{
-						type: "text/plain; charset=utf-8",
+						type: "text/plain",
 					}
 				)
 			);
@@ -4927,7 +4927,7 @@ addEventListener('fetch', event => {});`
 					["Q29udGVudCBvZiBmaWxlLTU="],
 					"f05e28a3d0bdb90d3cf4bdafe592488f",
 					{
-						type: "text/plain; charset=utf-8",
+						type: "text/plain",
 					}
 				)
 			);