diff --git a/.changeset/fresh-hats-test.md b/.changeset/fresh-hats-test.md new file mode 100644 index 00000000000..7c608ea443e --- /dev/null +++ b/.changeset/fresh-hats-test.md @@ -0,0 +1,5 @@ +--- +"create-cloudflare": patch +--- + +Update the Hello World templates to use the latest version of `@cloudflare/vitest-pool-workers`. diff --git a/packages/create-cloudflare/templates/hello-world-with-assets/js/package.json b/packages/create-cloudflare/templates/hello-world-with-assets/js/package.json index 11573a9e35d..f4584cc8a89 100644 --- a/packages/create-cloudflare/templates/hello-world-with-assets/js/package.json +++ b/packages/create-cloudflare/templates/hello-world-with-assets/js/package.json @@ -9,8 +9,8 @@ "test": "vitest" }, "devDependencies": { - "@cloudflare/vitest-pool-workers": "^0.12.4", + "@cloudflare/vitest-pool-workers": "^0.20.0", "wrangler": "^3.101.0", - "vitest": "~3.2.0" + "vitest": "~4.1.0" } } diff --git a/packages/create-cloudflare/templates/hello-world-with-assets/js/vitest.config.js b/packages/create-cloudflare/templates/hello-world-with-assets/js/vitest.config.js deleted file mode 100644 index 977f64c4edc..00000000000 --- a/packages/create-cloudflare/templates/hello-world-with-assets/js/vitest.config.js +++ /dev/null @@ -1,11 +0,0 @@ -import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config'; - -export default defineWorkersConfig({ - test: { - poolOptions: { - workers: { - wrangler: { configPath: './wrangler.jsonc' }, - }, - }, - }, -}); diff --git a/packages/create-cloudflare/templates/hello-world-with-assets/js/vitest.config.mjs b/packages/create-cloudflare/templates/hello-world-with-assets/js/vitest.config.mjs new file mode 100644 index 00000000000..9b79788eddd --- /dev/null +++ b/packages/create-cloudflare/templates/hello-world-with-assets/js/vitest.config.mjs @@ -0,0 +1,10 @@ +import { cloudflareTest } from "@cloudflare/vitest-pool-workers"; +import { defineConfig } from "vitest/config"; + +export default defineConfig({ + plugins: [ + cloudflareTest({ + wrangler: { configPath: "./wrangler.jsonc" }, + }), + ], +}); diff --git a/packages/create-cloudflare/templates/hello-world-with-assets/ts/package.json b/packages/create-cloudflare/templates/hello-world-with-assets/ts/package.json index 4104fd8ffb4..80d51f75114 100644 --- a/packages/create-cloudflare/templates/hello-world-with-assets/ts/package.json +++ b/packages/create-cloudflare/templates/hello-world-with-assets/ts/package.json @@ -10,9 +10,9 @@ "cf-typegen": "wrangler types" }, "devDependencies": { - "@cloudflare/vitest-pool-workers": "^0.12.4", + "@cloudflare/vitest-pool-workers": "^0.20.0", "typescript": "^5.5.2", - "vitest": "~3.2.0", + "vitest": "~4.1.0", "wrangler": "^3.101.0" } } diff --git a/packages/create-cloudflare/templates/hello-world-with-assets/ts/test/env.d.ts b/packages/create-cloudflare/templates/hello-world-with-assets/ts/test/env.d.ts deleted file mode 100644 index 67b3610dbc7..00000000000 --- a/packages/create-cloudflare/templates/hello-world-with-assets/ts/test/env.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare module "cloudflare:test" { - interface ProvidedEnv extends Env {} -} diff --git a/packages/create-cloudflare/templates/hello-world-with-assets/ts/test/tsconfig.json b/packages/create-cloudflare/templates/hello-world-with-assets/ts/test/tsconfig.json index 978ecd87b7c..c6560d31767 100644 --- a/packages/create-cloudflare/templates/hello-world-with-assets/ts/test/tsconfig.json +++ b/packages/create-cloudflare/templates/hello-world-with-assets/ts/test/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "types": ["@cloudflare/vitest-pool-workers"] + "types": ["@cloudflare/vitest-pool-workers/types"] }, "include": ["./**/*.ts", "../worker-configuration.d.ts"], "exclude": [] diff --git a/packages/create-cloudflare/templates/hello-world-with-assets/ts/vitest.config.mts b/packages/create-cloudflare/templates/hello-world-with-assets/ts/vitest.config.mts index 977f64c4edc..9b79788eddd 100644 --- a/packages/create-cloudflare/templates/hello-world-with-assets/ts/vitest.config.mts +++ b/packages/create-cloudflare/templates/hello-world-with-assets/ts/vitest.config.mts @@ -1,11 +1,10 @@ -import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config'; +import { cloudflareTest } from "@cloudflare/vitest-pool-workers"; +import { defineConfig } from "vitest/config"; -export default defineWorkersConfig({ - test: { - poolOptions: { - workers: { - wrangler: { configPath: './wrangler.jsonc' }, - }, - }, - }, +export default defineConfig({ + plugins: [ + cloudflareTest({ + wrangler: { configPath: "./wrangler.jsonc" }, + }), + ], }); diff --git a/packages/create-cloudflare/templates/hello-world/js/package.json b/packages/create-cloudflare/templates/hello-world/js/package.json index 8459e1a3a85..2be11d7185f 100644 --- a/packages/create-cloudflare/templates/hello-world/js/package.json +++ b/packages/create-cloudflare/templates/hello-world/js/package.json @@ -9,8 +9,8 @@ "test": "vitest" }, "devDependencies": { - "@cloudflare/vitest-pool-workers": "^0.12.4", - "vitest": "~3.2.0", + "@cloudflare/vitest-pool-workers": "^0.20.0", + "vitest": "~4.1.0", "wrangler": "^3.101.0" } } diff --git a/packages/create-cloudflare/templates/hello-world/js/vitest.config.js b/packages/create-cloudflare/templates/hello-world/js/vitest.config.js deleted file mode 100644 index 7ccad75efad..00000000000 --- a/packages/create-cloudflare/templates/hello-world/js/vitest.config.js +++ /dev/null @@ -1,11 +0,0 @@ -import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config"; - -export default defineWorkersConfig({ - test: { - poolOptions: { - workers: { - wrangler: { configPath: "./wrangler.jsonc" }, - }, - }, - }, -}); diff --git a/packages/create-cloudflare/templates/hello-world/js/vitest.config.mjs b/packages/create-cloudflare/templates/hello-world/js/vitest.config.mjs new file mode 100644 index 00000000000..9b79788eddd --- /dev/null +++ b/packages/create-cloudflare/templates/hello-world/js/vitest.config.mjs @@ -0,0 +1,10 @@ +import { cloudflareTest } from "@cloudflare/vitest-pool-workers"; +import { defineConfig } from "vitest/config"; + +export default defineConfig({ + plugins: [ + cloudflareTest({ + wrangler: { configPath: "./wrangler.jsonc" }, + }), + ], +}); diff --git a/packages/create-cloudflare/templates/hello-world/ts/package.json b/packages/create-cloudflare/templates/hello-world/ts/package.json index 4104fd8ffb4..80d51f75114 100644 --- a/packages/create-cloudflare/templates/hello-world/ts/package.json +++ b/packages/create-cloudflare/templates/hello-world/ts/package.json @@ -10,9 +10,9 @@ "cf-typegen": "wrangler types" }, "devDependencies": { - "@cloudflare/vitest-pool-workers": "^0.12.4", + "@cloudflare/vitest-pool-workers": "^0.20.0", "typescript": "^5.5.2", - "vitest": "~3.2.0", + "vitest": "~4.1.0", "wrangler": "^3.101.0" } } diff --git a/packages/create-cloudflare/templates/hello-world/ts/test/env.d.ts b/packages/create-cloudflare/templates/hello-world/ts/test/env.d.ts deleted file mode 100644 index 67b3610dbc7..00000000000 --- a/packages/create-cloudflare/templates/hello-world/ts/test/env.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare module "cloudflare:test" { - interface ProvidedEnv extends Env {} -} diff --git a/packages/create-cloudflare/templates/hello-world/ts/test/tsconfig.json b/packages/create-cloudflare/templates/hello-world/ts/test/tsconfig.json index 978ecd87b7c..c6560d31767 100644 --- a/packages/create-cloudflare/templates/hello-world/ts/test/tsconfig.json +++ b/packages/create-cloudflare/templates/hello-world/ts/test/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "types": ["@cloudflare/vitest-pool-workers"] + "types": ["@cloudflare/vitest-pool-workers/types"] }, "include": ["./**/*.ts", "../worker-configuration.d.ts"], "exclude": [] diff --git a/packages/create-cloudflare/templates/hello-world/ts/vitest.config.mts b/packages/create-cloudflare/templates/hello-world/ts/vitest.config.mts index 7ccad75efad..9b79788eddd 100644 --- a/packages/create-cloudflare/templates/hello-world/ts/vitest.config.mts +++ b/packages/create-cloudflare/templates/hello-world/ts/vitest.config.mts @@ -1,11 +1,10 @@ -import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config"; +import { cloudflareTest } from "@cloudflare/vitest-pool-workers"; +import { defineConfig } from "vitest/config"; -export default defineWorkersConfig({ - test: { - poolOptions: { - workers: { - wrangler: { configPath: "./wrangler.jsonc" }, - }, - }, - }, +export default defineConfig({ + plugins: [ + cloudflareTest({ + wrangler: { configPath: "./wrangler.jsonc" }, + }), + ], });