Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions packages/open-next/src/build/createMiddleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export async function createMiddleware(
includeCache: config.dangerous?.enableCacheInterception,
additionalExternals: config.edgeExternals,
onlyBuildOnce: forceOnlyBuildOnce === true,
name: "middleware",
});

installDependencies(outputPath, config.middleware?.install);
Expand All @@ -76,6 +77,7 @@ export async function createMiddleware(
middlewareInfo,
options,
onlyBuildOnce: true,
name: "middleware",
});
}
}
4 changes: 4 additions & 0 deletions packages/open-next/src/build/edge/createEdgeBundle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ interface BuildEdgeBundleOptions {
includeCache?: boolean;
additionalExternals?: string[];
onlyBuildOnce?: boolean;
name: string;
}

export async function buildEdgeBundle({
Expand All @@ -42,6 +43,7 @@ export async function buildEdgeBundle({
includeCache,
additionalExternals,
onlyBuildOnce,
name,
}: BuildEdgeBundleOptions) {
const isInCloudfare =
typeof overrides?.wrapper === "string"
Expand Down Expand Up @@ -84,6 +86,7 @@ export async function buildEdgeBundle({
}
: {}),
},
fnName: name,
}),
openNextReplacementPlugin({
name: "externalMiddlewareOverrides",
Expand Down Expand Up @@ -222,5 +225,6 @@ export async function generateEdgeBundle(
options,
overrides: fnOptions.override,
additionalExternals: options.config.edgeExternals,
name,
});
}
3 changes: 3 additions & 0 deletions packages/open-next/src/plugins/edge.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { readFileSync } from "node:fs";
import path from "node:path";

import chalk from "chalk";
import type { Plugin } from "esbuild";
import type { MiddlewareInfo } from "types/next-types.js";

Expand All @@ -14,6 +15,7 @@ import {
loadPrerenderManifest,
loadRoutesManifest,
} from "../adapters/config/util.js";
import logger from "../logger.js";

export interface IPluginSettings {
nextDir: string;
Expand Down Expand Up @@ -51,6 +53,7 @@ export function openNextEdgePlugins({
return {
name: "opennext-edge",
setup(build) {
logger.debug(chalk.blue("OpenNext Edge plugin"));
if (edgeFunctionHandlerPath) {
// If we bundle the routing, we need to resolve the middleware
build.onResolve({ filter: /\.\/middleware.mjs/g }, () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/open-next/src/plugins/replacement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function openNextReplacementPlugin({
`\/\/#override (${id})\n([\\s\\S]*?)\/\/#endOverride`,
);
logger.debug(
chalk.blue(`Open-next replacement plugin ${name}`),
chalk.blue(`OpenNext Replacement plugin ${name}`),
` -- Deleting override for ${id}`,
);
contents = contents.replace(pattern, "");
Expand Down
6 changes: 5 additions & 1 deletion packages/open-next/src/plugins/resolve.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { readFileSync } from "node:fs";

import chalk from "chalk";
import type { Plugin } from "esbuild";
import type {
DefaultOverrideOptions,
Expand Down Expand Up @@ -75,7 +76,10 @@ export function openNextResolvePlugin({
return {
name: "opennext-resolve",
setup(build) {
logger.debug(`OpenNext Resolve plugin for ${fnName}`);
logger.debug(
chalk.blue("OpenNext Resolve plugin"),
fnName ? `for ${fnName}` : "",
);
build.onLoad({ filter: /core(\/|\\)resolve\.js/g }, async (args) => {
let contents = readFileSync(args.path, "utf-8");
const overridesEntries = Object.entries(overrides ?? {});
Expand Down