diff --git a/.changeset/tender-geckos-dig.md b/.changeset/tender-geckos-dig.md new file mode 100644 index 0000000000..29dbef9b4d --- /dev/null +++ b/.changeset/tender-geckos-dig.md @@ -0,0 +1,5 @@ +--- +"create-cloudflare": patch +--- + +Update the Next on Workers template to use `@opennextjs/cloudflare` 1.0.0-beta releases diff --git a/packages/create-cloudflare/e2e-tests/frameworks.test.ts b/packages/create-cloudflare/e2e-tests/frameworks.test.ts index 2bc2eeeac2..8bcd2ce24d 100644 --- a/packages/create-cloudflare/e2e-tests/frameworks.test.ts +++ b/packages/create-cloudflare/e2e-tests/frameworks.test.ts @@ -316,9 +316,9 @@ const verifyPreviewScript = async ( "run", previewScript, ...(pm === "npm" ? ["--"] : []), + ...(verifyPreview.previewArgs ?? []), "--port", `${TEST_PORT}`, - ...(verifyPreview.previewArgs ?? []), ], { cwd: projectPath, diff --git a/packages/create-cloudflare/e2e-tests/frameworks/framework-test-config.ts b/packages/create-cloudflare/e2e-tests/frameworks/framework-test-config.ts index 9706fd3079..1bedc667d5 100644 --- a/packages/create-cloudflare/e2e-tests/frameworks/framework-test-config.ts +++ b/packages/create-cloudflare/e2e-tests/frameworks/framework-test-config.ts @@ -415,6 +415,7 @@ export default function getFrameworkTestConfig(pm: string) { envInterfaceName: "CloudflareEnv", }, verifyPreview: { + previewArgs: ["--"], route: "/test", expectedText: "Create Next App", }, @@ -425,7 +426,6 @@ export default function getFrameworkTestConfig(pm: string) { // see https://github.com/cloudflare/next-on-pages/blob/main/packages/next-on-pages/docs/supported.md#operating-systems unsupportedOSs: ["win32"], unsupportedPms: [ - "pnpm", // bun and yarn are failing in CI "bun", "yarn", diff --git a/packages/create-cloudflare/templates/next/workers/c3.ts b/packages/create-cloudflare/templates/next/workers/c3.ts index 5909141938..1994aa663e 100644 --- a/packages/create-cloudflare/templates/next/workers/c3.ts +++ b/packages/create-cloudflare/templates/next/workers/c3.ts @@ -12,7 +12,7 @@ const generate = async (ctx: C3Context) => { const configure = async (ctx: C3Context) => { const packages = [ - "@opennextjs/cloudflare@0.5.x", + "@opennextjs/cloudflare@~1.0.0-beta.0 || ^1.0.0", "@cloudflare/workers-types", ]; await installPackages(packages, { @@ -51,7 +51,7 @@ export default { configVersion: 1, id: "next", frameworkCli: "create-next-app", - frameworkCliPinnedVersion: "~15.2.2", + frameworkCliPinnedVersion: "~15.2.4", platform: "workers", displayName: "Next.js (using Node.js compat + Workers Assets)", path: "templates/next/workers", @@ -62,8 +62,8 @@ export default { configure, transformPackageJson: async () => ({ scripts: { - deploy: `opennextjs-cloudflare && wrangler deploy`, - preview: `opennextjs-cloudflare && wrangler dev`, + deploy: `opennextjs-cloudflare build && opennextjs-cloudflare deploy`, + preview: `opennextjs-cloudflare build && opennextjs-cloudflare preview`, "cf-typegen": `wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts`, }, }), diff --git a/packages/create-cloudflare/templates/next/workers/templates/open-next.config.ts b/packages/create-cloudflare/templates/next/workers/templates/open-next.config.ts index 1b5ed9ceab..7d4722e515 100644 --- a/packages/create-cloudflare/templates/next/workers/templates/open-next.config.ts +++ b/packages/create-cloudflare/templates/next/workers/templates/open-next.config.ts @@ -1,6 +1,6 @@ import { defineCloudflareConfig } from "@opennextjs/cloudflare"; -import kvIncrementalCache from "@opennextjs/cloudflare/kv-cache"; +import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache"; export default defineCloudflareConfig({ - incrementalCache: kvIncrementalCache, + incrementalCache: r2IncrementalCache, }); diff --git a/packages/create-cloudflare/templates/next/workers/templates/wrangler.jsonc b/packages/create-cloudflare/templates/next/workers/templates/wrangler.jsonc index 34dabd094a..aeedd2147b 100644 --- a/packages/create-cloudflare/templates/next/workers/templates/wrangler.jsonc +++ b/packages/create-cloudflare/templates/next/workers/templates/wrangler.jsonc @@ -1,7 +1,7 @@ { "name": "", "main": ".open-next/worker.js", - "compatibility_date": "2024-09-26", + "compatibility_date": "2025-03-01", "compatibility_flags": [ "nodejs_compat" ],