refactor: code simplification (#627)

* refactor: code simplification

* GitButler WIP Commit

fixup! biome

* fixup! tests

* fixup: !format

* fixup! (thank you tests)

* fixup! I'll get there

Author: vicb

packages/open-next/package.json

@@ -47,7 +47,7 @@
     "@types/aws-lambda": "^8.10.109",
     "@types/node": "^18.16.1",
     "tsc-alias": "^1.8.8",
-    "typescript": "^4.9.3"
+    "typescript": "^5.6.3"
   },
   "bugs": {
     "url": "https://github.com/opennextjs/opennextjs-aws/issues"

packages/open-next/src/adapters/dynamo-provider.ts

@@ -56,7 +56,7 @@ async function insert(
   const parsedData = data.map((item) => ({
     tag: item.tag.S,
     path: item.path.S,
-    revalidatedAt: parseInt(item.revalidatedAt.N),
+    revalidatedAt: Number.parseInt(item.revalidatedAt.N),
   }));
 
   await tagCache.writeTags(parsedData);

packages/open-next/src/adapters/server-adapter.ts

@@ -28,7 +28,8 @@ export const handler = await createMainHandler();
 //////////////////////
 
 function setNextjsServerWorkingDirectory() {
-  // WORKAROUND: Set `NextServer` working directory (AWS specific) — https://github.com/serverless-stack/open-next#workaround-set-nextserver-working-directory-aws-specific
+  // WORKAROUND: Set `NextServer` working directory (AWS specific)
+  // See https://opennext.js.org/aws/v2/advanced/workaround#workaround-set-nextserver-working-directory-aws-specific
   process.chdir(__dirname);
 }
 

packages/open-next/src/adapters/util.ts

@@ -31,7 +31,7 @@ export function parseNumberFromEnv(
     return envValue;
   }
 
-  const parsedValue = parseInt(envValue);
+  const parsedValue = Number.parseInt(envValue);
 
   return isNaN(parsedValue) ? undefined : parsedValue;
 }

packages/open-next/src/build/createAssets.ts

@@ -14,12 +14,17 @@ export function createStaticAssets(options: buildHelper.BuildOptions) {
   const outputPath = path.join(outputDir, "assets");
   fs.mkdirSync(outputPath, { recursive: true });
 
-  // Next.js outputs assets into multiple files. Copy into the same directory.
-  // Copy over:
-  // - .next/BUILD_ID => _next/BUILD_ID
-  // - .next/static   => _next/static
-  // - public/*       => *
-  // - app/favicon.ico or src/app/favicon.ico  => favicon.ico
+  /**
+   * Next.js outputs assets into multiple files. Copy into the same directory.
+   *
+   * Copy over:
+   * - .next/BUILD_ID => BUILD_ID
+   * - .next/static   => _next/static
+   * - public/*       => *
+   * - app/favicon.ico or src/app/favicon.ico  => favicon.ico
+   *
+   * Note: BUILD_ID is used by the SST infra.
+   */
   fs.copyFileSync(
     path.join(appBuildOutputPath, ".next/BUILD_ID"),
     path.join(outputPath, "BUILD_ID"),

packages/open-next/src/build/createMiddleware.ts

@@ -2,9 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 
 import logger from "../logger.js";
-import {
-  type MiddlewareInfo,
-  type MiddlewareManifest,
+import type {
+  MiddlewareInfo,
+  MiddlewareManifest,
 } from "../types/next-types.js";
 import { buildEdgeBundle } from "./edge/createEdgeBundle.js";
 import * as buildHelper from "./helper.js";

packages/open-next/src/build/createServerBundle.ts

@@ -197,25 +197,18 @@ async function generateBundle(
         ...(disableNextPrebundledReact ? ["requireHooks"] : []),
         ...(disableRouting ? ["trustHostHeader"] : []),
         ...(!isBefore13413 ? ["requestHandlerHost"] : []),
-        ...(!isAfter141 ? ["stableIncrementalCache"] : []),
-        ...(isAfter141 ? ["experimentalIncrementalCacheHandler"] : []),
+        ...(isAfter141
+          ? ["experimentalIncrementalCacheHandler"]
+          : ["stableIncrementalCache"]),
       ],
     }),
 
     openNextResolvePlugin({
       fnName: name,
-      overrides: overrides,
+      overrides,
     }),
   ];
 
-  if (plugins && plugins.length > 0) {
-    logger.debug(
-      `Applying plugins:: [${plugins
-        .map(({ name }) => name)
-        .join(",")}] for Next version: ${options.nextVersion}`,
-    );
-  }
-
   const outfileExt = fnOptions.runtime === "deno" ? "ts" : "mjs";
   await buildHelper.esbuildAsync(
     {
@@ -238,9 +231,12 @@ async function generateBundle(
       },
       plugins,
       alias: {
-        "next/dist/server/next-server.js": isBundled
-          ? "./next-server.runtime.prod.js"
-          : "next/dist/server/next-server.js",
+        ...(isBundled
+          ? {
+              "next/dist/server/next-server.js":
+                "./next-server.runtime.prod.js",
+            }
+          : {}),
       },
     },
     options,

packages/open-next/src/build/edge/createEdgeBundle.ts

@@ -52,7 +52,6 @@ export async function buildEdgeBundle({
   await esbuildAsync(
     {
       entryPoints: [entrypoint],
-      // inject: ,
       bundle: true,
       outfile,
       external: ["node:*", "next", "@aws-sdk/*"],

packages/open-next/src/build/helper.ts

@@ -189,7 +189,7 @@ export function traverseFiles(
   root: string,
   conditionFn: (paths: TraversePath) => boolean,
   callbackFn: (paths: TraversePath) => void,
-  searchingDir: string = "",
+  searchingDir = "",
 ) {
   fs.readdirSync(path.join(root, searchingDir)).forEach((file) => {
     const relativePath = path.join(searchingDir, file);

packages/open-next/src/core/patchAsyncStorage.ts

@@ -3,13 +3,13 @@ const mod = require("module");
 const resolveFilename = mod._resolveFilename;
 
 export function patchAsyncStorage() {
-  mod._resolveFilename = function (
+  mod._resolveFilename = ((
     originalResolveFilename: typeof resolveFilename,
     request: string,
     parent: any,
     isMain: boolean,
     options: any,
-  ) {
+  ) => {
     if (
       request.endsWith("static-generation-async-storage.external") ||
       request.endsWith("static-generation-async-storage.external.js")
@@ -35,5 +35,5 @@ export function patchAsyncStorage() {
       );
 
     // We use `bind` here to avoid referencing outside variables to create potential memory leaks.
-  }.bind(null, resolveFilename);
+  }).bind(null, resolveFilename);
 }