@edgeone/opennextjs-pages 0.1.5 → 0.1.6-beta.2

package/dist/build/routes.js

@@ -9,18 +9,130 @@ import "../esm-chunks/chunk-6BT4RYQJ.js";
 // src/build/routes.ts
 import * as fs from "fs";
 import * as path from "path";
-function isRE2Compatible(regexSource) {
-  const unsupported = [
-    /\(\?[=!<]/,
-    // 断言（前瞻、后顾）
-    /\(\?>/,
-    // 原子组
-    /\\(\d+)/,
-    // 反向引用 \1 \2
-    /\(\?\(/
-    // 条件表达式
-  ];
-  return !unsupported.some((r) => r.test(regexSource));
+import {
+  convertRedirects,
+  convertRewrites,
+  convertHeaders,
+  convertTrailingSlash
+} from "./route-utils.js";
+function hasAppRouter(appPathRoutesManifest) {
+  return appPathRoutesManifest && Object.keys(appPathRoutesManifest).length > 0;
+}
+function getBuildId(ctx) {
+  try {
+    const buildIdPath = path.join(ctx.publishDir, "BUILD_ID");
+    if (fs.existsSync(buildIdPath)) {
+      return fs.readFileSync(buildIdPath, "utf-8").trim();
+    }
+  } catch {
+  }
+  return null;
+}
+function isRE2Compatible(regex) {
+  if (/\(\?[=!<]/.test(regex)) {
+    return false;
+  }
+  if (/\\[1-9]/.test(regex)) {
+    return false;
+  }
+  return true;
+}
+function convertNamedRegexToSrc(namedRegex, basePath = "") {
+  const regexWithoutNamedGroups = namedRegex.replace(/\(\?<[a-zA-Z][a-zA-Z0-9_]*>/g, "(");
+  if (!isRE2Compatible(regexWithoutNamedGroups)) {
+    console.warn(`[opennext] Warning: Regex not RE2 compatible, skipping: ${namedRegex}`);
+    return null;
+  }
+  let src = namedRegex.replace(/\(\?<[a-zA-Z][a-zA-Z0-9_]*>/g, "(");
+  if (basePath && !src.startsWith(`^${basePath}`)) {
+    src = src.replace(/^\^/, `^${basePath}`);
+  }
+  return src;
+}
+function getDynamicRoutes(dynamicRoutes, basePath = "") {
+  const routes = [];
+  for (const route of dynamicRoutes) {
+    if (route.namedRegex) {
+      const src = convertNamedRegexToSrc(route.namedRegex, basePath);
+      if (src) {
+        routes.push({ src });
+      }
+    } else if (route.regex) {
+      if (isRE2Compatible(route.regex)) {
+        let src = route.regex;
+        if (basePath && !src.startsWith(`^${basePath}`)) {
+          src = src.replace(/^\^/, `^${basePath}`);
+        }
+        routes.push({ src });
+      }
+    }
+  }
+  return routes;
+}
+function getDataRoutes(dataRoutes, basePath = "") {
+  const routes = [];
+  for (const route of dataRoutes) {
+    if (route.namedDataRouteRegex) {
+      const src = convertNamedRegexToSrc(route.namedDataRouteRegex, basePath);
+      if (src) {
+        routes.push({ src });
+      }
+    } else if (route.dataRouteRegex) {
+      if (isRE2Compatible(route.dataRouteRegex)) {
+        let src = route.dataRouteRegex;
+        if (basePath && !src.startsWith(`^${basePath}`)) {
+          src = src.replace(/^\^/, `^${basePath}`);
+        }
+        routes.push({ src });
+      }
+    }
+  }
+  return routes;
+}
+function getServerRoutes(staticRoutes, prerenderManifest, basePath = "") {
+  const routes = [];
+  const prerenderRoutes = prerenderManifest?.routes || {};
+  for (const route of staticRoutes) {
+    if (route.page.startsWith("/_")) {
+      continue;
+    }
+    const prerenderInfo = prerenderRoutes[route.page];
+    if (prerenderInfo && prerenderInfo.initialRevalidateSeconds === false) {
+      continue;
+    }
+    if (route.namedRegex) {
+      let src = convertNamedRegexToSrc(route.namedRegex, basePath);
+      if (src) {
+        src = src.replace(/\(\?:\/\)\?\$$/, "$");
+        routes.push({ src });
+      }
+    } else if (route.regex) {
+      if (isRE2Compatible(route.regex)) {
+        let src = route.regex;
+        if (basePath && !src.startsWith(`^${basePath}`)) {
+          src = src.replace(/^\^/, `^${basePath}`);
+        }
+        src = src.replace(/\(\?:\/\)\?\$$/, "$");
+        routes.push({ src });
+      }
+    }
+  }
+  return routes;
+}
+function getApiRoutes(appPathsManifest, basePath = "") {
+  if (!appPathsManifest) {
+    return [];
+  }
+  const routes = [];
+  for (const routePath of Object.keys(appPathsManifest)) {
+    if (routePath.includes("/api/") && routePath.endsWith("/route")) {
+      const apiPath = routePath.replace(/\/route$/, "");
+      const escapedPath = apiPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const src = `^${basePath}${escapedPath}$`;
+      routes.push({ src });
+    }
+  }
+  return routes;
 }
 async function getMiddlewareConfig(ctx) {
   try {
@@ -46,9 +158,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) {
@@ -86,8 +203,8 @@ async function getMiddlewareConfig(ctx) {
     return null;
   }
 }
-function updateEdgeFunctionsMetaJson(middlewareConfig) {
-  const metaJsonPath = path.join(process.cwd(), ".edgeone/edge-functions/meta.json");
+function updateEdgeFunctionsConfigJson(middlewareConfig) {
+  const metaJsonPath = path.join(process.cwd(), ".edgeone/edge-functions/config.json");
   let meta = { routes: [] };
   if (fs.existsSync(metaJsonPath)) {
     try {
@@ -105,101 +222,139 @@ function updateEdgeFunctionsMetaJson(middlewareConfig) {
   }
   fs.writeFileSync(metaJsonPath, JSON.stringify(meta, null, 2), "utf-8");
 }
-var convertNextRoutePattern = (path2) => {
-  if (!path2.includes("[")) {
-    return path2;
-  }
-  let convertedPath = path2;
-  const optionalCatchAllMatch = path2.match(/\[\[\.\.\.([^\]]+)\]\]/);
-  if (optionalCatchAllMatch) {
-    const paramName = optionalCatchAllMatch[1];
-    convertedPath = convertedPath.replace(/\[\[\.\.\.([^\]]+)\]\]/g, `:${paramName}*`);
-  }
-  const catchAllMatch = path2.match(/\[\.\.\.([^\]]+)\]/);
-  if (catchAllMatch) {
-    const paramName = catchAllMatch[1];
-    convertedPath = convertedPath.replace(/\[\.\.\.([^\]]+)\]/g, `:${paramName}*`);
-  }
-  const dynamicMatch = path2.match(/\[([^\]]+)\]/);
-  if (dynamicMatch) {
-    const paramName = dynamicMatch[1];
-    convertedPath = convertedPath.replace(/\[([^\]]+)\]/g, `:${paramName}`);
-  }
-  return convertedPath;
-};
 var createRouteMeta = async (ctx) => {
-  const routeMap = {};
-  const manifest = await ctx.getPrerenderManifest();
-  if (manifest?.routes) {
-    for (const [route, routeInfo] of Object.entries(manifest.routes)) {
-      routeMap[route] = {
-        // 提取关键信息到routeMap
-        isStatic: routeInfo.initialRevalidateSeconds === false,
-        initialRevalidateSeconds: routeInfo.initialRevalidateSeconds || void 0,
-        srcRoute: routeInfo.srcRoute || void 0,
-        dataRoute: routeInfo.dataRoute || void 0
-      };
-    }
+  const routes = [];
+  const routesManifest = await ctx.getRoutesManifest();
+  const appPathRoutesManifest = await ctx.getAppPathRoutesManifest();
+  const isAppRouter = hasAppRouter(appPathRoutesManifest);
+  const basePath = routesManifest?.basePath || "";
+  const trailingSlash = ctx.requiredServerFiles?.config?.trailingSlash ?? false;
+  const redirects = routesManifest?.redirects || [];
+  const headers = routesManifest?.headers || [];
+  const rewrites = routesManifest?.rewrites || { beforeFiles: [], afterFiles: [], fallback: [] };
+  let beforeFilesRewrites = [];
+  let afterFilesRewrites = [];
+  let fallbackRewrites = [];
+  if (Array.isArray(rewrites)) {
+    afterFilesRewrites = rewrites;
+  } else {
+    beforeFilesRewrites = rewrites.beforeFiles || [];
+    afterFilesRewrites = rewrites.afterFiles || [];
+    fallbackRewrites = rewrites.fallback || [];
   }
-  const pagesManifest = await ctx.getPagesManifest();
-  if (pagesManifest) {
-    for (const [route, filePath] of Object.entries(pagesManifest)) {
-      if (!routeMap[route]) {
-        routeMap[route] = {};
-      }
-      if (filePath.startsWith("pages") && filePath.endsWith(".html")) {
-        routeMap[route].isStatic = true;
-      }
+  const dynamicRoutes = routesManifest?.dynamicRoutes || [];
+  const dataRoutes = routesManifest?.dataRoutes || [];
+  const staticRoutes = routesManifest?.staticRoutes || [];
+  const appPathsManifest = await ctx.getAppPathsManifest?.() || null;
+  const prerenderManifest = await ctx.getPrerenderManifest?.() || null;
+  const buildId = getBuildId(ctx);
+  const staticCacheRegex = buildId ? `^${basePath}/_next/static/(?:[^/]+/pages|pages|chunks|runtime|css|image|media|${buildId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")})/.+` : `^${basePath}/_next/static/(?:[^/]+/pages|pages|chunks|runtime|css|image|media)/.+`;
+  routes.push({
+    src: staticCacheRegex,
+    headers: {
+      "cache-control": "public,max-age=31536000,immutable"
+    },
+    continue: true
+  });
+  if (trailingSlash) {
+    routes.push(...convertTrailingSlash(true));
+  } else {
+    routes.push(...convertTrailingSlash(false));
+  }
+  if (headers.length > 0) {
+    try {
+      routes.push(...convertHeaders(headers));
+    } catch (e) {
+      console.warn("[opennext] Warning: Failed to convert some headers:", e);
     }
   }
-  const appPathRoutesManifest = await ctx.getAppPathRoutesManifest();
-  if (appPathRoutesManifest) {
-    for (const [route, actualRoute] of Object.entries(appPathRoutesManifest)) {
-      if (!routeMap[actualRoute]) {
-        routeMap[actualRoute] = {};
-      }
+  const userRedirects = redirects.filter((r) => !r.internal);
+  if (userRedirects.length > 0) {
+    try {
+      routes.push(...convertRedirects(userRedirects));
+    } catch (e) {
+      console.warn("[opennext] Warning: Failed to convert some redirects:", e);
     }
   }
-  const routesManifest = await ctx.getRoutesManifest();
-  if (routesManifest) {
-    const dataRoutes = routesManifest.dataRoutes;
-    if (dataRoutes) {
-      for (const { page, dataRouteRegex } of dataRoutes) {
-        routeMap[dataRouteRegex] = {
-          isStatic: routeMap[page]?.isStatic || false
-        };
-      }
+  if (beforeFilesRewrites.length > 0) {
+    try {
+      routes.push(...convertRewrites(beforeFilesRewrites));
+    } catch (e) {
+      console.warn("[opennext] Warning: Failed to convert beforeFiles rewrites:", e);
     }
   }
-  const imagesManifest = await ctx.getImagesManifest();
-  if (imagesManifest) {
-    if (imagesManifest.images) {
-      const imageConfig = imagesManifest.images;
-      routeMap[imageConfig.path] = {};
+  if (isAppRouter) {
+    const rscVary = "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Router-Segment-Prefetch";
+    const rscContentType = "text/x-component";
+    routes.push({
+      src: `^${basePath}/?$`,
+      has: [{ type: "header", key: "rsc", value: "1" }],
+      dest: `${basePath}/index.rsc`,
+      headers: { vary: rscVary, "content-type": rscContentType },
+      continue: true
+    });
+    routes.push({
+      src: `^${basePath}/(.+?)(?:/)?$`,
+      exclude: "\\.rsc/?$",
+      has: [{ type: "header", key: "rsc", value: "1" }],
+      dest: `${basePath}/$1.rsc`,
+      headers: { vary: rscVary, "content-type": rscContentType },
+      continue: true
+    });
+  }
+  routes.push({
+    src: `^${basePath}/404/?$`,
+    status: 404,
+    continue: true,
+    missing: [{ type: "header", key: "x-prerender-revalidate" }]
+  });
+  routes.push({
+    src: `^${basePath}/500$`,
+    status: 500,
+    continue: true
+  });
+  routes.push({
+    src: `^${basePath}/((?:[^/]+/)*[^/.]+)/$`,
+    dest: `${basePath}/$1`,
+    continue: true
+  });
+  routes.push({ handle: "filesystem" });
+  if (afterFilesRewrites.length > 0) {
+    try {
+      routes.push(...convertRewrites(afterFilesRewrites));
+    } catch (e) {
+      console.warn("[opennext] Warning: Failed to convert afterFiles rewrites:", e);
     }
   }
-  const convertedRouteMap = {};
-  const pathsToDelete = [];
-  for (const [routePath, routeConfig] of Object.entries(routeMap)) {
-    const convertedPath = convertNextRoutePattern(routePath);
-    if (convertedPath !== routePath) {
-      pathsToDelete.push(routePath);
-      convertedRouteMap[convertedPath] = routeConfig;
+  if (fallbackRewrites.length > 0) {
+    try {
+      routes.push(...convertRewrites(fallbackRewrites));
+    } catch (e) {
+      console.warn("[opennext] Warning: Failed to convert fallback rewrites:", e);
     }
   }
-  for (const pathToDelete of pathsToDelete) {
-    delete routeMap[pathToDelete];
+  if (staticRoutes.length > 0) {
+    routes.push(...getServerRoutes(staticRoutes, prerenderManifest, basePath));
+  }
+  if (dynamicRoutes.length > 0) {
+    routes.push(...getDynamicRoutes(dynamicRoutes, basePath));
   }
-  Object.assign(routeMap, convertedRouteMap);
-  const routesArray = Object.entries(routeMap).map(([path2, config]) => ({
-    path: path2,
-    ...config
-  }));
+  if (dataRoutes.length > 0) {
+    routes.push(...getDataRoutes(dataRoutes, basePath));
+  }
+  const apiRoutes = getApiRoutes(appPathsManifest, basePath);
+  if (apiRoutes.length > 0) {
+    routes.push(...apiRoutes);
+  }
+  routes.push({
+    src: `^${basePath}/.*$`
+  });
   const serverHandlerDir = ctx.serverHandlerRootDir;
   if (!fs.existsSync(serverHandlerDir)) {
     fs.mkdirSync(serverHandlerDir, { recursive: true });
   }
-  const metaFilePath = path.join(serverHandlerDir, "meta.json");
+  const nextVersion = ctx.nextVersion || null;
+  const imagesManifest = await ctx.getImagesManifest();
   const updatedRedirects = [];
   if (imagesManifest?.images?.path) {
     const imagePath = imagesManifest.images.path;
@@ -210,21 +365,24 @@ var createRouteMeta = async (ctx) => {
     };
     updatedRedirects.push(nextImageRedirect);
   }
-  const metaData = {
+  const config = {
+    version: 3,
+    routes,
     conf: {
       redirects: updatedRedirects
     },
-    nextRoutes: routesArray
+    ...nextVersion ? { framework: { version: nextVersion } } : {}
   };
+  const configFilePath = path.join(serverHandlerDir, "config.json");
   fs.writeFileSync(
-    metaFilePath,
-    JSON.stringify(metaData, null, 2),
+    configFilePath,
+    JSON.stringify(config, null, 2),
     "utf-8"
   );
+  console.log(`[opennext] Generated ${configFilePath} with ${routes.length} routes`);
   const middlewareConfig = await getMiddlewareConfig(ctx);
-  updateEdgeFunctionsMetaJson(middlewareConfig);
+  updateEdgeFunctionsConfigJson(middlewareConfig);
 };
 export {
-  convertNextRoutePattern,
   createRouteMeta
 };

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