@opennextjs/aws 3.9.9 → 3.9.11

package/dist/build/createServerBundle.js

@@ -123,7 +123,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
         patches.patchFetchCacheForISR,
         patches.patchUnstableCacheForISR,
         patches.patchNextServer,
-        patches.patchEnvVars,
+        patches.getEnvVarsPatch(options),
         patches.patchBackgroundRevalidation,
         patches.patchUseCacheForISR,
         patches.patchNodeEnvironment,

package/dist/build/helper.d.ts

@@ -15,9 +15,20 @@ export declare function normalizeOptions(config: OpenNextConfig, distDir: string
     openNextVersion: string;
     openNextDistDir: string;
     outputDir: string;
-    packager: "bun" | "npm" | "yarn" | "pnpm";
+    packager: "npm" | "pnpm" | "yarn" | "bun";
     tempBuildDir: string;
 };
+/**
+ * Given the path to a project this function detects the project's repository root (whether the project is in a simple
+ * repository or a monorepo) as well as the package manager being used.
+ *
+ * @param appPath The project's path
+ * @returns An object containing the root of the project's repo/monorepo as well as the package manager that it uses.
+ */
+export declare function findPackagerAndRoot(appPath: string): {
+    root: string;
+    packager: "npm" | "pnpm" | "yarn" | "bun";
+};
 export declare function esbuildSync(esbuildOptions: ESBuildOptions, options: BuildOptions): void;
 export declare function esbuildAsync(esbuildOptions: ESBuildOptions, options: BuildOptions): Promise<void>;
 /**
@@ -83,3 +94,12 @@ export declare function initOutputDir(options: BuildOptions): void;
  */
 export declare function isEdgeRuntime(overrides: DefaultOverrideOptions | undefined): Promise<boolean | undefined>;
 export declare function getPackagePath(options: BuildOptions): string;
+/**
+ * Returns the Next.js runtime used: "webpack" or "turbopack"
+ *
+ * Must be called after building the Next.js app.
+ *
+ * @param options
+ * @returns the Next.js runtime used: "webpack" or "turbopack"
+ */
+export declare function getBundlerRuntime(options: BuildOptions): "webpack" | "turbopack";

package/dist/build/helper.js

@@ -10,7 +10,7 @@ export function normalizeOptions(config, distDir, tempBuildDir) {
     const appPath = path.join(process.cwd(), config.appPath || ".");
     const buildOutputPath = path.join(process.cwd(), config.buildOutputPath || ".");
     const outputDir = path.join(buildOutputPath, ".open-next");
-    const { root: monorepoRoot, packager } = findMonorepoRoot(path.join(process.cwd(), config.appPath || "."));
+    const { root: monorepoRoot, packager } = findPackagerAndRoot(path.join(process.cwd(), config.appPath || "."));
     let appPackageJsonPath;
     if (config.packageJsonPath) {
         const _pkgPath = path.join(process.cwd(), config.packageJsonPath);
@@ -41,7 +41,14 @@ export function normalizeOptions(config, distDir, tempBuildDir) {
         tempBuildDir,
     };
 }
-function findMonorepoRoot(appPath) {
+/**
+ * Given the path to a project this function detects the project's repository root (whether the project is in a simple
+ * repository or a monorepo) as well as the package manager being used.
+ *
+ * @param appPath The project's path
+ * @returns An object containing the root of the project's repo/monorepo as well as the package manager that it uses.
+ */
+export function findPackagerAndRoot(appPath) {
     let currentPath = appPath;
     while (currentPath !== "/") {
         const found = [
@@ -324,3 +331,21 @@ export async function isEdgeRuntime(overrides) {
 export function getPackagePath(options) {
     return path.relative(options.monorepoRoot, options.appBuildOutputPath);
 }
+/**
+ * Returns the Next.js runtime used: "webpack" or "turbopack"
+ *
+ * Must be called after building the Next.js app.
+ *
+ * @param options
+ * @returns the Next.js runtime used: "webpack" or "turbopack"
+ */
+export function getBundlerRuntime(options) {
+    const dotNextPath = path.join(options.appPath, ".next");
+    if (fs.existsSync(path.join(dotNextPath, "server/webpack-runtime.js"))) {
+        return "webpack";
+    }
+    if (fs.existsSync(path.join(dotNextPath, "server/chunks/[turbopack]_runtime.js"))) {
+        return "turbopack";
+    }
+    throw new Error("Unable to determine Next.js runtime (webpack or turbopack)");
+}

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

@@ -1,4 +1,4 @@
-export { envVarRuleCreator, patchEnvVars } from "./patchEnvVar.js";
+export { getEnvVarsPatch } from "./patchEnvVar.js";
 export { patchNextServer } from "./patchNextServer.js";
 export { patchFetchCacheForISR, patchUnstableCacheForISR, patchUseCacheForISR, } from "./patchFetchCacheISR.js";
 export { patchFetchCacheSetMissingWaitUntil } from "./patchFetchCacheWaitUntil.js";

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

@@ -1,4 +1,4 @@
-export { envVarRuleCreator, patchEnvVars } from "./patchEnvVar.js";
+export { getEnvVarsPatch } from "./patchEnvVar.js";
 export { patchNextServer } from "./patchNextServer.js";
 export { patchFetchCacheForISR, patchUnstableCacheForISR, patchUseCacheForISR, } from "./patchFetchCacheISR.js";
 export { patchFetchCacheSetMissingWaitUntil } from "./patchFetchCacheWaitUntil.js";

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

@@ -1,3 +1,4 @@
+import * as buildHelper from "../../helper.js";
 import type { CodePatcher } from "../codePatcher";
 /**
  * Creates a rule to replace `process.env.${envVar}` by `value` in the condition of if statements
@@ -7,4 +8,4 @@ import type { CodePatcher } from "../codePatcher";
  * @returns
  */
 export declare const envVarRuleCreator: (envVar: string, value: string) => string;
-export declare const patchEnvVars: CodePatcher;
+export declare function getEnvVarsPatch(BuildOptions: buildHelper.BuildOptions): CodePatcher;

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

@@ -1,3 +1,4 @@
+import * as buildHelper from "../../helper.js";
 import { createPatchCode } from "../astCodePatcher.js";
 /**
  * Creates a rule to replace `process.env.${envVar}` by `value` in the condition of if statements
@@ -18,29 +19,32 @@ rule:
 fix:
   '${value}'
 `;
-export const patchEnvVars = {
-    name: "patch-env-vars",
-    patches: [
-        // This patch will set the `NEXT_RUNTIME` env var to "node" to avoid loading unnecessary edge deps at runtime
-        {
-            versions: ">=15.0.0",
-            pathFilter: /module\.compiled\.js$/,
-            contentFilter: /process\.env\.NEXT_RUNTIME/,
-            patchCode: createPatchCode(envVarRuleCreator("NEXT_RUNTIME", '"node"')),
-        },
-        // This patch will set `NODE_ENV` to production to avoid loading unnecessary dev deps at runtime
-        {
-            versions: ">=15.0.0",
-            pathFilter: /(module\.compiled|react\/index|react\/jsx-runtime|react-dom\/index)\.js$/,
-            contentFilter: /process\.env\.NODE_ENV/,
-            patchCode: createPatchCode(envVarRuleCreator("NODE_ENV", '"production"')),
-        },
-        // This patch will set `TURBOPACK` env to false to avoid loading turbopack related deps at runtime
-        {
-            versions: ">=15.0.0",
-            pathFilter: /module\.compiled\.js$/,
-            contentFilter: /process\.env\.TURBOPACK/,
-            patchCode: createPatchCode(envVarRuleCreator("TURBOPACK", "false")),
-        },
-    ],
-};
+export function getEnvVarsPatch(BuildOptions) {
+    const isTurbopack = buildHelper.getBundlerRuntime(BuildOptions) === "turbopack";
+    return {
+        name: "patch-env-vars",
+        patches: [
+            // This patch will set the `NEXT_RUNTIME` env var to "node" to avoid loading unnecessary edge deps at runtime
+            {
+                versions: ">=15.0.0",
+                pathFilter: /module\.compiled\.js$/,
+                contentFilter: /process\.env\.NEXT_RUNTIME/,
+                patchCode: createPatchCode(envVarRuleCreator("NEXT_RUNTIME", '"node"')),
+            },
+            // This patch will set `NODE_ENV` to production to avoid loading unnecessary dev deps at runtime
+            {
+                versions: ">=15.0.0",
+                pathFilter: /(module\.compiled|react\/index|react\/jsx-runtime|react-dom\/index)\.js$/,
+                contentFilter: /process\.env\.NODE_ENV/,
+                patchCode: createPatchCode(envVarRuleCreator("NODE_ENV", '"production"')),
+            },
+            // This patch will set `TURBOPACK` env to false to avoid loading turbopack related deps at runtime
+            {
+                versions: ">=15.0.0",
+                pathFilter: /module\.compiled\.js$/,
+                contentFilter: /process\.env\.TURBOPACK/,
+                patchCode: createPatchCode(envVarRuleCreator("TURBOPACK", JSON.stringify(isTurbopack))),
+            },
+        ],
+    };
+}

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

@@ -1,10 +1,12 @@
 import * as buildHelper from "../../helper.js";
 /**
- * Next 16.1+ removes `skipTrailingSlashRedirect` from the config in `required-server-files.json`.
+ * Next 16.1.0-16.1.4 has missing fields in `required-server-files.json`:
+ * - `skipTrailingSlashRedirect`
+ * - `serverExternalPackages`
  *
- * This patch adds it back in by compiling and importing the user's `next.config.js` file.
+ * This patch adds them 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
+ * It is a regression in https://github.com/vercel/next.js/pull/86830 (16.1.0)
+ * Fixed in https://github.com/vercel/next.js/pull/88733 (16.1.4)
  */
 export declare function patchOriginalNextConfig(options: buildHelper.BuildOptions): Promise<void>;

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

@@ -4,15 +4,18 @@ 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`.
+ * Next 16.1.0-16.1.4 has missing fields in `required-server-files.json`:
+ * - `skipTrailingSlashRedirect`
+ * - `serverExternalPackages`
  *
- * This patch adds it back in by compiling and importing the user's `next.config.js` file.
+ * This patch adds them 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
+ * It is a regression in https://github.com/vercel/next.js/pull/86830 (16.1.0)
+ * Fixed in https://github.com/vercel/next.js/pull/88733 (16.1.4)
  */
 export async function patchOriginalNextConfig(options) {
-    if (buildHelper.compareSemver(options.nextVersion, "<", "16.1.0")) {
+    if (buildHelper.compareSemver(options.nextVersion, "<", "16.1.0") ||
+        buildHelper.compareSemver(options.nextVersion, ">=", "16.1.4")) {
         return;
     }
     // The manifests in both `.next` and `.next/standalone` folders
@@ -22,9 +25,10 @@ export async function patchOriginalNextConfig(options) {
     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);
+            const { skipTrailingSlashRedirect, serverExternalPackages } = await importNextConfigFromSource(options);
             manifest.config.skipTrailingSlashRedirect =
                 skipTrailingSlashRedirect ?? false;
+            manifest.config.serverExternalPackages = serverExternalPackages ?? [];
             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");

package/package.json

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