fixup! build

Author: vicb

packages/open-next/src/core/routing/util.ts

@@ -89,12 +89,6 @@ export function constructNextUrl(baseUrl: string, path: string) {
   return url.href;
 }
 
-export function extractHostFromHeaders(
-  headers: Record<string, string>,
-): string {
-  return headers["x-forwarded-host"] ?? headers.host ?? "on";
-}
-
 /**
  *
  * @__PURE__

packages/open-next/src/overrides/converters/aws-apigw-v1.ts

@@ -4,8 +4,7 @@ import type { Converter } from "types/overrides";
 import { fromReadableStream } from "utils/stream";
 
 import { debug } from "../../adapters/logger";
-import { extractHostFromHeaders } from "../../core/routing/util";
-import { removeUndefinedFromQuery } from "./utils";
+import { extractHostFromHeaders, removeUndefinedFromQuery } from "./utils";
 
 function normalizeAPIGatewayProxyEventHeaders(
   event: APIGatewayProxyEvent,

packages/open-next/src/overrides/converters/aws-apigw-v2.ts

@@ -8,11 +8,8 @@ import type { Converter } from "types/overrides";
 import { fromReadableStream } from "utils/stream";
 
 import { debug } from "../../adapters/logger";
-import {
-  convertToQuery,
-  extractHostFromHeaders,
-} from "../../core/routing/util";
-import { removeUndefinedFromQuery } from "./utils";
+import { convertToQuery } from "../../core/routing/util";
+import { extractHostFromHeaders, removeUndefinedFromQuery } from "./utils";
 
 // Not sure which one is really needed as this is not documented anywhere but server actions redirect are not working without this,
 // it causes a 500 error from cloudfront itself with a 'x-amzErrortype: InternalFailure' header

packages/open-next/src/overrides/converters/aws-cloudfront.ts

@@ -17,11 +17,8 @@ import type { Converter } from "types/overrides";
 import { fromReadableStream } from "utils/stream";
 
 import { debug } from "../../adapters/logger";
-import {
-  convertToQuery,
-  convertToQueryString,
-  extractHostFromHeaders,
-} from "../../core/routing/util";
+import { convertToQuery, convertToQueryString } from "../../core/routing/util";
+import { extractHostFromHeaders } from "./utils";
 
 const cloudfrontBlacklistedHeaders = [
   // Disallowed headers, see: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/edge-function-restrictions-all.html#function-restrictions-disallowed-headers

packages/open-next/src/overrides/converters/node.ts

@@ -3,7 +3,7 @@ import type { IncomingMessage } from "node:http";
 import { parseCookies } from "http/util";
 import type { InternalResult } from "types/open-next";
 import type { Converter } from "types/overrides";
-import { extractHostFromHeaders } from "../../core/routing/util";
+import { extractHostFromHeaders } from "./utils";
 
 const converter: Converter = {
   convertFrom: async (req: IncomingMessage) => {

packages/open-next/src/overrides/converters/utils.ts

@@ -9,3 +9,15 @@ export function removeUndefinedFromQuery(
   }
   return newQuery;
 }
+
+/**
+ * Extract the host from the headers (default to "on")
+ *
+ * @param headers
+ * @returns The host
+ */
+export function extractHostFromHeaders(
+  headers: Record<string, string>,
+): string {
+  return headers["x-forwarded-host"] ?? headers.host ?? "on";
+}