@opennextjs/cloudflare 0.5.10 → 0.5.11

package/dist/cli/build/patches/ast/webpack-runtime.d.ts

@@ -7,6 +7,7 @@
  *
  *  This patch unrolls the dynamic require for all the existing chunks:
  *
+ *  For multiple chunks:
  *     switch (chunkId) {
  *       case ID1: installChunk(require("./chunks/ID1"); break;
  *       case ID2: installChunk(require("./chunks/ID2"); break;
@@ -14,10 +15,15 @@
  *       case SELF_ID: installedChunks[chunkId] = 1; break;
  *       default: throw new Error(`Unknown chunk ${chunkId}`);
  *     }
+ *
+ * For a single chunk:
+ *     require("./chunks/CHUNK_ID.js");
  */
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-export declare function buildInlineChunksRule(chunks: number[]): string;
+export declare function buildMultipleChunksRule(chunks: number[]): string;
+export declare const singleChunkRule = "\nrule:\n  pattern: ($CHUNK_ID, $_PROMISES) => { $$$ }\n  inside: {pattern: $_.$_.require = $$$_, stopBy: end}\n  all:\n    - has: {pattern: $INSTALL(require(\"./chunks/\" + $$$)), stopBy: end}\n    - has: {pattern: $SELF_ID == $CHUNK_ID, stopBy: end}\n    - has: {pattern: \"$INSTALLED_CHUNK[$CHUNK_ID] = 1\", stopBy: end}\nfix: |\n  ($CHUNK_ID, _) => {\n    if (!$INSTALLED_CHUNK[$CHUNK_ID]) {\n      try {\n        $INSTALL(require(\"./chunks/$SELF_ID.js\"));\n      } catch {}\n    }\n  }\n";
 /**
- * Fixes the webpack-runtime.js file by removing its webpack dynamic requires.
+ * Fixes the webpack-runtime.js and webpack-api-runtime.js files by inlining
+ * the webpack dynamic requires.
  */
 export declare function patchWebpackRuntime(buildOpts: BuildOptions): Promise<void>;

package/dist/cli/build/patches/ast/webpack-runtime.js

@@ -7,6 +7,7 @@
  *
  *  This patch unrolls the dynamic require for all the existing chunks:
  *
+ *  For multiple chunks:
  *     switch (chunkId) {
  *       case ID1: installChunk(require("./chunks/ID1"); break;
  *       case ID2: installChunk(require("./chunks/ID2"); break;
@@ -14,12 +15,16 @@
  *       case SELF_ID: installedChunks[chunkId] = 1; break;
  *       default: throw new Error(`Unknown chunk ${chunkId}`);
  *     }
+ *
+ * For a single chunk:
+ *     require("./chunks/CHUNK_ID.js");
  */
-import { readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { patchCode } from "./util.js";
-export function buildInlineChunksRule(chunks) {
+// Inline the code when there are multiple chunks
+export function buildMultipleChunksRule(chunks) {
     return `
 rule:
   pattern: ($CHUNK_ID, $_PROMISES) => { $$$ }
@@ -39,19 +44,53 @@ ${chunks.map((chunk) => `         case ${chunk}: $INSTALL(require("./chunks/${ch
     }
   }`;
 }
+// Inline the code when there is a single chunk.
+// For example when there is a single Pages API route.
+// Note: The chunk does not always exist which explain the need for the try...catch.
+export const singleChunkRule = `
+rule:
+  pattern: ($CHUNK_ID, $_PROMISES) => { $$$ }
+  inside: {pattern: $_.$_.require = $$$_, stopBy: end}
+  all:
+    - has: {pattern: $INSTALL(require("./chunks/" + $$$)), stopBy: end}
+    - has: {pattern: $SELF_ID == $CHUNK_ID, stopBy: end}
+    - has: {pattern: "$INSTALLED_CHUNK[$CHUNK_ID] = 1", stopBy: end}
+fix: |
+  ($CHUNK_ID, _) => {
+    if (!$INSTALLED_CHUNK[$CHUNK_ID]) {
+      try {
+        $INSTALL(require("./chunks/$SELF_ID.js"));
+      } catch {}
+    }
+  }
+`;
 /**
- * Fixes the webpack-runtime.js file by removing its webpack dynamic requires.
+ * Fixes the webpack-runtime.js and webpack-api-runtime.js files by inlining
+ * the webpack dynamic requires.
  */
 export async function patchWebpackRuntime(buildOpts) {
     const { outputDir } = buildOpts;
     const dotNextServerDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
-    const runtimeFile = join(dotNextServerDir, "webpack-runtime.js");
-    const runtimeCode = readFileSync(runtimeFile, "utf-8");
     // Look for all the chunks.
     const chunks = readdirSync(join(dotNextServerDir, "chunks"))
         .filter((chunk) => /^\d+\.js$/.test(chunk))
         .map((chunk) => {
         return Number(chunk.replace(/\.js$/, ""));
     });
-    writeFileSync(runtimeFile, patchCode(runtimeCode, buildInlineChunksRule(chunks)));
+    patchFile(join(dotNextServerDir, "webpack-runtime.js"), chunks);
+    patchFile(join(dotNextServerDir, "webpack-api-runtime.js"), chunks);
+}
+/**
+ * Inline chunks when the file exists.
+ *
+ * @param filename Path to the webpack runtime.
+ * @param chunks List of chunks in the chunks folder.
+ */
+function patchFile(filename, chunks) {
+    if (existsSync(filename)) {
+        let code = readFileSync(filename, "utf-8");
+        code = patchCode(code, buildMultipleChunksRule(chunks));
+        code = patchCode(code, singleChunkRule);
+        writeFileSync(filename, code);
+    }
 }

package/dist/cli/build/patches/ast/webpack-runtime.spec.js

@@ -1,57 +1,102 @@
 import { describe, expect, test } from "vitest";
 import { patchCode } from "./util.js";
-import { buildInlineChunksRule } from "./webpack-runtime.js";
+import { buildMultipleChunksRule, singleChunkRule } from "./webpack-runtime.js";
 describe("webpack runtime", () => {
-    test("patch runtime", () => {
-        const code = `
-        /******/ 		// require() chunk loading for javascript
-        /******/ 		__webpack_require__.f.require = (chunkId, promises) => {
-        /******/ 			// "1" is the signal for "already loaded"
-        /******/ 			if (!installedChunks[chunkId]) {
-        /******/ 				if (658 != chunkId) {
-        /******/ 					installChunk(require("./chunks/" + __webpack_require__.u(chunkId)));
-                    /******/
-                } else installedChunks[chunkId] = 1;
-                /******/
+    describe("multiple chunks", () => {
+        test("patch runtime", () => {
+            const code = `
+          /******/ 		// require() chunk loading for javascript
+          /******/ 		__webpack_require__.f.require = (chunkId, promises) => {
+          /******/ 			// "1" is the signal for "already loaded"
+          /******/ 			if (!installedChunks[chunkId]) {
+          /******/ 				if (658 != chunkId) {
+          /******/ 					installChunk(require("./chunks/" + __webpack_require__.u(chunkId)));
+                      /******/
+                  } else installedChunks[chunkId] = 1;
+                  /******/
+              }
+              /******/
+          };
+      `;
+            expect(patchCode(code, buildMultipleChunksRule([1, 2, 3]))).toMatchInlineSnapshot(`
+        "/******/ 		// require() chunk loading for javascript
+                  /******/ 		__webpack_require__.f.require = (chunkId, _) => {
+          if (!installedChunks[chunkId]) {
+            switch (chunkId) {
+               case 1: installChunk(require("./chunks/1.js")); break;
+               case 2: installChunk(require("./chunks/2.js")); break;
+               case 3: installChunk(require("./chunks/3.js")); break;
+               case 658: installedChunks[chunkId] = 1; break;
+               default: throw new Error(\`Unknown chunk \${chunkId}\`);
             }
-            /******/
-        };
-    `;
-        expect(patchCode(code, buildInlineChunksRule([1, 2, 3]))).toMatchInlineSnapshot(`
-      "/******/ 		// require() chunk loading for javascript
-              /******/ 		__webpack_require__.f.require = (chunkId, _) => {
-        if (!installedChunks[chunkId]) {
-          switch (chunkId) {
-             case 1: installChunk(require("./chunks/1.js")); break;
-             case 2: installChunk(require("./chunks/2.js")); break;
-             case 3: installChunk(require("./chunks/3.js")); break;
-             case 658: installedChunks[chunkId] = 1; break;
-             default: throw new Error(\`Unknown chunk \${chunkId}\`);
           }
         }
-      }
-      ;
-          "
-    `);
+        ;
+              "
+      `);
+        });
+        test("patch minified runtime", () => {
+            const code = `
+      t.f.require=(o,n)=>{e[o]||(658!=o?r(require("./chunks/"+t.u(o))):e[o]=1)}
+      `;
+            expect(patchCode(code, buildMultipleChunksRule([1, 2, 3]))).toMatchInlineSnapshot(`
+        "t.f.require=(o, _) => {
+          if (!e[o]) {
+            switch (o) {
+               case 1: r(require("./chunks/1.js")); break;
+               case 2: r(require("./chunks/2.js")); break;
+               case 3: r(require("./chunks/3.js")); break;
+               case 658: e[o] = 1; break;
+               default: throw new Error(\`Unknown chunk \${o}\`);
+            }
+          }
+        }
+
+              "
+      `);
+        });
     });
-    test("patch minified runtime", () => {
-        const code = `
-    t.f.require=(o,n)=>{e[o]||(658!=o?r(require("./chunks/"+t.u(o))):e[o]=1)}
-    `;
-        expect(patchCode(code, buildInlineChunksRule([1, 2, 3]))).toMatchInlineSnapshot(`
-      "t.f.require=(o, _) => {
-        if (!e[o]) {
-          switch (o) {
-             case 1: r(require("./chunks/1.js")); break;
-             case 2: r(require("./chunks/2.js")); break;
-             case 3: r(require("./chunks/3.js")); break;
-             case 658: e[o] = 1; break;
-             default: throw new Error(\`Unknown chunk \${o}\`);
+    describe("single chunk", () => {
+        test("patch runtime", () => {
+            const code = `
+/******/ 		// require() chunk loading for javascript
+/******/ 		__webpack_require__.f.require = (chunkId, promises) => {
+/******/ 			// "1" is the signal for "already loaded"
+/******/ 			if(!installedChunks[chunkId]) {
+/******/ 				if(710 == chunkId) {
+/******/ 					installChunk(require("./chunks/" + __webpack_require__.u(chunkId)));
+/******/ 				} else installedChunks[chunkId] = 1;
+/******/ 			}
+/******/ 		};
+`;
+            expect(patchCode(code, singleChunkRule)).toMatchInlineSnapshot(`
+        "/******/ 		// require() chunk loading for javascript
+        /******/ 		__webpack_require__.f.require = (chunkId, _) => {
+          if (!installedChunks[chunkId]) {
+            try {
+              installChunk(require("./chunks/710.js"));
+            } catch {}
+          }
+        }
+        ;
+        "
+      `);
+        });
+        test("patch minified runtime", () => {
+            const code = `
+      o.f.require=(t,a)=>{e[t]||(710==t?r(require("./chunks/"+o.u(t))):e[t]=1)}
+      `;
+            expect(patchCode(code, singleChunkRule)).toMatchInlineSnapshot(`
+        "o.f.require=(t, _) => {
+          if (!e[t]) {
+            try {
+              r(require("./chunks/710.js"));
+            } catch {}
           }
         }
-      }
 
-          "
-    `);
+              "
+      `);
+        });
     });
 });

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

@@ -36,7 +36,9 @@ function getRequires(idVariable, files, serverDir) {
 }
 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 }),
+        filter: getCrossPlatformPathRegex(String.raw `/module-loader/node-module-loader\.js$`, {
+            escape: false,
+        }),
         contentFilter: /class NodeModuleLoader {/,
     }, async ({ contents }) => patchCode(contents, await getNodeModuleLoaderRule(buildOpts)));
     updater.updateContent("inline-require-page", {

package/dist/cli/build/utils/create-config-files.d.ts

@@ -1,15 +1,10 @@
 import type { ProjectOptions } from "../../project-options.js";
 /**
- * Creates a `wrangler.json` file for the user if a wrangler config file doesn't already exist,
+ * Creates a `wrangler.jsonc` file for the user if a wrangler config file doesn't already exist,
  * but only after asking for the user's confirmation.
  *
  * If the user refuses a warning is shown (which offers ways to opt out of this check to the user).
  *
- * Note: we generate a wrangler.json file with comments instead of using the jsonc extension,
- *       we decided to do that since json is more common than jsonc, wrangler also parses
- *       them in the same way and we also expect developers to associate `wrangler.json`
- *       files to the jsonc language
- *
  * @param projectOpts The options for the project
  */
 export declare function createWranglerConfigIfNotExistent(projectOpts: ProjectOptions): Promise<void>;

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

@@ -3,16 +3,11 @@ import { join } from "node:path";
 import { getPackageTemplatesDirPath } from "../../../utils/get-package-templates-dir-path.js";
 import { askConfirmation } from "../../utils/ask-confirmation.js";
 /**
- * Creates a `wrangler.json` file for the user if a wrangler config file doesn't already exist,
+ * Creates a `wrangler.jsonc` file for the user if a wrangler config file doesn't already exist,
  * but only after asking for the user's confirmation.
  *
  * If the user refuses a warning is shown (which offers ways to opt out of this check to the user).
  *
- * Note: we generate a wrangler.json file with comments instead of using the jsonc extension,
- *       we decided to do that since json is more common than jsonc, wrangler also parses
- *       them in the same way and we also expect developers to associate `wrangler.json`
- *       files to the jsonc language
- *
  * @param projectOpts The options for the project
  */
 export async function createWranglerConfigIfNotExistent(projectOpts) {
@@ -28,7 +23,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(), "wrangler.json"), "utf8");
+    let wranglerConfig = readFileSync(join(getPackageTemplatesDirPath(), "wrangler.jsonc"), "utf8");
     const appName = getAppNameFromPackageJson(projectOpts.sourceDir) ?? "app-name";
     if (appName) {
         wranglerConfig = wranglerConfig.replace('"app-name"', JSON.stringify(appName.replaceAll("_", "-")));
@@ -37,7 +32,7 @@ export async function createWranglerConfigIfNotExistent(projectOpts) {
     if (compatDate) {
         wranglerConfig = wranglerConfig.replace(/"compatibility_date": "\d{4}-\d{2}-\d{2}"/, `"compatibility_date": ${JSON.stringify(compatDate)}`);
     }
-    writeFileSync(join(projectOpts.sourceDir, "wrangler.json"), wranglerConfig);
+    writeFileSync(join(projectOpts.sourceDir, "wrangler.jsonc"), wranglerConfig);
 }
 function getAppNameFromPackageJson(sourceDir) {
     try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.5.10",
+  "version": "0.5.11",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -54,16 +54,16 @@
     "eslint-plugin-unicorn": "^55.0.0",
     "globals": "^15.9.0",
     "mock-fs": "^5.4.1",
-    "next": "14.2.11",
+    "next": "~14.2.24",
     "rimraf": "^6.0.1",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.7.0",
     "vitest": "^2.1.1"
   },
   "dependencies": {
-    "@ast-grep/napi": "^0.34.1",
+    "@ast-grep/napi": "^0.36.1",
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@756",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@7e23eee",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "yaml": "^2.7.0"