Skip to content

Commit

Permalink
refactor: sync with new cloudflare wrapper names
Browse files Browse the repository at this point in the history
  • Loading branch information
vicb committed Nov 25, 2024
1 parent fe29fee commit 82c4caa
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions examples/middleware/open-next.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { OpenNextConfig } from "@opennextjs/aws/types/open-next";
const config: OpenNextConfig = {
default: {
override: {
wrapper: "cloudflare-streaming",
wrapper: "cloudflare-node",
converter: "edge",
// Unused implementation
incrementalCache: "dummy",
Expand All @@ -15,7 +15,7 @@ const config: OpenNextConfig = {
middleware: {
external: true,
override: {
wrapper: "cloudflare",
wrapper: "cloudflare-edge",
converter: "edge",
proxyExternalRequest: "fetch",
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import type { OpenNextConfig } from "open-next/types/open-next";
const config: OpenNextConfig = {
default: {
override: {
wrapper: "cloudflare-streaming",
wrapper: "cloudflare-node",
converter: "edge",
// Unused implementation
incrementalCache: "dummy",
Expand All @@ -56,7 +56,7 @@ const config: OpenNextConfig = {
middleware: {
external: true,
override: {
wrapper: "cloudflare",
wrapper: "cloudflare-edge",
converter: "edge",
proxyExternalRequest: "fetch",
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"vitest": "catalog:"
},
"dependencies": {
"@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@0ac604e",
"@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@2202f36",
"ts-morph": "catalog:"
},
"peerDependencies": {
Expand Down
9 changes: 5 additions & 4 deletions packages/cloudflare/src/cli/build/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,24 +93,25 @@ export async function build(projectOpts: ProjectOptions): Promise<void> {
*/
function ensureCloudflareConfig(config: OpenNextConfig) {
const requirements = {
dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-streaming",
dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-node",
dftUseEdgeConverter: config.default?.override?.converter === "edge",
dftUseDummyCache:
config.default?.override?.incrementalCache === "dummy" &&
config.default?.override?.tagCache === "dummy" &&
config.default?.override?.queue === "dummy",
disableCacheInterception: config.dangerous?.enableCacheInterception !== true,
mwIsMiddlewareExternal: config.middleware?.external == true,
mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare",
mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare-edge",
mwUseEdgeConverter: config.middleware?.override?.converter === "edge",
mwUseFetchProxy: config.middleware?.override?.proxyExternalRequest === "fetch",
};

if (Object.values(requirements).some((satisfied) => !satisfied)) {
throw new Error(`open-next.config.ts should contain:
{
default: {
override: {
wrapper: "cloudflare-streaming",
wrapper: "cloudflare-node",
converter: "edge",
incrementalCache: "dummy",
tagCache: "dummy",
Expand All @@ -121,7 +122,7 @@ function ensureCloudflareConfig(config: OpenNextConfig) {
middleware: {
external: true,
override: {
wrapper: "cloudflare",
wrapper: "cloudflare-edge",
converter: "edge",
proxyExternalRequest: "fetch",
},
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 82c4caa

Please sign in to comment.