@opennextjs/cloudflare 0.4.4 → 0.4.6

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

@@ -50,6 +50,16 @@ export async function bundleServer(buildOpts) {
         target: "esnext",
         minify: false,
         metafile: true,
+        // Next traces files using the default conditions from `nft` (`node`, `require`, `import` and `default`)
+        //
+        // Because we use the `node` platform for this build, the "module" condition is used when no conditions are defined.
+        // We explicitly set the conditions to an empty array to disable the "module" condition in order to match Next tracing.
+        //
+        // See:
+        // - default nft conditions: https://github.com/vercel/nft/blob/2b55b01/readme.md#exports--imports
+        // - Next no explicit override: https://github.com/vercel/next.js/blob/2efcf11/packages/next/src/build/collect-build-traces.ts#L287
+        // - ESBuild `node` platform: https://esbuild.github.io/api/#platform
+        conditions: [],
         plugins: [
             createFixRequiresESBuildPlugin(buildOpts),
             inlineRequirePagePlugin(buildOpts),
@@ -126,10 +136,6 @@ globalThis.__BUILD_TIMESTAMP_MS__ = ${Date.now()};
 `,
         },
     });
-    if (result.errors.length > 0) {
-        result.errors.forEach((error) => console.error(error));
-        throw new Error(`There was a problem bundling the server.`);
-    }
     fs.writeFileSync(openNextServerBundle + ".meta.json", JSON.stringify(result.metafile, null, 2));
     await updateWorkerBundledCode(openNextServerBundle, buildOpts);
     const isMonorepo = monorepoRoot !== appPath;

package/dist/cli/build/open-next/compile-env-files.js

@@ -5,5 +5,7 @@ import { extractProjectEnvVars } from "../utils/index.js";
  * Compiles the values extracted from the project's env files to the output directory for use in the worker.
  */
 export function compileEnvFiles(buildOpts) {
-    ["production", "development", "test"].forEach((mode) => fs.appendFileSync(path.join(buildOpts.outputDir, `.env.mjs`), `export const ${mode} = ${JSON.stringify(extractProjectEnvVars(mode, buildOpts))};\n`));
+    const envDir = path.join(buildOpts.outputDir, "env");
+    fs.mkdirSync(envDir, { recursive: true });
+    ["production", "development", "test"].forEach((mode) => fs.appendFileSync(path.join(envDir, `next-env.mjs`), `export const ${mode} = ${JSON.stringify(extractProjectEnvVars(mode, buildOpts))};\n`));
 }

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.js

@@ -68,9 +68,17 @@ export async function getFileContentWithUpdatedWebpackFRequireCode(sourceFile, {
         .map((parameter) => parameter.getName());
     const chunkId = functionParameterNames[0];
     const functionBody = webpackFRequireFunction.getBody();
-    functionBody.insertStatements(0, [
-        `if (${installedChunks}[${chunkId}]) return;`,
-        ...chunks.map((chunk) => `\nif(${chunkId} === ${chunk}) return ${installChunk}(require("./chunks/${chunk}.js"));`),
-    ]);
+    functionBody.replaceWithText(`
+{
+  if (${installedChunks}[${chunkId}]) {
+    return;
+  }${chunks
+        .map((chunk) => `
+  if(${chunkId} === ${chunk}) {
+    return ${installChunk}(require("./chunks/${chunk}.js"));
+  }`)
+        .join("")}
+  throw new Error(\`Unknown chunk \${${chunkId}}\`);
+}`);
     return sourceFile.print();
 }

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.test.js

@@ -7,15 +7,17 @@ describe("getFileContentWithUpdatedWebpackFRequireCode", () => {
         const fileContent = await readFile(`${import.meta.dirname}/test-fixtures/unminified-webpacks-file.js`, "utf8");
         const tsSourceFile = tsParseFile(fileContent);
         const updatedFCode = await getFileContentWithUpdatedWebpackFRequireCode(tsSourceFile, { installChunk: "installChunk", installedChunks: "installedChunks" }, ["658"]);
-        expect(unstyleCode(updatedFCode)).toContain(`if (installedChunks[chunkId]) return;`);
-        expect(unstyleCode(updatedFCode)).toContain(`if (chunkId === 658) return installChunk(require("./chunks/658.js"));`);
+        expect(unstyleCode(updatedFCode)).toContain(`if (installedChunks[chunkId]) { return; }`);
+        expect(unstyleCode(updatedFCode)).toContain(`if (chunkId === 658) { return installChunk(require("./chunks/658.js")); }`);
+        expect(unstyleCode(updatedFCode)).not.toContain(`require("./chunks/" +`);
     });
     test("returns the updated content of the f.require function from minified webpack runtime code", async () => {
         const fileContent = await readFile(`${import.meta.dirname}/test-fixtures/minified-webpacks-file.js`, "utf8");
         const tsSourceFile = tsParseFile(fileContent);
         const updatedFCode = await getFileContentWithUpdatedWebpackFRequireCode(tsSourceFile, { installChunk: "r", installedChunks: "e" }, ["658"]);
-        expect(unstyleCode(updatedFCode)).toContain("if (e[o]) return;");
-        expect(unstyleCode(updatedFCode)).toContain(`if (o === 658) return r(require("./chunks/658.js"));`);
+        expect(unstyleCode(updatedFCode)).toContain("if (e[o]) { return; }");
+        expect(unstyleCode(updatedFCode)).toContain(`if (o === 658) { return r(require("./chunks/658.js")); }`);
+        expect(unstyleCode(updatedFCode)).not.toContain(`require("./chunks/" +`);
     });
 });
 function unstyleCode(text) {

package/dist/cli/build/utils/version.js

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import { join } from "node:path";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, URL } from "node:url";
 export function getVersion() {
     const require = createRequire(import.meta.url);
     const __dirname = fileURLToPath(new URL(".", import.meta.url));

package/dist/cli/templates/worker.js

@@ -1,5 +1,7 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 // @ts-expect-error: resolved by wrangler build
+import * as nextEnvVars from "./env/next-env.mjs";
+// @ts-expect-error: resolved by wrangler build
 import { handler as middlewareHandler } from "./middleware/handler.mjs";
 // @ts-expect-error: resolved by wrangler build
 import { handler as serverHandler } from "./server-functions/default/handler.mjs";
@@ -12,14 +14,13 @@ globalThis[Symbol.for("__cloudflare-context__")] = new Proxy({}, {
     get: (_, property) => Reflect.get(cloudflareContextALS.getStore(), property),
     set: (_, property, value) => Reflect.set(cloudflareContextALS.getStore(), property, value),
 });
+// Populate process.env on the first request
+let processEnvPopulated = false;
 export default {
     async fetch(request, env, ctx) {
         return cloudflareContextALS.run({ env, ctx, cf: request.cf }, async () => {
             const url = new URL(request.url);
-            if (process.env.__PROCESS_ENV_POPULATED !== "1") {
-                await populateProcessEnv(url, env.NEXTJS_ENV);
-                process.env.__PROCESS_ENV_POPULATED = "1";
-            }
+            populateProcessEnv(url, env.NEXTJS_ENV);
             if (url.pathname === "/_next/image") {
                 const imageUrl = url.searchParams.get("url") ?? "";
                 return imageUrl.startsWith("/")
@@ -44,9 +45,11 @@ export default {
  *
  * Note that cloudflare env string values are copied by the middleware handler.
  */
-async function populateProcessEnv(url, nextJsEnv) {
-    // @ts-expect-error: resolved by wrangler build
-    const nextEnvVars = await import("./.env.mjs");
+function populateProcessEnv(url, nextJsEnv) {
+    if (processEnvPopulated) {
+        return;
+    }
+    processEnvPopulated = true;
     const mode = nextJsEnv ?? "production";
     if (nextEnvVars[mode]) {
         for (const key in nextEnvVars[mode]) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -63,7 +63,7 @@
   "dependencies": {
     "@ast-grep/napi": "^0.34.1",
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@722",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@724",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "ts-morph": "^23.0.0",