@edgeone/opennextjs-pages 0.2.1 → 0.2.2-beta.2

package/dist/build/content/prerendered.js

@@ -250,6 +250,10 @@ var copyPrerenderedContent = async (ctx) => {
         ...Object.entries(manifest.routes).map(
           ([route, meta]) => limitConcurrentPrerenderContentHandling(async () => {
             const key = routeToFilePath(route);
+            const isPPR = meta.experimentalPPR === true || meta.renderingMode === "PARTIALLY_STATIC";
+            if (isPPR) {
+              return;
+            }
             switch (true) {
               // Parallel route default layout has no prerendered page
               case (meta.dataRoute?.endsWith("/default.rsc") && !existsSync(

package/dist/build/image-optimization.js

@@ -59,7 +59,7 @@ const config: NextConfig = {
   images: {
     ...(originalConfig as any)?.images,
     loader: 'custom',
-    loaderFile: './.edgeone/cloud-functions/ssr-node/image-loader.mjs',
+    loaderFile: './.edgeone/image-loader.mjs',
   },
 };
 
@@ -74,7 +74,7 @@ const config = {
   images: {
     ...originalConfig?.images,
     loader: 'custom',
-    loaderFile: './.edgeone/cloud-functions/ssr-node/image-loader.mjs',
+    loaderFile: './.edgeone/image-loader.mjs',
   },
 };
 
@@ -89,18 +89,12 @@ module.exports = {
   images: {
     ...resolved?.images,
     loader: 'custom',
-    loaderFile: './.edgeone/cloud-functions/ssr-node/image-loader.mjs',
+    loaderFile: './.edgeone/image-loader.mjs',
   },
 };
 `;
 }
 function injectImageLoader(cwd) {
-  const loaderDir = join(cwd, ".edgeone", "cloud-functions", "ssr-node");
-  if (!existsSync(loaderDir)) {
-    mkdirSync(loaderDir, { recursive: true });
-  }
-  const loaderPath = join(loaderDir, "image-loader.mjs");
-  writeFileSync(loaderPath, IMAGE_LOADER_CONTENT, "utf-8");
   const config = findNextConfig(cwd);
   if (!config) {
     console.log("[opennext] next.config not found, skipping image loader injection");
@@ -111,6 +105,17 @@ function injectImageLoader(cwd) {
     console.log("[opennext] images.loaderFile already configured, skipping injection");
     return;
   }
+  const contentWithoutComments = originalContent.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+  if (/unoptimized\s*:\s*true/.test(contentWithoutComments)) {
+    console.log("[opennext] images.unoptimized detected, skipping image loader injection");
+    return;
+  }
+  const edgeoneDir = join(cwd, ".edgeone");
+  if (!existsSync(edgeoneDir)) {
+    mkdirSync(edgeoneDir, { recursive: true });
+  }
+  const loaderPath = join(edgeoneDir, "image-loader.mjs");
+  writeFileSync(loaderPath, IMAGE_LOADER_CONTENT, "utf-8");
   const configDir = config.path.substring(0, config.path.lastIndexOf("/"));
   const backupPath = join(configDir, `next.config.original${config.ext}`);
   renameSync(config.path, backupPath);
@@ -125,6 +130,13 @@ function injectImageLoader(cwd) {
   console.log("[opennext] Image optimization loader injected");
 }
 function restoreNextConfig(cwd) {
+  const loaderPath = join(cwd, ".edgeone", "image-loader.mjs");
+  if (existsSync(loaderPath)) {
+    try {
+      unlinkSync(loaderPath);
+    } catch {
+    }
+  }
   const markerPath = getBackupMarker(cwd);
   if (!existsSync(markerPath)) {
     return;

package/dist/build/routes.js

@@ -89,6 +89,10 @@ function getDataRoutes(dataRoutes, basePath = "") {
   }
   return routes;
 }
+function isPPRRoute(prerenderInfo) {
+  if (!prerenderInfo) return false;
+  return prerenderInfo.experimentalPPR === true || prerenderInfo.renderingMode === "PARTIALLY_STATIC";
+}
 function getServerRoutes(staticRoutes, prerenderManifest, basePath = "") {
   const routes = [];
   const prerenderRoutes = prerenderManifest?.routes || {};
@@ -97,7 +101,7 @@ function getServerRoutes(staticRoutes, prerenderManifest, basePath = "") {
       continue;
     }
     const prerenderInfo = prerenderRoutes[route.page];
-    if (prerenderInfo && prerenderInfo.initialRevalidateSeconds === false) {
+    if (prerenderInfo && prerenderInfo.initialRevalidateSeconds === false && !isPPRRoute(prerenderInfo)) {
       continue;
     }
     if (route.namedRegex) {

package/dist/run/handlers/server.js

@@ -3124,6 +3124,18 @@ var disableFaultyTransferEncodingHandling = (res) => {
     return originalStoreHeader.call(this, firstLine, headers);
   };
 };
+function getRealHostInfo(headers) {
+  const get = (key) => {
+    if (typeof headers.get === "function") {
+      return headers.get(key) || "";
+    }
+    return headers[key] || "";
+  };
+  const host = get("eo-pages-host") || get("host") || "localhost";
+  const protocol = get("x-forwarded-proto") || "https";
+  return { host, protocol };
+}
+var NEXT_REQUEST_META = Symbol.for("NextInternalRequestMeta");
 var server_default = async (request, _context, topLevelSpan, requestContext) => {
   const tracer = getTracer();
   if (!nextHandler) {
@@ -3139,9 +3151,14 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
     });
   }
   return await tracer.withActiveSpan("generate response", async (span) => {
+    const { host: realHost, protocol: realProtocol } = getRealHostInfo(request.headers);
     const headersList = [];
     for (var key in request.headers) {
-      headersList.push([key, request.headers[key]]);
+      if (key === "host") {
+        headersList.push([key, realHost]);
+      } else {
+        headersList.push([key, request.headers[key]]);
+      }
     }
     let bodyStream = request.body;
     if (typeof bodyStream === "undefined" && request.method !== "GET" && request.method !== "HEAD") {
@@ -3166,7 +3183,7 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
     const { req, res } = toReqRes({
       ...request,
       body: bodyStream,
-      url: "http://localhost:9000" + request.url,
+      url: `${realProtocol}://${realHost}${request.url}`,
       headers: headersList
     });
     Object.defineProperty(req, "connection", {
@@ -3180,6 +3197,21 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
       }
     });
     disableFaultyTransferEncodingHandling(res);
+    const realOrigin = `${realProtocol}://${realHost}`;
+    const metaProxy = new Proxy({}, {
+      set(target, prop, value) {
+        if (prop === "initURL" && typeof value === "string") {
+          target[prop] = value.replace(/^https?:\/\/localhost(:\d+)?/, realOrigin);
+        } else {
+          target[prop] = value;
+        }
+        return true;
+      },
+      get(target, prop) {
+        return target[prop];
+      }
+    });
+    req[NEXT_REQUEST_META] = metaProxy;
     const resProxy = nextResponseProxy(res, requestContext);
     const nextHandlerPromise = nextHandler(req, resProxy).catch((error) => {
       getLogger().withError(error).error("next handler error");

package/dist/run/handlers/tags-handler.cjs

@@ -28,7 +28,7 @@ module.exports = __toCommonJS(tags_handler_exports);
 
 // package.json
 var name = "@edgeone/opennextjs-pages";
-var version = "0.2.1";
+var version = "0.2.2-beta.2";
 
 // src/run/handlers/tags-handler.cts
 var import_request_context = require("./request-context.cjs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgeone/opennextjs-pages",
-  "version": "0.2.1",
+  "version": "0.2.2-beta.2",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",