diff --git a/examples/api/wrangler.json b/examples/api/wrangler.json new file mode 100644 index 00000000..ed0a8de0 --- /dev/null +++ b/examples/api/wrangler.json @@ -0,0 +1,13 @@ +{ + "main": ".open-next/worker.js", + "name": "api", + "compatibility_date": "2024-12-30", + "compatibility_flags": ["nodejs_compat"], + "assets": { + "directory": ".open-next/assets", + "binding": "ASSETS" + }, + "vars": { + "hello": "Hello World from the cloudflare context!" + } +} diff --git a/examples/api/wrangler.toml b/examples/api/wrangler.toml deleted file mode 100644 index 661e3f97..00000000 --- a/examples/api/wrangler.toml +++ /dev/null @@ -1,10 +0,0 @@ -#:schema node_modules/wrangler/config-schema.json -name = "api" -main = ".open-next/worker.js" -compatibility_date = "2024-09-23" -compatibility_flags = ["nodejs_compat"] - -assets = { directory = ".open-next/assets", binding = "ASSETS" } - -[vars] -hello = 'Hello World from the cloudflare context!' diff --git a/examples/create-next-app/wrangler.json b/examples/create-next-app/wrangler.json new file mode 100644 index 00000000..8ca92cb6 --- /dev/null +++ b/examples/create-next-app/wrangler.json @@ -0,0 +1,10 @@ +{ + "main": ".open-next/worker.js", + "name": "create-next-app", + "compatibility_date": "2024-12-30", + "compatibility_flags": ["nodejs_compat"], + "assets": { + "directory": ".open-next/assets", + "binding": "ASSETS" + } +} diff --git a/examples/create-next-app/wrangler.toml b/examples/create-next-app/wrangler.toml deleted file mode 100644 index b2967de6..00000000 --- a/examples/create-next-app/wrangler.toml +++ /dev/null @@ -1,9 +0,0 @@ -#:schema node_modules/wrangler/config-schema.json -name = "create-next-app" -main = ".open-next/worker.js" - -compatibility_date = "2024-09-23" -compatibility_flags = ["nodejs_compat"] - -# Use the new Workers + Assets to host the static frontend files -assets = { directory = ".open-next/assets", binding = "ASSETS" } diff --git a/examples/middleware/wrangler.json b/examples/middleware/wrangler.json new file mode 100644 index 00000000..a0fb8497 --- /dev/null +++ b/examples/middleware/wrangler.json @@ -0,0 +1,10 @@ +{ + "main": ".open-next/worker.js", + "name": "middleware", + "compatibility_date": "2024-12-30", + "compatibility_flags": ["nodejs_compat"], + "assets": { + "directory": ".open-next/assets", + "binding": "ASSETS" + } +} diff --git a/examples/middleware/wrangler.toml b/examples/middleware/wrangler.toml deleted file mode 100644 index 30f65f51..00000000 --- a/examples/middleware/wrangler.toml +++ /dev/null @@ -1,8 +0,0 @@ -#:schema node_modules/wrangler/config-schema.json -name = "middleware" -main = ".open-next/worker.js" -compatibility_date = "2024-09-23" -compatibility_flags = ["nodejs_compat"] - -# Use the new Workers + Assets to host the static frontend files -assets = { directory = ".open-next/assets", binding = "ASSETS" } diff --git a/examples/vercel-blog-starter/wrangler.json b/examples/vercel-blog-starter/wrangler.json new file mode 100644 index 00000000..24fcaedb --- /dev/null +++ b/examples/vercel-blog-starter/wrangler.json @@ -0,0 +1,10 @@ +{ + "main": ".open-next/worker.js", + "name": "vercel-blog-starter-on-workers", + "compatibility_date": "2024-12-30", + "compatibility_flags": ["nodejs_compat"], + "assets": { + "directory": ".open-next/assets", + "binding": "ASSETS" + } +} diff --git a/examples/vercel-blog-starter/wrangler.toml b/examples/vercel-blog-starter/wrangler.toml deleted file mode 100644 index 38643753..00000000 --- a/examples/vercel-blog-starter/wrangler.toml +++ /dev/null @@ -1,9 +0,0 @@ -#:schema node_modules/wrangler/config-schema.json -name = "vercel-blog-starter-on-workers" -main = ".open-next/worker.js" - -compatibility_date = "2024-09-23" -compatibility_flags = ["nodejs_compat"] - -# Use the new Workers + Assets to host the static frontend files -assets = { directory = ".open-next/assets", binding = "ASSETS" } diff --git a/examples/vercel-commerce/wrangler.json b/examples/vercel-commerce/wrangler.json new file mode 100644 index 00000000..7539894c --- /dev/null +++ b/examples/vercel-commerce/wrangler.json @@ -0,0 +1,10 @@ +{ + "main": ".open-next/worker.js", + "name": "vercel-commerce-on-workers", + "compatibility_date": "2024-12-30", + "compatibility_flags": ["nodejs_compat"], + "assets": { + "directory": ".open-next/assets", + "binding": "ASSETS" + } +} diff --git a/examples/vercel-commerce/wrangler.toml b/examples/vercel-commerce/wrangler.toml deleted file mode 100644 index 6fc49d56..00000000 --- a/examples/vercel-commerce/wrangler.toml +++ /dev/null @@ -1,9 +0,0 @@ -#:schema node_modules/wrangler/config-schema.json -name = "vercel-commerce-on-workers" -main = ".open-next/worker.js" - -compatibility_date = "2024-09-23" -compatibility_flags = ["nodejs_compat"] - -# Use the new Workers + Assets to host the static frontend files -assets = { directory = ".open-next/assets", binding = "ASSETS" } diff --git a/packages/cloudflare/src/cli/build/index.ts b/packages/cloudflare/src/cli/build/index.ts index 6365eac1..81c32056 100644 --- a/packages/cloudflare/src/cli/build/index.ts +++ b/packages/cloudflare/src/cli/build/index.ts @@ -220,29 +220,22 @@ async function createWranglerConfigIfNotExistent(projectOpts: ProjectOptions): P return; } - const wranglerConfigTemplate = readFileSync( - join(getPackageTemplatesDirPath(), "defaults", "wrangler.jsonc"), - "utf8" - ); - let wranglerConfigContent = wranglerConfigTemplate; + let wranglerConfig = readFileSync(join(getPackageTemplatesDirPath(), "defaults", "wrangler.json"), "utf8"); const appName = getAppNameFromPackageJson(projectOpts.sourceDir) ?? "app-name"; if (appName) { - wranglerConfigContent = wranglerConfigContent.replace( - '"app-name"', - JSON.stringify(appName.replaceAll("_", "-")) - ); + wranglerConfig = wranglerConfig.replace('"app-name"', JSON.stringify(appName.replaceAll("_", "-"))); } const compatDate = await getLatestCompatDate(); if (compatDate) { - wranglerConfigContent = wranglerConfigContent.replace( + wranglerConfig = wranglerConfig.replace( /"compatibility_date": "\d{4}-\d{2}-\d{2}"/, `"compatibility_date": ${JSON.stringify(compatDate)}` ); } - writeFileSync(join(projectOpts.sourceDir, "wrangler.json"), wranglerConfigContent); + writeFileSync(join(projectOpts.sourceDir, "wrangler.json"), wranglerConfig); } function getAppNameFromPackageJson(sourceDir: string): string | undefined { diff --git a/packages/cloudflare/templates/defaults/wrangler.jsonc b/packages/cloudflare/templates/defaults/wrangler.json similarity index 100% rename from packages/cloudflare/templates/defaults/wrangler.jsonc rename to packages/cloudflare/templates/defaults/wrangler.json