Skip to content

Commit 306ddcf

Browse files
committed
fix bug and fix unit tests
1 parent f483d34 commit 306ddcf

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

packages/@apphosting/adapter-nextjs/src/overrides.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ describe("route overrides", () => {
130130
fs.readFileSync(routesManifestPath, "utf-8"),
131131
) as RoutesManifest;
132132

133-
assert.strictEqual(updatedManifest.headers.length, 1);
133+
assert.strictEqual(updatedManifest.headers.length, 2);
134134

135135
const expectedManifest: RoutesManifest = {
136136
version: 3,

packages/@apphosting/adapter-nextjs/src/overrides.ts

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -186,23 +186,22 @@ export async function addRouteOverrides(
186186
// Add the middleware header to all routes for which middleware is enabled
187187
const middlewareManifest = loadMiddlewareManifest(appPath, distDir);
188188
const rootMiddleware = middlewareManifest.middleware["/"];
189-
if (!rootMiddleware?.matchers) {
190-
console.log("No middleware found for root path, skipping route overrides");
191-
return;
192-
}
193-
194-
rootMiddleware.matchers.forEach((matcher) => {
195-
routeManifest.headers.push({
196-
source: matcher.regexp,
197-
headers: [
198-
{
199-
key: "x-fah-middleware",
200-
value: "true",
201-
},
202-
],
203-
regex: matcher.regexp,
189+
if (rootMiddleware?.matchers) {
190+
console.log("Middleware detected, adding middleware headers to matching routes");
191+
192+
rootMiddleware.matchers.forEach((matcher) => {
193+
routeManifest.headers.push({
194+
source: matcher.regexp,
195+
headers: [
196+
{
197+
key: "x-fah-middleware",
198+
value: "true",
199+
},
200+
],
201+
regex: matcher.regexp,
202+
});
204203
});
205-
});
204+
}
206205

207206
await writeRouteManifest(appPath, distDir, routeManifest);
208207
}

0 commit comments

Comments
 (0)