Skip to content

Updated default templates inline with create-cloudflare #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Updated default templates inline with create-cloudflare #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/cloudflare/src/cli/build/utils/create-config-files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export async function createWranglerConfigIfNotExistent(projectOpts: ProjectOpti
return;
}

let wranglerConfig = readFileSync(join(getPackageTemplatesDirPath(), "defaults/wrangler.json"), "utf8");
let wranglerConfig = readFileSync(join(getPackageTemplatesDirPath(), "defaults/wrangler.jsonc"), "utf8");

const appName = getAppNameFromPackageJson(projectOpts.sourceDir) ?? "app-name";
if (appName) {
Expand All @@ -56,7 +56,7 @@ export async function createWranglerConfigIfNotExistent(projectOpts: ProjectOpti
);
}

writeFileSync(join(projectOpts.sourceDir, "wrangler.json"), wranglerConfig);
writeFileSync(join(projectOpts.sourceDir, "wrangler.jsonc"), wranglerConfig);
}

function getAppNameFromPackageJson(sourceDir: string): string | undefined {
Expand Down
32 changes: 27 additions & 5 deletions packages/cloudflare/templates/defaults/open-next.config.ts
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

defineCloudflareConfig is what we want.

We should update c3 to use that.

Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@
// default open-next.config.ts file created by @opennextjs/cloudflare
import { defineCloudflareConfig } from "@opennextjs/cloudflare/dist/api/config";
import kvIncrementalCache from "@opennextjs/cloudflare/dist/api/kv-cache";
import cache from "@opennextjs/cloudflare/kvCache";

export default defineCloudflareConfig({
incrementalCache: kvIncrementalCache,
});
const config = {
default: {
override: {
wrapper: "cloudflare-node",
converter: "edge",
incrementalCache: async () => cache,
tagCache: "dummy",
queue: "dummy",
},
},

middleware: {
external: true,
override: {
wrapper: "cloudflare-edge",
converter: "edge",
proxyExternalRequest: "fetch",
},
},

dangerous: {
enableCacheInterception: false,
},
};

export default config;
19 changes: 0 additions & 19 deletions packages/cloudflare/templates/defaults/wrangler.json
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions packages/cloudflare/templates/defaults/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"$schema": "node_modules/wrangler/config-schema.json",
"name": "app-name",
"main": ".open-next/worker.js",
"compatibility_date": "2024-12-30",
"compatibility_flags": ["nodejs_compat"],
"minify": true,
"assets": {
"binding": "ASSETS",
"directory": ".open-next/assets"
}
}