@opennextjs/aws 3.7.0 → 3.7.1

package/dist/adapters/middleware.js

@@ -7,14 +7,16 @@ import routingHandler, { INTERNAL_EVENT_REQUEST_ID, INTERNAL_HEADER_INITIAL_URL,
 globalThis.internalFetch = fetch;
 globalThis.__openNextAls = new AsyncLocalStorage();
 const defaultHandler = async (internalEvent, options) => {
-    const config = globalThis.openNextConfig.middleware;
-    const originResolver = await resolveOriginResolver(config?.originResolver);
-    const externalRequestProxy = await resolveProxyRequest(config?.override?.proxyExternalRequest);
-    const assetResolver = await resolveAssetResolver(config?.assetResolver);
+    // We know that the middleware is external when this adapter is used
+    const middlewareConfig = globalThis.openNextConfig
+        .middleware;
+    const originResolver = await resolveOriginResolver(middlewareConfig?.originResolver);
+    const externalRequestProxy = await resolveProxyRequest(middlewareConfig?.override?.proxyExternalRequest);
+    const assetResolver = await resolveAssetResolver(middlewareConfig?.assetResolver);
     //#override includeCacheInMiddleware
-    globalThis.tagCache = await resolveTagCache(config?.override?.tagCache);
-    globalThis.queue = await resolveQueue(config?.override?.queue);
-    globalThis.incrementalCache = await resolveIncrementalCache(config?.override?.incrementalCache);
+    globalThis.tagCache = await resolveTagCache(middlewareConfig?.override?.tagCache);
+    globalThis.queue = await resolveQueue(middlewareConfig?.override?.queue);
+    globalThis.incrementalCache = await resolveIncrementalCache(middlewareConfig?.override?.incrementalCache);
     //#endOverride
     const requestId = Math.random().toString(36);
     // We run everything in the async local storage context so that it is available in the external middleware

package/dist/build/createServerBundle.js

@@ -139,6 +139,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
     const isAfter141 = buildHelper.compareSemver(options.nextVersion, ">=", "14.1");
     const isAfter142 = buildHelper.compareSemver(options.nextVersion, ">=", "14.2");
     const isAfter152 = buildHelper.compareSemver(options.nextVersion, ">=", "15.2.0");
+    const isAfter154 = buildHelper.compareSemver(options.nextVersion, ">=", "15.4.0");
     const disableRouting = isBefore13413 || config.middleware?.external;
     const updater = new ContentUpdater(options);
     const additionalPlugins = codeCustomization?.additionalPlugins
@@ -153,6 +154,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
                 ...(disableRouting ? ["withRouting"] : []),
                 ...(isAfter142 ? ["patchAsyncStorage"] : []),
                 ...(isAfter141 ? ["appendPrefetch"] : []),
+                ...(isAfter154 ? [] : ["setInitialURL"]),
             ],
         }),
         openNextReplacementPlugin({

package/dist/build/generateOutput.js

@@ -61,11 +61,13 @@ export async function generateOutput(options) {
     const edgeFunctions = {};
     const isExternalMiddleware = config.middleware?.external ?? false;
     if (isExternalMiddleware) {
+        const middlewareConfig = options.config
+            .middleware;
         edgeFunctions.middleware = {
             bundle: ".open-next/middleware",
             handler: "handler.handler",
-            pathResolver: await extractOverrideName("pattern-env", config.middleware.originResolver),
-            ...(await extractOverrideFn(config.middleware?.override)),
+            pathResolver: await extractOverrideName("pattern-env", middlewareConfig.originResolver),
+            ...(await extractOverrideFn(middlewareConfig.override)),
         };
     }
     // Add edge functions

package/dist/build/validateConfig.js

@@ -72,7 +72,9 @@ export function validateConfig(config) {
        It is safe to disable if you only use page router`);
     }
     validateFunctionOptions(config.imageOptimization ?? {});
-    validateFunctionOptions(config.middleware ?? {});
+    if (config.middleware?.external === true) {
+        validateFunctionOptions(config.middleware ?? {});
+    }
     //@ts-expect-error - Revalidate custom wrapper type is different
     validateFunctionOptions(config.revalidate ?? {});
     //@ts-expect-error - Warmer custom wrapper type is different

package/dist/core/createGenericHandler.js

@@ -4,8 +4,10 @@ export async function createGenericHandler(handler) {
     // @ts-expect-error `./open-next.config.mjs` exists only in the build output
     const config = await import("./open-next.config.mjs").then((m) => m.default);
     globalThis.openNextConfig = config;
-    const override = config[handler.type]
-        ?.override;
+    const handlerConfig = config[handler.type];
+    const override = handlerConfig && "override" in handlerConfig
+        ? handlerConfig.override
+        : undefined;
     // From the config, we create the converter
     const converter = await resolveConverter(override?.converter);
     // Then we create the handler

package/dist/core/requestHandler.js

@@ -4,7 +4,7 @@ import { runWithOpenNextRequestContext } from "../utils/promise";
 import { NextConfig } from "../adapters/config/index";
 import { debug, error } from "../adapters/logger";
 import { patchAsyncStorage } from "./patchAsyncStorage";
-import { constructNextUrl, convertRes, convertToQuery, createServerResponse, } from "./routing/util";
+import { constructNextUrl, convertRes, convertToQuery, convertToQueryString, createServerResponse, } from "./routing/util";
 import routingHandler, { INTERNAL_EVENT_REQUEST_ID, INTERNAL_HEADER_INITIAL_URL, INTERNAL_HEADER_RESOLVED_ROUTES, MIDDLEWARE_HEADER_PREFIX, MIDDLEWARE_HEADER_PREFIX_LEN, } from "./routingHandler";
 import { requestHandler, setNextjsPrebundledReact } from "./util";
 // This is used to identify requests in the cache
@@ -167,7 +167,10 @@ async function processRequest(req, res, routingResult) {
     // Here we try to apply as much request metadata as possible
     // We apply every metadata from `resolve-routes` https://github.com/vercel/next.js/blob/916f105b97211de50f8580f0b39c9e7c60de4886/packages/next/src/server/lib/router-utils/resolve-routes.ts
     // and `router-server` https://github.com/vercel/next.js/blob/916f105b97211de50f8580f0b39c9e7c60de4886/packages/next/src/server/lib/router-server.ts
-    const initialURL = new URL(routingResult.initialURL);
+    const initialURL = new URL(
+    // We always assume that only the routing layer can set this header.
+    routingResult.internalEvent.headers[INTERNAL_HEADER_INITIAL_URL] ??
+        routingResult.initialURL);
     let invokeStatus;
     if (routingResult.internalEvent.rawPath === "/500") {
         invokeStatus = 500;
@@ -194,6 +197,13 @@ async function processRequest(req, res, routingResult) {
         setNextjsPrebundledReact(routingResult.internalEvent.rawPath);
         //#endOverride
         // Next Server
+        // TODO: only enable this on Next 15.4+
+        // We need to set the pathname to the data request path
+        //#override setInitialURL
+        req.url =
+            initialURL.pathname +
+                convertToQueryString(routingResult.internalEvent.query);
+        //#endOverride
         await requestHandler(requestMetadata)(req, res);
     }
     catch (e) {

package/dist/core/resolve.d.ts

@@ -1,4 +1,4 @@
-import type { BaseEventOrResult, DefaultOverrideOptions, InternalEvent, InternalResult, OpenNextConfig, OverrideOptions } from "../types/open-next";
+import type { BaseEventOrResult, DefaultOverrideOptions, ExternalMiddlewareConfig, InternalEvent, InternalResult, OpenNextConfig, OverrideOptions } from "../types/open-next";
 import type { Converter, TagCache, Wrapper } from "../types/overrides";
 type RemoveUndefined<T> = T extends undefined ? never : T;
 export declare function resolveConverter<E extends BaseEventOrResult = InternalEvent, R extends BaseEventOrResult = InternalResult>(converter: DefaultOverrideOptions<E, R>["converter"]): Promise<Converter<E, R>>;
@@ -34,7 +34,7 @@ export declare function resolveImageLoader(imageLoader: RemoveUndefined<OpenNext
  * @returns
  * @__PURE__
  */
-export declare function resolveOriginResolver(originResolver: RemoveUndefined<OpenNextConfig["middleware"]>["originResolver"]): Promise<import("../types/overrides").OriginResolver>;
+export declare function resolveOriginResolver(originResolver: RemoveUndefined<ExternalMiddlewareConfig>["originResolver"]): Promise<import("../types/overrides").OriginResolver>;
 /**
  * @returns
  * @__PURE__

package/dist/types/open-next.d.ts

@@ -244,43 +244,56 @@ export interface SplittedFunctionOptions extends FunctionOptions {
      */
     patterns: string[];
 }
+/**
+ * MiddlewareConfig that applies to both external and internal middlewares
+ *
+ * Note: this type is internal and included in both `ExternalMiddlewareConfig` and `InternalMiddlewareConfig`
+ */
+type CommonMiddlewareConfig = {
+    /**
+     * The assetResolver is used to resolve assets in the routing layer.
+     *
+     * @default "dummy"
+     */
+    assetResolver?: IncludedAssetResolver | LazyLoadedOverride<AssetResolver>;
+};
+/** MiddlewareConfig that applies to external middlewares only */
+export type ExternalMiddlewareConfig = DefaultFunctionOptions & CommonMiddlewareConfig & {
+    external: true;
+    /**
+     * The runtime used by next for the middleware.
+     * @default "edge"
+     */
+    runtime?: "node" | "edge";
+    /**
+     * The override options for the middleware.
+     * By default the lite override are used (.i.e. s3-lite, dynamodb-lite, sqs-lite)
+     * @default undefined
+     */
+    override?: OverrideOptions;
+    /**
+     * Origin resolver is used to resolve the origin for internal rewrite.
+     * By default, it uses the pattern-env origin resolver.
+     * Pattern env uses pattern set in split function options and an env variable OPEN_NEXT_ORIGIN
+     * OPEN_NEXT_ORIGIN should be a json stringified object with the key of the splitted function as key and the origin as value
+     * @default "pattern-env"
+     */
+    originResolver?: IncludedOriginResolver | LazyLoadedOverride<OriginResolver>;
+};
+/** MiddlewareConfig that applies to internal middlewares only */
+export type InternalMiddlewareConfig = {
+    external: false;
+} & CommonMiddlewareConfig;
 export interface OpenNextConfig {
     default: FunctionOptions;
     functions?: Record<string, SplittedFunctionOptions>;
     /**
      * Override the default middleware
-     * If you set this options, the middleware need to be deployed separately.
+     * When `external` is true, the middleware need to be deployed separately.
      * It supports both edge and node runtime.
-     * @default undefined
+     * @default undefined - Which is equivalent to `external: false`
      */
-    middleware?: DefaultFunctionOptions & {
-        external: true;
-        /**
-         * The runtime used by next for the middleware.
-         * @default "edge"
-         */
-        runtime?: "node" | "edge";
-        /**
-         * The override options for the middleware.
-         * By default the lite override are used (.i.e. s3-lite, dynamodb-lite, sqs-lite)
-         * @default undefined
-         */
-        override?: OverrideOptions;
-        /**
-         * Origin resolver is used to resolve the origin for internal rewrite.
-         * By default, it uses the pattern-env origin resolver.
-         * Pattern env uses pattern set in split function options and an env variable OPEN_NEXT_ORIGIN
-         * OPEN_NEXT_ORIGIN should be a json stringified object with the key of the splitted function as key and the origin as value
-         * @default "pattern-env"
-         */
-        originResolver?: IncludedOriginResolver | LazyLoadedOverride<OriginResolver>;
-        /**
-         * The assetResolver is used to resolve assets in the routing layer.
-         *
-         * @default "dummy"
-         */
-        assetResolver?: IncludedAssetResolver | LazyLoadedOverride<AssetResolver>;
-    };
+    middleware?: ExternalMiddlewareConfig | InternalMiddlewareConfig;
     /**
      * Override the default warmer
      * By default, works for lambda only.
@@ -362,3 +375,4 @@ export interface OpenNextConfig {
      */
     edgeExternals?: string[];
 }
+export {};

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "bin": {
     "open-next": "./dist/index.js"
   },