@edgeone/opennextjs-pages 0.1.5 → 0.1.6

package/dist/build/functions/middleware/compiler.js

@@ -2455,11 +2455,14 @@ async function compileTurbopack(inputPath, middlewareCode, options = {}) {
   }
   const externalChunks = [];
   const middlewareChunks = [];
+  const libraryChunks = [];
   for (const chunkPath of chunkPaths) {
     if (chunkPath.includes("[externals]")) {
       externalChunks.push(chunkPath);
     } else if (chunkPath.includes("[root-of-the-server]")) {
       middlewareChunks.push(chunkPath);
+    } else {
+      libraryChunks.push(chunkPath);
     }
   }
   const chunksCode = [];
@@ -2474,6 +2477,17 @@ async function compileTurbopack(inputPath, middlewareCode, options = {}) {
       warnings.push(`External chunk not found: ${fullPath}`);
     }
   }
+  for (const chunkPath of libraryChunks) {
+    const relativePath = chunkPath.replace(/^server\//, "");
+    const fullPath = join(middlewareDir, relativePath);
+    if (existsSync(fullPath)) {
+      let code = readFileSync(fullPath, "utf-8");
+      code = transformForEdgeOneRuntime(code);
+      chunksCode.push(code);
+    } else {
+      warnings.push(`Library chunk not found: ${fullPath}`);
+    }
+  }
   for (const chunkPath of middlewareChunks) {
     const relativePath = chunkPath.replace(/^server\//, "");
     const fullPath = join(middlewareDir, relativePath);

package/dist/build/functions/middleware/middleware.js

@@ -11,16 +11,20 @@ import { compile } from "./compiler.js";
 import { join } from "node:path";
 import { existsSync, writeFileSync, mkdirSync, readFileSync } from "node:fs";
 var compileMiddleware = async (ctx) => {
+  const nextDistDir = ctx.nextDistDir || ".next";
   const possiblePaths = [
-    // 1. Next.js 15+: distDir/server/middleware.js (直接在 .next 目录下)
+    // 1. Next.js 15+: distDir/server/middleware.js (直接在 distDir 目录下)
     join(ctx.distDir, "server/middleware.js"),
-    // 2. Next.js 15+: standaloneDir/.next/server/middleware.js
-    join(ctx.standaloneDir, ".next/server/middleware.js"),
-    // 3. 旧版: standaloneDir/.next/server/src/middleware.js
-    join(ctx.standaloneDir, ".next/server/src/middleware.js"),
+    // 2. Next.js 15+: standaloneDir/{nextDistDir}/server/middleware.js
+    join(ctx.standaloneDir, nextDistDir, "server/middleware.js"),
+    // 3. 旧版: standaloneDir/{nextDistDir}/server/src/middleware.js
+    join(ctx.standaloneDir, nextDistDir, "server/src/middleware.js"),
     // 4. 旧版: distDir/server/src/middleware.js
     join(ctx.distDir, "server/src/middleware.js"),
-    // 5. 相对于当前工作目录
+    // 5. 相对于当前工作目录（使用配置的 distDir）
+    join(process.cwd(), nextDistDir, "server/middleware.js"),
+    join(process.cwd(), nextDistDir, "server/src/middleware.js"),
+    // 6. 兼容默认 .next 目录（以防 nextDistDir 获取失败）
     join(process.cwd(), ".next/server/middleware.js"),
     join(process.cwd(), ".next/server/src/middleware.js")
   ];
@@ -41,7 +45,8 @@ var compileMiddleware = async (ctx) => {
   mkdirSync(outputDir, { recursive: true });
   const outputPath = join(outputDir, "compiled-middleware.js");
   writeFileSync(outputPath, result.code || "", "utf-8");
-  const edgeFunctionPath = join(process.cwd(), ".edgeone/edge-functions/index.js");
+  const edgeoneDir = join(process.cwd(), ".edgeone");
+  const edgeFunctionPath = join(edgeoneDir, "edge-functions/index.js");
   if (existsSync(edgeFunctionPath)) {
     let edgeFunctionCode = readFileSync(edgeFunctionPath, "utf-8");
     if (edgeFunctionCode.includes(`'__MIDDLEWARE_BUNDLE_CODE__'`)) {

package/dist/build/functions/middleware/polyfills/index.js

@@ -73,6 +73,22 @@ var responsePolyfill = `
     return originalRedirect.call(OriginalResponse, urlString, status);
   };
   
+  // Response.json \u9759\u6001\u65B9\u6CD5 polyfill
+  // \u67D0\u4E9B Edge \u8FD0\u884C\u65F6\u4E0D\u652F\u6301\u8FD9\u4E2A\u8F83\u65B0\u7684 Web API
+  const patchedJson = function(data, init) {
+    const body = JSON.stringify(data);
+    const responseInit = cleanResponseInit(init) || {};
+    
+    // \u8BBE\u7F6E Content-Type header
+    const headers = new Headers(responseInit.headers || {});
+    if (!headers.has('Content-Type')) {
+      headers.set('Content-Type', 'application/json');
+    }
+    responseInit.headers = headers;
+    
+    return new OriginalResponse(body, responseInit);
+  };
+  
   // \u521B\u5EFA cookies \u5BF9\u8C61\u7684\u5DE5\u5382\u51FD\u6570
   function createResponseCookies(response) {
     const cookieStore = new Map();
@@ -137,6 +153,14 @@ var responsePolyfill = `
       if (prop === 'redirect') {
         return patchedRedirect;
       }
+      // \u62E6\u622A json \u9759\u6001\u65B9\u6CD5\uFF08polyfill for Edge runtime\uFF09
+      if (prop === 'json') {
+        // \u5982\u679C\u539F\u751F\u652F\u6301\u5C31\u7528\u539F\u751F\u7684\uFF0C\u5426\u5219\u7528 polyfill
+        if (typeof OriginalResponse.json === 'function') {
+          return OriginalResponse.json.bind(OriginalResponse);
+        }
+        return patchedJson;
+      }
       // \u5176\u4ED6\u9759\u6001\u65B9\u6CD5\u76F4\u63A5\u4ECE\u539F\u59CB Response \u83B7\u53D6
       return Reflect.get(target, prop, receiver);
     }

package/dist/build/plugin-context.js

@@ -40,7 +40,7 @@ var PluginContext = class {
   }
   /** Temporary directory for stashing the build output */
   get tempPublishDir() {
-    return this.resolveFromPackagePath(".edgeone/.next");
+    return this.resolveFromPackagePath(join(".edgeone", this.nextDistDir));
   }
   /** Absolute path of the publish directory */
   get publishDir() {
@@ -152,13 +152,15 @@ var PluginContext = class {
     return join(this.edgeFunctionsDir, EDGE_HANDLER_NAME);
   }
   constructor(options) {
+    const detectedPublishDir = this.detectPublishDir(options?.constants?.PACKAGE_PATH);
     options = {
       ...options,
       functions: {
         "*": {}
       },
       constants: {
-        PUBLISH_DIR: ".next"
+        ...options?.constants,
+        PUBLISH_DIR: detectedPublishDir
         // BUILD_VERSION: '32.1.4',
       }
     };
@@ -171,6 +173,32 @@ var PluginContext = class {
     this.serverlessWrapHandler = options.serverlessWrapHandler;
     this.getRuntimeShim = options.getRuntimeShim;
   }
+  /**
+   * 自动检测 Next.js 构建输出目录
+   * 搜索包含 BUILD_ID 文件的目录，支持自定义 distDir 配置
+   */
+  detectPublishDir(packagePath) {
+    const basePath = packagePath || process.cwd();
+    const possibleDirs = [
+      ".next",
+      // 默认
+      "build",
+      // 常见自定义
+      "dist",
+      // 常见自定义
+      "out",
+      // 常见自定义
+      ".build"
+      // 其他可能
+    ];
+    for (const dir of possibleDirs) {
+      const fullPath = resolve(basePath, dir);
+      if (existsSync(join(fullPath, "BUILD_ID"))) {
+        return dir;
+      }
+    }
+    return DEFAULT_PUBLISH_DIR;
+  }
   /** Resolves a path correctly with mono repository awareness for .edgeone directories mainly  */
   resolveFromPackagePath(...args) {
     return resolve(this.constants.PACKAGE_PATH || "", ...args);
@@ -201,18 +229,21 @@ var PluginContext = class {
   /**
    * Uses various heuristics to try to find the .next dir.
    * Works by looking for BUILD_ID, so requires the site to have been built
+   * 支持自定义 distDir 配置（如 distDir: 'build'）
    */
   findDotNext() {
-    for (const dir of [
-      // The publish directory
-      this.publishDir,
-      // In the root
-      resolve(DEFAULT_PUBLISH_DIR),
-      // The sibling of the publish directory
-      resolve(this.publishDir, "..", DEFAULT_PUBLISH_DIR),
-      // In the package dir
-      resolve(this.constants.PACKAGE_PATH || "", DEFAULT_PUBLISH_DIR)
-    ]) {
+    const possibleDirNames = [".next", "build", "dist", "out", ".build"];
+    const searchDirs = [
+      // The publish directory (已检测的目录)
+      this.publishDir
+    ];
+    for (const dirName of possibleDirNames) {
+      searchDirs.push(resolve(dirName));
+      searchDirs.push(resolve(this.publishDir, "..", dirName));
+      searchDirs.push(resolve(this.constants.PACKAGE_PATH || "", dirName));
+    }
+    const uniqueDirs = [...new Set(searchDirs)];
+    for (const dir of uniqueDirs) {
       if (existsSync(join(dir, "BUILD_ID"))) {
         return dir;
       }

package/dist/build/routes.js

@@ -46,9 +46,14 @@ async function getMiddlewareConfig(ctx) {
         matcher: normalizedMatchers.map((item) => ({ source: item.source }))
       };
     }
+    const nextDistDir = ctx.nextDistDir || ".next";
     const possibleFunctionsConfigPaths = [
-      path.join(process.cwd(), ".next/server/functions-config-manifest.json"),
-      path.join(ctx.distDir, "server/functions-config-manifest.json")
+      // 1. 使用配置的 distDir
+      path.join(ctx.distDir, "server/functions-config-manifest.json"),
+      // 2. 相对于当前工作目录（使用配置的 nextDistDir）
+      path.join(process.cwd(), nextDistDir, "server/functions-config-manifest.json"),
+      // 3. 兼容默认 .next 目录
+      path.join(process.cwd(), ".next/server/functions-config-manifest.json")
     ];
     let functionsConfigPath = "";
     for (const p of possibleFunctionsConfigPaths) {

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.1.5";
+var version = "0.1.6";
 
 // 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.1.5",
+  "version": "0.1.6",
   "description": "",
   "main": "./dist/index.js",
   "type": "module",