fixup! external with absolute paths

Author: vicb

packages/cloudflare/src/cli/build/bundle-server.ts

@@ -10,7 +10,8 @@ import { build, Plugin } from "esbuild";
 
 import { patchOptionalDependencies } from "./patches/ast/optional-deps.js";
 import * as patches from "./patches/index.js";
-import InlineRequirePagePlugin from "./patches/plugins/require-page.js";
+import inlineRequirePagePlugin from "./patches/plugins/require-page.js";
+import setWranglerExternal from "./patches/plugins/wrangler-external.js";
 import { normalizePath, patchCodeWithValidations } from "./utils/index.js";
 
 /** The dist directory of the Cloudflare adapter package */
@@ -49,16 +50,17 @@ export async function bundleServer(buildOpts: BuildOptions): Promise<void> {
     format: "esm",
     target: "esnext",
     minify: false,
-    plugins: [createFixRequiresESBuildPlugin(buildOpts), InlineRequirePagePlugin(buildOpts)],
+    plugins: [
+      createFixRequiresESBuildPlugin(buildOpts),
+      inlineRequirePagePlugin(buildOpts),
+      setWranglerExternal(),
+    ],
     external: [
       "./middleware/handler.mjs",
       // Next optional dependencies.
       "caniuse-lite",
       "jimp",
       "probe-image-size",
-      // Dependencies handled by wrangler.
-      "*.bin",
-      "*.wasm?module",
     ],
     alias: {
       // Note: we apply an empty shim to next/dist/compiled/ws because it generates two `eval`s:

packages/cloudflare/src/cli/build/patches/plugins/require-page.ts

@@ -3,21 +3,27 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 
 import { type BuildOptions, getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import type { PluginBuild } from "esbuild";
 
 import { patchCode, type RuleConfig } from "../ast/util.js";
 
-export default function InlineRequirePagePlugin(buildOpts: BuildOptions) {
+export default function inlineRequirePagePlugin(buildOpts: BuildOptions) {
   return {
     name: "inline-require-page",
 
     setup: async (build: PluginBuild) => {
-      build.onLoad({ filter: /\/next\/dist\/server\/require\.js$/ }, async ({ path }) => {
-        const jsCode = await readFile(path, "utf8");
-        if (/function requirePage\(/.test(jsCode)) {
-          return { contents: patchCode(jsCode, getRule(buildOpts)) };
+      build.onLoad(
+        {
+          filter: getCrossPlatformPathRegex(String.raw`/next/dist/server/require\.js$`, { escape: false }),
+        },
+        async ({ path }) => {
+          const jsCode = await readFile(path, "utf8");
+          if (/function requirePage\(/.test(jsCode)) {
+            return { contents: patchCode(jsCode, getRule(buildOpts)) };
+          }
         }
-      });
+      );
     },
   };
 }
@@ -42,24 +48,24 @@ function getRule(buildOpts: BuildOptions) {
   const jsFiles = manifests.filter((file) => file.endsWith(".js"));
 
   const fnBody = `
-  // html
-  ${htmlFiles
+// html
+${htmlFiles
+  .map(
+    (file) => `if (pagePath.endsWith("${file}")) {
+        return ${JSON.stringify(readFileSync(join(serverDir, file), "utf-8"))};
+      }`
+  )
+  .join("\n")}
+// js
+process.env.__NEXT_PRIVATE_RUNTIME_TYPE = isAppPath ? 'app' : 'pages';
+try {
+  ${jsFiles
     .map(
       (file) => `if (pagePath.endsWith("${file}")) {
-          return ${JSON.stringify(readFileSync(join(serverDir, file), "utf-8"))};
-        }`
+        return require(${JSON.stringify(join(serverDir, file))});
+      }`
     )
     .join("\n")}
-  // js
-  process.env.__NEXT_PRIVATE_RUNTIME_TYPE = isAppPath ? 'app' : 'pages';
-  try {
-    ${jsFiles
-      .map(
-        (file) => `if (pagePath.endsWith("${file}")) {
-          return require(${JSON.stringify(join(serverDir, file))});
-        }`
-      )
-      .join("\n")}
 } finally {
   process.env.__NEXT_PRIVATE_RUNTIME_TYPE = '';
 }
@@ -70,7 +76,7 @@ function getRule(buildOpts: BuildOptions) {
       pattern: `
 function requirePage($PAGE, $DIST_DIR, $IS_APPP_ATH) {
   const $_ = getPagePath($$$ARGS);
-  $$$
+  $$$_BODY
 }`,
     },
     fix: `

packages/cloudflare/src/cli/build/patches/plugins/wrangler-external.ts

@@ -0,0 +1,33 @@
+/**
+ * Makes files handled by wrangler external.
+ *
+ * Paths need to be absolute so that their are valid in the output bundle.
+ */
+
+import { dirname, resolve } from "node:path";
+
+import type { PluginBuild } from "esbuild";
+
+export default function setWranglerExternal() {
+  return {
+    name: "wrangler-externals",
+
+    setup: async (build: PluginBuild) => {
+      const namespace = "wrangler-externals-plugin";
+
+      build.onResolve({ filter: /(\.bin|\.wasm\?module)$/ }, ({ path, importer }) => {
+        return {
+          path: resolve(dirname(importer), path),
+          namespace,
+          external: true,
+        };
+      });
+
+      build.onLoad({ filter: /.*/, namespace }, async ({ path }) => {
+        return {
+          contents: `export * from '${path}';`,
+        };
+      });
+    },
+  };
+}