Skip to content

Commit 0203823

Browse files
authored
refactor: code cleanup (#682)
1 parent b5e4a12 commit 0203823

File tree

1 file changed

+16
-33
lines changed

1 file changed

+16
-33
lines changed

packages/open-next/src/build/edge/createEdgeBundle.ts

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@ import { openNextResolvePlugin } from "../../plugins/resolve.js";
2121
import { type BuildOptions, isEdgeRuntime } from "../helper.js";
2222
import { copyOpenNextConfig, esbuildAsync } from "../helper.js";
2323

24+
type Override = OverrideOptions & {
25+
originResolver?: LazyLoadedOverride<OriginResolver> | IncludedOriginResolver;
26+
};
2427
interface BuildEdgeBundleOptions {
2528
middlewareInfo?: MiddlewareInfo;
2629
entrypoint: string;
2730
outfile: string;
2831
options: BuildOptions;
29-
overrides?: OverrideOptions & {
30-
originResolver?:
31-
| LazyLoadedOverride<OriginResolver>
32-
| IncludedOriginResolver;
33-
};
32+
overrides?: Override;
3433
defaultConverter?: IncludedConverter;
3534
additionalInject?: string;
3635
includeCache?: boolean;
@@ -53,6 +52,11 @@ export async function buildEdgeBundle({
5352
name,
5453
}: BuildEdgeBundleOptions) {
5554
const isInCloudfare = await isEdgeRuntime(overrides);
55+
function override<T extends keyof Override>(target: T) {
56+
return typeof overrides?.[target] === "string"
57+
? overrides[target]
58+
: undefined;
59+
}
5660
await esbuildAsync(
5761
{
5862
entryPoints: [entrypoint],
@@ -64,38 +68,17 @@ export async function buildEdgeBundle({
6468
plugins: [
6569
openNextResolvePlugin({
6670
overrides: {
67-
wrapper:
68-
typeof overrides?.wrapper === "string"
69-
? overrides.wrapper
70-
: "aws-lambda",
71-
converter:
72-
typeof overrides?.converter === "string"
73-
? overrides.converter
74-
: defaultConverter,
71+
wrapper: override("wrapper") ?? "aws-lambda",
72+
converter: override("converter") ?? defaultConverter,
7573
...(includeCache
7674
? {
77-
tagCache:
78-
typeof overrides?.tagCache === "string"
79-
? overrides.tagCache
80-
: "dynamodb-lite",
81-
incrementalCache:
82-
typeof overrides?.incrementalCache === "string"
83-
? overrides.incrementalCache
84-
: "s3-lite",
85-
queue:
86-
typeof overrides?.queue === "string"
87-
? overrides.queue
88-
: "sqs-lite",
75+
tagCache: override("tagCache") ?? "dynamodb-lite",
76+
incrementalCache: override("incrementalCache") ?? "s3-lite",
77+
queue: override("queue") ?? "sqs-lite",
8978
}
9079
: {}),
91-
originResolver:
92-
typeof overrides?.originResolver === "string"
93-
? overrides.originResolver
94-
: "pattern-env",
95-
proxyExternalRequest:
96-
typeof overrides?.proxyExternalRequest === "string"
97-
? overrides.proxyExternalRequest
98-
: "node",
80+
originResolver: override("originResolver") ?? "pattern-env",
81+
proxyExternalRequest: override("proxyExternalRequest") ?? "node",
9982
},
10083
fnName: name,
10184
}),

0 commit comments

Comments
 (0)