@opennextjs/cloudflare 0.5.6 → 0.5.8

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

@@ -9,6 +9,7 @@ import { patchWebpackRuntime } from "./patches/ast/webpack-runtime.js";
 import * as patches from "./patches/index.js";
 import { inlineBuildId } from "./patches/plugins/build-id.js";
 import { ContentUpdater } from "./patches/plugins/content-updater.js";
+import { inlineDynamicRequires } from "./patches/plugins/dynamic-requires.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";
@@ -18,7 +19,6 @@ import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations.js";
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.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 */
@@ -72,7 +72,7 @@ export async function bundleServer(buildOpts) {
         conditions: [],
         plugins: [
             shimRequireHook(buildOpts),
-            inlineRequirePage(updater, buildOpts),
+            inlineDynamicRequires(updater, buildOpts),
             setWranglerExternal(),
             fixRequire(updater),
             handleOptionalDependencies(optionalDependencies),

package/dist/cli/build/patches/plugins/dynamic-requires.d.ts

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

package/dist/cli/build/patches/plugins/dynamic-requires.js

@@ -0,0 +1,108 @@
+import { readFile } from "node:fs/promises";
+import { join, posix, sep } 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";
+async function getPagesManifests(serverDir) {
+    try {
+        return Object.values(JSON.parse(await readFile(join(serverDir, "pages-manifest.json"), "utf-8")));
+    }
+    catch {
+        // The file does not exist
+        return [];
+    }
+}
+async function getAppPathsManifests(serverDir) {
+    try {
+        return Object.values(JSON.parse(await readFile(join(serverDir, "app-paths-manifest.json"), "utf-8")));
+    }
+    catch {
+        // The file does not exist
+        return [];
+    }
+}
+function getServerDir(buildOpts) {
+    return join(buildOpts.outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
+}
+function getRequires(idVariable, files, serverDir) {
+    // Inline fs access and dynamic requires that are not supported by workerd.
+    return files
+        .map((file) => `
+    if (${idVariable}.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)}).endsWith(${JSON.stringify(normalizePath(file))})) {
+      return require(${JSON.stringify(join(serverDir, file))});
+    }`)
+        .join("\n");
+}
+export function inlineDynamicRequires(updater, buildOpts) {
+    updater.updateContent("inline-node-module-loader", {
+        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/lib/module-loader/node-module-loader\.js$`, { escape: false }),
+        contentFilter: /class NodeModuleLoader {/,
+    }, async ({ contents }) => patchCode(contents, await getNodeModuleLoaderRule(buildOpts)));
+    updater.updateContent("inline-require-page", {
+        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/require\.js$`, { escape: false }),
+        contentFilter: /function requirePage\(/,
+    }, async ({ contents }) => patchCode(contents, await getRequirePageRule(buildOpts)));
+    return { name: "inline-dynamic-requires", setup() { } };
+}
+async function getNodeModuleLoaderRule(buildOpts) {
+    const serverDir = getServerDir(buildOpts);
+    const manifests = await getPagesManifests(serverDir);
+    const files = manifests.filter((file) => file.endsWith(".js"));
+    return `
+rule:
+  kind: method_definition
+  all:
+    - has:
+        field: name
+        regex: ^load$
+    - has:
+        field: parameters
+        has:
+          kind: required_parameter
+          pattern: $ID
+  inside:
+    stopBy:
+      kind: class_declaration
+    kind: class_declaration
+    has:
+      field: name
+      regex: ^NodeModuleLoader$
+fix: |
+  async load($ID) {
+    ${getRequires("$ID", files, serverDir)}
+  }`;
+}
+async function getRequirePageRule(buildOpts) {
+    const serverDir = getServerDir(buildOpts);
+    const pagesManifests = await getPagesManifests(serverDir);
+    const appPathsManifests = await getAppPathsManifests(serverDir);
+    const manifests = pagesManifests.concat(appPathsManifests);
+    const htmlFiles = manifests.filter((file) => file.endsWith(".html"));
+    const jsFiles = manifests.filter((file) => file.endsWith(".js"));
+    return {
+        rule: {
+            pattern: `
+function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
+  const $_ = getPagePath($$$ARGS);
+  $$$_BODY
+}`,
+        }, // Inline fs access and dynamic require that are not supported by workerd.
+        fix: `
+function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
+  const pagePath = getPagePath($$$ARGS).replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)});
+
+  // html
+  ${(await Promise.all(htmlFiles.map(async (file) => `if (pagePath.endsWith(${JSON.stringify(normalizePath(file))})) {
+    return ${JSON.stringify(await readFile(join(serverDir, file), "utf-8"))};
+  }`))).join("\n")}
+  // js
+    process.env.__NEXT_PRIVATE_RUNTIME_TYPE = $IS_APP_PATH ? 'app' : 'pages';
+  try {
+    ${getRequires("pagePath", jsFiles, serverDir)}
+  } finally {
+    process.env.__NEXT_PRIVATE_RUNTIME_TYPE = '';
+  }
+}`,
+    };
+}

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

@@ -2,7 +2,7 @@
  * Inline `evalManifest` as it relies on `readFileSync` and `runInNewContext`
  * that are not supported by workerd.
  */
-import { join, relative } from "node:path";
+import { join, posix, relative, sep } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { glob } from "glob";
@@ -46,8 +46,7 @@ function evalManifest($PATH, $$$ARGS) {
         },
         fix: `
 function evalManifest($PATH, $$$ARGS) {
-  const { platform } = require('process');
-  $PATH = platform === 'win32' ? $PATH.replaceAll('\\\\', '/') : $PATH;
+  $PATH = $PATH.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)});
   ${returnManifests}
   throw new Error(\`Unexpected evalManifest(\${$PATH}) call!\`);
 }`,

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

@@ -2,7 +2,7 @@
  * Inline `findDir` as it relies on `existsSync` which is not supported by workerd.
  */
 import { existsSync } from "node:fs";
-import { join } from "node:path";
+import { join, posix, sep } 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";
@@ -22,8 +22,7 @@ rule:
   pattern: function findDir($DIR, $NAME) { $$$_ }
 fix: |-
   function findDir($DIR, $NAME) {
-    const { platform } = require('process');
-    $DIR = platform === 'win32' ? $DIR.replaceAll('\\\\', '/') : $DIR;
+    $DIR = $DIR.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)});
     if ($DIR.endsWith(".next/server")) {
       if ($NAME === "app") {
         return ${appExists};

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

@@ -2,7 +2,7 @@
  * 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 { join, posix, relative, sep } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { glob } from "glob";
@@ -33,8 +33,7 @@ function loadManifest($PATH, $$$ARGS) {
         },
         fix: `
 function loadManifest($PATH, $$$ARGS) {
-  const { platform } = require('process');
-  $PATH = platform === 'win32' ? $PATH.replaceAll('\\\\', '/') : $PATH;
+  $PATH = $PATH.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)});
   ${returnManifests}
   throw new Error(\`Unexpected loadManifest(\${$PATH}) call!\`);
 }`,

package/dist/cli/build/utils/create-config-files.js

@@ -28,7 +28,7 @@ export async function createWranglerConfigIfNotExistent(projectOpts) {
             "(to avoid this check use the `--skipWranglerConfigCheck` flag or set a `SKIP_WRANGLER_CONFIG_CHECK` environment variable to `yes`)");
         return;
     }
-    let wranglerConfig = readFileSync(join(getPackageTemplatesDirPath(), "defaults/wrangler.json"), "utf8");
+    let wranglerConfig = readFileSync(join(getPackageTemplatesDirPath(), "wrangler.json"), "utf8");
     const appName = getAppNameFromPackageJson(projectOpts.sourceDir) ?? "app-name";
     if (appName) {
         wranglerConfig = wranglerConfig.replace('"app-name"', JSON.stringify(appName.replaceAll("_", "-")));
@@ -80,6 +80,6 @@ export async function createOpenNextConfigIfNotExistent(projectOpts) {
         if (!answer) {
             throw new Error("The `open-next.config.ts` file is required, aborting!");
         }
-        cpSync(join(getPackageTemplatesDirPath(), "defaults/open-next.config.ts"), openNextConfigPath);
+        cpSync(join(getPackageTemplatesDirPath(), "open-next.config.ts"), openNextConfigPath);
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -42,7 +42,7 @@
   },
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20241230.0",
+    "@cloudflare/workers-types": "^4.20250224.0",
     "@eslint/js": "^9.11.1",
     "@tsconfig/strictest": "^2.0.5",
     "@types/mock-fs": "^4.13.4",
@@ -69,7 +69,7 @@
     "yaml": "^2.7.0"
   },
   "peerDependencies": {
-    "wrangler": "^3.107.3"
+    "wrangler": "^3.111.0"
   },
   "scripts": {
     "clean": "rimraf dist",

package/templates/open-next.config.ts

@@ -0,0 +1,7 @@
+// default open-next.config.ts file created by @opennextjs/cloudflare
+import { defineCloudflareConfig } from "@opennextjs/cloudflare/config";
+import kvIncrementalCache from "@opennextjs/cloudflare/kv-cache";
+
+export default defineCloudflareConfig({
+  incrementalCache: kvIncrementalCache,
+});

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

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

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

@@ -1,70 +0,0 @@
-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 inlineRequirePage(updater, buildOpts) {
-    return updater.updateContent("inline-require-page", {
-        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/require\.js$`, { escape: false }),
-        contentFilter: /function requirePage\(/,
-    }, async ({ contents }) => patchCode(contents, await getRule(buildOpts)));
-}
-async function getRule(buildOpts) {
-    const { outputDir } = buildOpts;
-    const serverDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
-    const pagesManifestFile = join(serverDir, "pages-manifest.json");
-    const appPathsManifestFile = join(serverDir, "app-paths-manifest.json");
-    let pagesManifests = [];
-    try {
-        pagesManifests = Object.values(JSON.parse(await readFile(pagesManifestFile, "utf-8")));
-    }
-    catch {
-        // The file does not exists
-        pagesManifests = [];
-    }
-    let appPathsManifests;
-    try {
-        appPathsManifests = Object.values(JSON.parse(await readFile(appPathsManifestFile, "utf-8")));
-    }
-    catch {
-        // The file does not exists
-        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.
-    const fnBody = `
-// html
-${(await Promise.all(htmlFiles.map(async (file) => `if (pagePath.endsWith("${file}")) {
-        return ${JSON.stringify(await readFile(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 require(${JSON.stringify(join(serverDir, file))});
-      }`)
-        .join("\n")}
-} finally {
-  process.env.__NEXT_PRIVATE_RUNTIME_TYPE = '';
-}
-`;
-    return {
-        rule: {
-            pattern: `
-function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
-  const $_ = getPagePath($$$ARGS);
-  $$$_BODY
-}`,
-        },
-        fix: `
-function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
-  const { platform } = require('process');
-  const pagePath = platform === 'win32' ? getPagePath($$$ARGS).replaceAll('\\\\', '/') : getPagePath($$$ARGS);
-  ${fnBody}
-}`,
-    };
-}

package/templates/defaults/open-next.config.ts

@@ -1,7 +0,0 @@
-// default open-next.config.ts file created by @opennextjs/cloudflare
-import { defineCloudflareConfig } from "@opennextjs/cloudflare/dist/api/config";
-import kvIncrementalCache from "@opennextjs/cloudflare/dist/api/kv-cache";
-
-export default defineCloudflareConfig({
-  incrementalCache: kvIncrementalCache,
-});