@opennextjs/cloudflare 0.5.2 → 0.5.3

package/dist/cli/build/bundle-server.js

@@ -8,12 +8,15 @@ import { patchVercelOgLibrary } from "./patches/ast/patch-vercel-og-library.js";
 import { patchWebpackRuntime } from "./patches/ast/webpack-runtime.js";
 import * as patches from "./patches/index.js";
 import { ContentUpdater } from "./patches/plugins/content-updater.js";
+import { inlineEvalManifest } from "./patches/plugins/eval-manifest.js";
 import { patchFetchCacheSetMissingWaitUntil } from "./patches/plugins/fetch-cache-wait-until.js";
+import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchLoadInstrumentation } from "./patches/plugins/load-instrumentation.js";
+import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.js";
-import { inlineRequirePagePlugin } from "./patches/plugins/require-page.js";
+import { inlineRequirePage } 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 */
@@ -67,12 +70,15 @@ export async function bundleServer(buildOpts) {
         conditions: [],
         plugins: [
             shimRequireHook(buildOpts),
-            inlineRequirePagePlugin(updater, buildOpts),
+            inlineRequirePage(updater, buildOpts),
             setWranglerExternal(),
             fixRequire(updater),
             handleOptionalDependencies(optionalDependencies),
             patchLoadInstrumentation(updater),
             patchFetchCacheSetMissingWaitUntil(updater),
+            inlineEvalManifest(updater, buildOpts),
+            inlineFindDir(updater, buildOpts),
+            inlineLoadManifest(updater, buildOpts),
             // Apply updater updaters, must be the last plugin
             updater.plugin,
         ],
@@ -161,9 +167,6 @@ export async function updateWorkerBundledCode(workerOutputFile, buildOpts) {
     const patchedCode = await patchCodeWithValidations(code, [
         ["require", patches.patchRequire],
         ["`buildId` function", (code) => patches.patchBuildId(code, buildOpts)],
-        ["`loadManifest` function", (code) => patches.patchLoadManifest(code, buildOpts)],
-        ["`findDir` function", (code) => patches.patchFindDir(code, buildOpts)],
-        ["`evalManifest` function", (code) => patches.inlineEvalManifest(code, buildOpts)],
         ["cacheHandler", (code) => patches.patchCache(code, buildOpts)],
         [
             "'require(this.middlewareManifestPath)'",

package/dist/cli/build/patches/plugins/eval-manifest.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Inline `evalManifest` as it relies on `readFileSync` and `runInNewContext`
+ * that are not supported by workerd.
+ */
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
+import type { ContentUpdater } from "./content-updater.js";
+export declare function inlineEvalManifest(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;

package/dist/cli/build/patches/plugins/eval-manifest.js

@@ -0,0 +1,53 @@
+/**
+ * Inline `evalManifest` as it relies on `readFileSync` and `runInNewContext`
+ * that are not supported by workerd.
+ */
+import { join, relative } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+import { glob } from "glob";
+import { normalizePath } from "../../utils/normalize-path.js";
+import { patchCode } from "../ast/util.js";
+export function inlineEvalManifest(updater, buildOpts) {
+    return updater.updateContent("inline-eval-manifest", {
+        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/load-manifest\.js$`, { escape: false }),
+        contentFilter: /function evalManifest\(/,
+    }, async ({ contents }) => patchCode(contents, await getRule(buildOpts)));
+}
+async function getRule(buildOpts) {
+    const { outputDir } = buildOpts;
+    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
+    const appDir = join(baseDir, "server/app");
+    const manifests = await glob(join(baseDir, "**/*_client-reference-manifest.js"));
+    const returnManifests = manifests
+        .map((manifest) => {
+        const endsWith = normalizePath(relative(baseDir, manifest));
+        const key = normalizePath("/" + relative(appDir, manifest)).replace("_client-reference-manifest.js", "");
+        return `
+          if ($PATH.endsWith("${endsWith}")) {
+            require(${JSON.stringify(manifest)});
+            return {
+              __RSC_MANIFEST: {
+              "${key}": globalThis.__RSC_MANIFEST["${key}"],
+              },
+            };
+          }
+        `;
+    })
+        .join("\n");
+    return {
+        rule: {
+            pattern: `
+function evalManifest($PATH, $$$ARGS) {
+  $$$_
+}`,
+        },
+        fix: `
+function evalManifest($PATH, $$$ARGS) {
+  const { platform } = require('process');
+  $PATH = platform === 'win32' ? $PATH.replaceAll('\\\\', '/') : $PATH;
+  ${returnManifests}
+  throw new Error(\`Unexpected evalManifest(\${$PATH}) call!\`);
+}`,
+    };
+}

package/dist/cli/build/patches/plugins/find-dir.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Inline `evalManifest` as it relies on `readFileSync` and `runInNewContext`
+ * that are not supported by workerd.
+ */
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
+import type { ContentUpdater } from "./content-updater.js";
+export declare function inlineFindDir(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;

package/dist/cli/build/patches/plugins/find-dir.js

@@ -0,0 +1,39 @@
+/**
+ * Inline `evalManifest` as it relies on `readFileSync` and `runInNewContext`
+ * that are not supported by workerd.
+ */
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+import { patchCode } from "../ast/util.js";
+export function inlineFindDir(updater, buildOpts) {
+    return updater.updateContent("inline-find-dir", {
+        filter: getCrossPlatformPathRegex(String.raw `/next/dist/lib/find-pages-dir\.js$`, { escape: false }),
+        contentFilter: /function findDir\(/,
+    }, async ({ contents }) => patchCode(contents, await getRule(buildOpts)));
+}
+async function getRule(buildOpts) {
+    const { outputDir } = buildOpts;
+    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
+    const appExists = existsSync(join(baseDir, "app"));
+    const pagesExists = existsSync(join(baseDir, "pages"));
+    return `
+rule:
+  pattern: function findDir($DIR, $NAME) { $$$_ }
+fix: |-
+  function findDir($DIR, $NAME) {
+    const { platform } = require('process');
+    $DIR = platform === 'win32' ? $DIR.replaceAll('\\\\', '/') : $DIR;
+    if ($DIR.endsWith(".next/server")) {
+      if ($NAME === "app") {
+        return ${appExists};
+      }
+      if ($NAME === "pages") {
+        return ${pagesExists};
+      }
+    }
+    throw new Error(\`Unexpected findDir(\${$DIR}, \${$NAME}) call!\`);
+  }
+`;
+}

package/dist/cli/build/patches/plugins/load-manifest.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Inline `loadManifest` as it relies on `readFileSync`that is not supported by workerd.
+ */
+import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
+import type { ContentUpdater } from "./content-updater.js";
+export declare function inlineLoadManifest(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;

package/dist/cli/build/patches/plugins/load-manifest.js

@@ -0,0 +1,42 @@
+/**
+ * Inline `loadManifest` as it relies on `readFileSync`that is not supported by workerd.
+ */
+import { readFile } from "node:fs/promises";
+import { join, relative } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+import { glob } from "glob";
+import { normalizePath } from "../../utils/normalize-path.js";
+import { patchCode } from "../ast/util.js";
+export function inlineLoadManifest(updater, buildOpts) {
+    return updater.updateContent("inline-load-manifest", {
+        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/load-manifest\.js$`, { escape: false }),
+        contentFilter: /function loadManifest\(/,
+    }, async ({ contents }) => patchCode(contents, await getRule(buildOpts)));
+}
+async function getRule(buildOpts) {
+    const { outputDir } = buildOpts;
+    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts));
+    const dotNextDir = join(baseDir, ".next");
+    const manifests = await glob(join(dotNextDir, "**/*-manifest.json"));
+    const returnManifests = (await Promise.all(manifests.map(async (manifest) => `
+            if ($PATH.endsWith("${normalizePath("/" + relative(dotNextDir, manifest))}")) {
+              return ${await readFile(manifest, "utf-8")};
+            }
+          `))).join("\n");
+    return {
+        rule: {
+            pattern: `
+function loadManifest($PATH, $$$ARGS) {
+  $$$_
+}`,
+        },
+        fix: `
+function loadManifest($PATH, $$$ARGS) {
+  const { platform } = require('process');
+  $PATH = platform === 'win32' ? $PATH.replaceAll('\\\\', '/') : $PATH;
+  ${returnManifests}
+  throw new Error(\`Unexpected loadManifest(\${$PATH}) call!\`);
+}`,
+    };
+}

package/dist/cli/build/patches/plugins/require-page.d.ts

@@ -1,3 +1,3 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { ContentUpdater } from "./content-updater.js";
-export declare function inlineRequirePagePlugin(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;
+export declare function inlineRequirePage(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;

package/dist/cli/build/patches/plugins/require-page.js

@@ -2,8 +2,9 @@ import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+import { normalizePath } from "../../utils/normalize-path.js";
 import { patchCode } from "../ast/util.js";
-export function inlineRequirePagePlugin(updater, buildOpts) {
+export function inlineRequirePage(updater, buildOpts) {
     return updater.updateContent("inline-require-page", {
         filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/require\.js$`, { escape: false }),
         contentFilter: /function requirePage\(/,
@@ -30,7 +31,7 @@ async function getRule(buildOpts) {
         // The file does not exists
         appPathsManifests = [];
     }
-    const manifests = pagesManifests.concat(appPathsManifests);
+    const manifests = pagesManifests.concat(appPathsManifests).map((path) => normalizePath(path));
     const htmlFiles = manifests.filter((file) => file.endsWith(".html"));
     const jsFiles = manifests.filter((file) => file.endsWith(".js"));
     // Inline fs access and dynamic require that are not supported by workerd.
@@ -61,7 +62,8 @@ function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
         },
         fix: `
 function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
-  const pagePath = getPagePath($$$ARGS);
+  const { platform } = require('process');
+  const pagePath = platform === 'win32' ? getPagePath($$$ARGS).replaceAll('\\\\', '/') : getPagePath($$$ARGS);
   ${fnBody}
 }`,
     };

package/dist/cli/build/patches/to-investigate/index.d.ts

@@ -1,5 +1,3 @@
-export * from "./inline-eval-manifest.js";
 export * from "./inline-middleware-manifest-require.js";
 export * from "./patch-exception-bubbling.js";
-export * from "./patch-find-dir.js";
 export * from "./patch-read-file.js";

package/dist/cli/build/patches/to-investigate/index.js

@@ -1,5 +1,3 @@
-export * from "./inline-eval-manifest.js";
 export * from "./inline-middleware-manifest-require.js";
 export * from "./patch-exception-bubbling.js";
-export * from "./patch-find-dir.js";
 export * from "./patch-read-file.js";

package/dist/cli/build/patches/to-investigate/patch-read-file.d.ts

@@ -1,3 +1,2 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 export declare function patchBuildId(code: string, buildOpts: BuildOptions): string;
-export declare function patchLoadManifest(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/patch-read-file.js

@@ -1,28 +1,7 @@
-import { readFileSync } from "node:fs";
-import { join, relative } from "node:path";
-import { getBuildId, getPackagePath } from "@opennextjs/aws/build/helper.js";
-import { globSync } from "glob";
-import { normalizePath } from "../../utils/index.js";
+import { getBuildId } from "@opennextjs/aws/build/helper.js";
 export function patchBuildId(code, buildOpts) {
     // The Next code gets the buildId from the filesystem so we hardcode the value at build time.
     return code.replace("getBuildId() {", `getBuildId() {
       return ${JSON.stringify(getBuildId(buildOpts))};
     `);
 }
-export function patchLoadManifest(code, buildOpts) {
-    // Inline manifest that Next would otherwise retrieve from the file system.
-    const { outputDir } = buildOpts;
-    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts));
-    const dotNextDir = join(baseDir, ".next");
-    const manifests = globSync(join(dotNextDir, "**/*-manifest.json"));
-    return code.replace(/function loadManifest\((.+?), .+?\) {/, `$&
-    ${manifests
-        .map((manifest) => `
-          if ($1.endsWith("${normalizePath("/" + relative(dotNextDir, manifest))}")) {
-            return ${readFileSync(manifest, "utf-8")};
-          }
-        `)
-        .join("\n")}
-    throw new Error("Unknown loadManifest: " + $1);
-    `);
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"

package/dist/cli/build/patches/to-investigate/inline-eval-manifest.d.ts

@@ -1,9 +0,0 @@
-import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-/**
- * `evalManifest` relies on readFileSync so we need to patch the function so that it instead returns the content of the manifest files
- * which are known at build time
- * (source: https://github.com/vercel/next.js/blob/b1e32c5d1f/packages/next/src/server/load-manifest.ts#L72)
- * Note: we could/should probably just patch readFileSync here or something, but here the issue is that after the readFileSync call
- * there is a vm `runInNewContext` call which we also don't support (source: https://github.com/vercel/next.js/blob/b1e32c5d1f/packages/next/src/server/load-manifest.ts#L88)
- */
-export declare function inlineEvalManifest(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/inline-eval-manifest.js

@@ -1,36 +0,0 @@
-import { join, relative } from "node:path";
-import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-import { globSync } from "glob";
-import { normalizePath } from "../../utils/index.js";
-/**
- * `evalManifest` relies on readFileSync so we need to patch the function so that it instead returns the content of the manifest files
- * which are known at build time
- * (source: https://github.com/vercel/next.js/blob/b1e32c5d1f/packages/next/src/server/load-manifest.ts#L72)
- * Note: we could/should probably just patch readFileSync here or something, but here the issue is that after the readFileSync call
- * there is a vm `runInNewContext` call which we also don't support (source: https://github.com/vercel/next.js/blob/b1e32c5d1f/packages/next/src/server/load-manifest.ts#L88)
- */
-export function inlineEvalManifest(code, buildOpts) {
-    const { outputDir } = buildOpts;
-    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
-    const appDir = join(baseDir, "server/app");
-    const manifests = globSync(join(baseDir, "**/*_client-reference-manifest.js"));
-    return code.replace(/function evalManifest\((.+?), .+?\) {/, `$&
-		${manifests
-        .map((manifest) => {
-        const endsWith = normalizePath(relative(baseDir, manifest));
-        const key = normalizePath("/" + relative(appDir, manifest)).replace("_client-reference-manifest.js", "");
-        return `
-			  if ($1.endsWith("${endsWith}")) {
-          require(${JSON.stringify(manifest)});
-          return {
-            __RSC_MANIFEST: {
-            "${key}": globalThis.__RSC_MANIFEST["${key}"],
-            },
-          };
-			  }
-			`;
-    })
-        .join("\n")}
-		throw new Error("Unknown evalManifest: " + $1);
-		`);
-}

package/dist/cli/build/patches/to-investigate/patch-find-dir.d.ts

@@ -1,5 +0,0 @@
-import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-/**
- * Patches `findDir` so that the next server can detect whether the `app` or `pages` directory exists
- */
-export declare function patchFindDir(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/patch-find-dir.js

@@ -1,21 +0,0 @@
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-/**
- * Patches `findDir` so that the next server can detect whether the `app` or `pages` directory exists
- */
-export function patchFindDir(code, buildOpts) {
-    const { outputDir } = buildOpts;
-    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
-    return code.replace(/function findDir\((?<dir>dir\d*), (?<name>name\d*)\) {/, `function findDir($dir, $name) {
-			if ($dir.endsWith(".next/server")) {
-				if ($name === "app") {
-					return ${existsSync(`${join(baseDir, "app")}`)};
-				}
-				if ($name === "pages") {
-					return ${existsSync(`${join(baseDir, "pages")}`)};
-				}
-		}
-		throw new Error("Unknown findDir call: " + $dir + " " + $name);
-		`);
-}