@opennextjs/aws 3.9.8 → 3.9.9

package/dist/build/createServerBundle.js

@@ -127,7 +127,6 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
         patches.patchBackgroundRevalidation,
         patches.patchUseCacheForISR,
         patches.patchNodeEnvironment,
-        patches.patchNextConfig,
         ...additionalCodePatches,
     ]);
     // Build Lambda code

package/dist/build/patch/patches/index.d.ts

@@ -4,4 +4,4 @@ export { patchFetchCacheForISR, patchUnstableCacheForISR, patchUseCacheForISR, }
 export { patchFetchCacheSetMissingWaitUntil } from "./patchFetchCacheWaitUntil.js";
 export { patchBackgroundRevalidation } from "./patchBackgroundRevalidation.js";
 export { patchNodeEnvironment } from "./patchNodeEnvironment.js";
-export { patchNextConfig } from "./patchNextConfig.js";
+export { patchOriginalNextConfig } from "./patchOriginalNextConfig.js";

package/dist/build/patch/patches/index.js

@@ -4,4 +4,4 @@ export { patchFetchCacheForISR, patchUnstableCacheForISR, patchUseCacheForISR, }
 export { patchFetchCacheSetMissingWaitUntil } from "./patchFetchCacheWaitUntil.js";
 export { patchBackgroundRevalidation } from "./patchBackgroundRevalidation.js";
 export { patchNodeEnvironment } from "./patchNodeEnvironment.js";
-export { patchNextConfig } from "./patchNextConfig.js";
+export { patchOriginalNextConfig } from "./patchOriginalNextConfig.js";

package/dist/build/patch/patches/patchOriginalNextConfig.d.ts

@@ -0,0 +1,10 @@
+import * as buildHelper from "../../helper.js";
+/**
+ * Next 16.1+ removes `skipTrailingSlashRedirect` from the config in `required-server-files.json`.
+ *
+ * This patch adds it back in by compiling and importing the user's `next.config.js` file.
+ *
+ * It is a regression in https://github.com/vercel/next.js/pull/86830
+ * TODO(#1082): revisit when Next is fixed
+ */
+export declare function patchOriginalNextConfig(options: buildHelper.BuildOptions): Promise<void>;

package/dist/build/patch/patches/patchOriginalNextConfig.js

@@ -0,0 +1,78 @@
+import fs from "node:fs";
+import path from "node:path";
+import { build } from "esbuild";
+import { inlineRequireResolvePlugin } from "../../../plugins/inline-require-resolve.js";
+import * as buildHelper from "../../helper.js";
+/**
+ * Next 16.1+ removes `skipTrailingSlashRedirect` from the config in `required-server-files.json`.
+ *
+ * This patch adds it back in by compiling and importing the user's `next.config.js` file.
+ *
+ * It is a regression in https://github.com/vercel/next.js/pull/86830
+ * TODO(#1082): revisit when Next is fixed
+ */
+export async function patchOriginalNextConfig(options) {
+    if (buildHelper.compareSemver(options.nextVersion, "<", "16.1.0")) {
+        return;
+    }
+    // The manifests in both `.next` and `.next/standalone` folders
+    // are patched as Open Next uses either of them.
+    const manifestPath = path.join(options.appBuildOutputPath, ".next/required-server-files.json");
+    const manifestStandalonePath = path.join(options.appBuildOutputPath, ".next/standalone", buildHelper.getPackagePath(options), ".next/required-server-files.json");
+    if (fs.existsSync(manifestPath)) {
+        const manifest = JSON.parse(await fs.promises.readFile(manifestPath, "utf-8"));
+        if (manifest.config.skipTrailingSlashRedirect === undefined) {
+            const { skipTrailingSlashRedirect } = await importNextConfigFromSource(options);
+            manifest.config.skipTrailingSlashRedirect =
+                skipTrailingSlashRedirect ?? false;
+            await fs.promises.writeFile(manifestPath, JSON.stringify(manifest, null, 2), "utf-8");
+            if (fs.existsSync(manifestStandalonePath)) {
+                await fs.promises.writeFile(manifestStandalonePath, JSON.stringify(manifest, null, 2), "utf-8");
+            }
+        }
+    }
+    else {
+        throw new Error(`Could not find required-server-files.json at path: ${manifestPath}`);
+    }
+}
+/**
+ * Compile and import the user's `next.config` file
+ *
+ * @returns
+ */
+async function importNextConfigFromSource(buildOptions) {
+    // Find the `next.config file with any supported extension
+    const tsExtensions = [".ts", ".mts", ".cts"];
+    const possibleExtensions = [...tsExtensions, ".mjs", ".js", ".cjs"];
+    let configPath;
+    let configExtension;
+    for (const ext of possibleExtensions) {
+        const testPath = path.join(buildOptions.appPath, `next.config${ext}`);
+        if (fs.existsSync(testPath)) {
+            configPath = testPath;
+            configExtension = ext;
+            break;
+        }
+    }
+    if (!configPath || !configExtension) {
+        throw new Error("Could not find next.config file");
+    }
+    let configToImport;
+    // Only compile if the extension is a TypeScript extension
+    if (tsExtensions.includes(configExtension)) {
+        await build({
+            entryPoints: [configPath],
+            outfile: path.join(buildOptions.tempBuildDir, "next.config.mjs"),
+            bundle: true,
+            format: "esm",
+            platform: "node",
+            plugins: [inlineRequireResolvePlugin],
+        });
+        configToImport = path.join(buildOptions.tempBuildDir, "next.config.mjs");
+    }
+    else {
+        // For .js, .mjs, .cjs, use the file directly
+        configToImport = configPath;
+    }
+    return (await import(configToImport)).default;
+}

package/dist/build.js

@@ -12,6 +12,7 @@ import { createServerBundle } from "./build/createServerBundle.js";
 import { createWarmerBundle } from "./build/createWarmerBundle.js";
 import { generateOutput } from "./build/generateOutput.js";
 import * as buildHelper from "./build/helper.js";
+import { patchOriginalNextConfig } from "./build/patch/patches/index.js";
 import { printHeader, showWarningOnWindows } from "./build/utils.js";
 import logger from "./logger.js";
 export async function build(openNextConfigPath, nodeExternals) {
@@ -33,6 +34,8 @@ export async function build(openNextConfigPath, nodeExternals) {
     buildNextjsApp(options);
     // Generate deployable bundle
     printHeader("Generating bundle");
+    // Patch the original Next.js config
+    await patchOriginalNextConfig(options);
     // Compile cache.ts
     compileCache(options);
     // Compile middleware

package/dist/plugins/inline-require-resolve.d.ts

@@ -0,0 +1,10 @@
+import type { Plugin } from "esbuild";
+/**
+ * Inlines calls to `require.resolve` in JavaScript files.
+ *
+ * esbuild does not statically analyse `require.resolve` calls, and the polyfill
+ * does not include an implementation to handle them. This can be problematic
+ * if you attempt to dynamically import a file built by esbuild that unknowingly
+ * contains `require.resolve` calls, as they will throw an error during import.
+ */
+export declare const inlineRequireResolvePlugin: Plugin;

package/dist/plugins/inline-require-resolve.js

@@ -0,0 +1,27 @@
+import fs from "node:fs";
+import { createRequire } from "node:module";
+/**
+ * Inlines calls to `require.resolve` in JavaScript files.
+ *
+ * esbuild does not statically analyse `require.resolve` calls, and the polyfill
+ * does not include an implementation to handle them. This can be problematic
+ * if you attempt to dynamically import a file built by esbuild that unknowingly
+ * contains `require.resolve` calls, as they will throw an error during import.
+ */
+export const inlineRequireResolvePlugin = {
+    name: "inline-require-resolve",
+    setup: (build) => {
+        build.onLoad({ filter: /\.(js|ts|mjs|cjs)$/ }, async (args) => {
+            const source = await fs.promises.readFile(args.path, "utf-8");
+            const transformed = source.replace(/require\.resolve\((?<quote>['"])((?:\\.|.)*?)\k<quote>\)/g, (_, quote, modulePath) => {
+                try {
+                    return JSON.stringify(createRequire(args.path).resolve(modulePath));
+                }
+                catch {
+                    return `require.resolve(${quote}${modulePath}${quote})`;
+                }
+            });
+            return { contents: transformed, loader: "default" };
+        });
+    },
+};

package/package.json

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

package/dist/build/patch/patches/patchNextConfig.d.ts

@@ -1,2 +0,0 @@
-import type { CodePatcher } from "../codePatcher";
-export declare const patchNextConfig: CodePatcher;

package/dist/build/patch/patches/patchNextConfig.js

@@ -1,54 +0,0 @@
-import fs from "node:fs";
-import path from "node:path";
-import { buildSync } from "esbuild";
-export const patchNextConfig = {
-    name: "patch-next-config",
-    patches: [
-        {
-            pathFilter: /required\-server\-files\.json$/,
-            versions: ">=16.1.0",
-            patchCode: async ({ code, buildOptions }) => {
-                // Find the next.config file with any supported extension
-                const tsExtensions = [".ts", ".mts", ".cts"];
-                const possibleExtensions = [...tsExtensions, ".mjs", ".js", ".cjs"];
-                let configPath;
-                let configExtension;
-                for (const ext of possibleExtensions) {
-                    const testPath = path.join(buildOptions.appPath, `next.config${ext}`);
-                    if (fs.existsSync(testPath)) {
-                        configPath = testPath;
-                        configExtension = ext;
-                        break;
-                    }
-                }
-                if (!configPath || !configExtension) {
-                    throw new Error("Could not find next.config file");
-                }
-                let configToImport;
-                // Only compile if the extension is a TypeScript extension
-                if (tsExtensions.includes(configExtension)) {
-                    buildSync({
-                        entryPoints: [configPath],
-                        outfile: path.join(buildOptions.tempBuildDir, "next.config.mjs"),
-                        bundle: true,
-                        format: "esm",
-                        platform: "node",
-                    });
-                    configToImport = path.join(buildOptions.tempBuildDir, "next.config.mjs");
-                }
-                else {
-                    // For .js, .mjs, .cjs, use the file directly
-                    configToImport = configPath;
-                }
-                // In next 16.1+ we need to add `skipTrailingSlashRedirect` manually because next removes it from the config
-                const originalConfig = (await import(configToImport)).default;
-                const config = JSON.parse(code);
-                if (config.config.skipTrailingSlashRedirect === undefined) {
-                    config.config.skipTrailingSlashRedirect =
-                        originalConfig.skipTrailingSlashRedirect ?? false;
-                }
-                return JSON.stringify(config, null, 2);
-            },
-        },
-    ],
-};