refactor: fixes

Author: vicb

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

@@ -1,4 +1,4 @@
-import { createRequire as topLevelCreateRequire } from "node:module";
+import { createRequire } from "node:module";
 
 import { build } from "esbuild";
 import path from "path";
@@ -43,7 +43,7 @@ const externals = [
 ];
 
 export async function bundleNextServer(outputDir: string, appPath: string) {
-  const require = topLevelCreateRequire(`${appPath}/package.json`);
+  const require = createRequire(`${appPath}/package.json`);
   const entrypoint = require.resolve("next/dist/esm/server/next-server.js");
 
   await build({

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

@@ -222,7 +222,13 @@ export async function createCacheAssets(options: buildHelper.BuildOptions) {
       await buildHelper.esbuildAsync(
         {
           external: ["@aws-sdk/client-dynamodb"],
-          entryPoints: [path.join(__dirname, "adapters", "dynamo-provider.js")],
+          entryPoints: [
+            path.join(
+              options.openNextDistDir,
+              "adapters",
+              "dynamo-provider.js",
+            ),
+          ],
           outfile: path.join(providerPath, "index.mjs"),
           target: ["node18"],
           plugins: [

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

@@ -1,12 +1,15 @@
 import cp from "node:child_process";
 import fs from "node:fs";
+import { createRequire } from "node:module";
 import path from "node:path";
 
 import logger from "../logger.js";
 import { openNextReplacementPlugin } from "../plugins/replacement.js";
 import { openNextResolvePlugin } from "../plugins/resolve.js";
 import * as buildHelper from "./helper.js";
 
+const require = createRequire(import.meta.url);
+
 export async function createImageOptimizationBundle(
   options: buildHelper.BuildOptions,
 ) {
@@ -39,14 +42,8 @@ export async function createImageOptimizationBundle(
         target:
           /plugins(\/|\\)image-optimization(\/|\\)image-optimization\.js/g,
         replacements: [
-          options.resolve(
-            path.join(
-              options.openNextDistDir,
-              "adapters",
-              "plugins",
-              "image-optimization",
-              "image-optimization.replacement.js",
-            ),
+          require.resolve(
+            "../adapters/plugins/image-optimization/image-optimization.replacement.js",
           ),
         ],
       }),

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

@@ -1,7 +1,6 @@
 import fs from "node:fs";
-import { createRequire as topLevelCreateRequire } from "node:module";
+import { createRequire } from "node:module";
 import path from "node:path";
-import url from "node:url";
 
 import {
   FunctionOptions,
@@ -19,8 +18,7 @@ import { copyTracedFiles } from "./copyTracedFiles.js";
 import { generateEdgeBundle } from "./edge/createEdgeBundle.js";
 import * as buildHelper from "./helper.js";
 
-const require = topLevelCreateRequire(import.meta.url);
-const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
+const require = createRequire(import.meta.url);
 
 export async function createServerBundle(options: buildHelper.BuildOptions) {
   const { config } = options;
@@ -238,7 +236,9 @@ async function generateBundle(
   const outfileExt = fnOptions.runtime === "deno" ? "ts" : "mjs";
   await buildHelper.esbuildAsync(
     {
-      entryPoints: [path.join(__dirname, "../adapters", "server-adapter.js")],
+      entryPoints: [
+        path.join(options.openNextDistDir, "adapters", "server-adapter.js"),
+      ],
       external: ["next", "./middleware.mjs", "./next-server.runtime.prod.js"],
       outfile: path.join(outputPath, packagePath, `index.${outfileExt}`),
       banner: {

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

@@ -1,5 +1,4 @@
 import { mkdirSync } from "node:fs";
-import url from "node:url";
 
 import { build } from "esbuild";
 import fs from "fs";
@@ -19,8 +18,6 @@ import { openNextReplacementPlugin } from "../../plugins/replacement.js";
 import { openNextResolvePlugin } from "../../plugins/resolve.js";
 import { BuildOptions, copyOpenNextConfig, esbuildAsync } from "../helper.js";
 
-const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
-
 interface BuildEdgeBundleOptions {
   appBuildOutputPath: string;
   middlewareInfo: MiddlewareInfo;
@@ -99,8 +96,8 @@ export async function buildEdgeBundle({
           middlewareInfo,
           nextDir: path.join(appBuildOutputPath, ".next"),
           edgeFunctionHandlerPath: path.join(
-            __dirname,
-            "../../core",
+            options.openNextDistDir,
+            "core",
             "edgeFunctionHandler.js",
           ),
           isInCloudfare,
@@ -222,7 +219,11 @@ export async function generateEdgeBundle(
   await buildEdgeBundle({
     appBuildOutputPath,
     middlewareInfo: fn,
-    entrypoint: path.join(__dirname, "../../adapters", "edge-adapter.js"),
+    entrypoint: path.join(
+      options.openNextDistDir,
+      "adapters",
+      "edge-adapter.js",
+    ),
     outfile: path.join(outputPath, "index.mjs"),
     options,
     overrides: fnOptions.override,

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

@@ -55,7 +55,6 @@ export function normalizeOptions(
     monorepoRoot,
     nextVersion: getNextVersion(appPath),
     openNextVersion: getOpenNextVersion(),
-    resolve: createRequire(buildScriptPath).resolve,
     openNextDistDir: url.fileURLToPath(new URL(".", buildScriptPath)),
     outputDir,
     packager,