@edgeone/opennextjs-pages 0.2.6 → 0.2.8

package/dist/build/routes.js

@@ -103,7 +103,6 @@ function getServerRoutes(staticRoutes, prerenderManifest, basePath = "") {
     if (route.namedRegex) {
       let src = convertNamedRegexToSrc(route.namedRegex, basePath);
       if (src) {
-        src = src.replace(/\(\?:\/\)\?\$$/, "$");
         routes.push({ src });
       }
     } else if (route.regex) {
@@ -112,28 +111,51 @@ function getServerRoutes(staticRoutes, prerenderManifest, basePath = "") {
         if (basePath && !src.startsWith(`^${basePath}`)) {
           src = src.replace(/^\^/, `^${basePath}`);
         }
-        src = src.replace(/\(\?:\/\)\?\$$/, "$");
         routes.push({ src });
       }
     }
   }
   return routes;
 }
-function getApiRoutes(appPathsManifest, basePath = "") {
+function getAppRoutes(appPathsManifest, basePath = "", existingPaths = /* @__PURE__ */ new Set()) {
   if (!appPathsManifest) {
     return [];
   }
   const routes = [];
+  const emitted = /* @__PURE__ */ new Set();
   for (const routePath of Object.keys(appPathsManifest)) {
-    if (routePath.includes("/api/") && routePath.endsWith("/route")) {
-      const apiPath = routePath.replace(/\/route$/, "");
-      if (apiPath.includes("[")) {
-        continue;
-      }
-      const escapedPath = apiPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-      const src = `^${basePath}${escapedPath}$`;
-      routes.push({ src });
+    if (routePath.startsWith("/_")) {
+      continue;
+    }
+    let pagePath;
+    if (routePath.endsWith("/route")) {
+      pagePath = routePath.replace(/\/route$/, "");
+    } else if (routePath.endsWith("/page")) {
+      pagePath = routePath.replace(/\/page$/, "") || "/";
+    } else {
+      continue;
+    }
+    pagePath = pagePath.replace(/\/\([^)]+\)/g, "");
+    if (!pagePath) pagePath = "/";
+    if (pagePath.includes("@")) {
+      continue;
+    }
+    if (pagePath.includes("[")) {
+      continue;
+    }
+    if (pagePath === "/") {
+      continue;
+    }
+    if (existingPaths.has(pagePath)) {
+      continue;
+    }
+    if (emitted.has(pagePath)) {
+      continue;
     }
+    emitted.add(pagePath);
+    const escapedPath = pagePath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const src = `^${basePath}${escapedPath}(?:/)?$`;
+    routes.push({ src });
   }
   return routes;
 }
@@ -345,9 +367,10 @@ var createRouteMeta = async (ctx) => {
   if (dataRoutes.length > 0) {
     routes.push(...getDataRoutes(dataRoutes, basePath));
   }
-  const apiRoutes = getApiRoutes(appPathsManifest, basePath);
-  if (apiRoutes.length > 0) {
-    routes.push(...apiRoutes);
+  const existingPaths = new Set(staticRoutes.map((r) => r.page));
+  const appRoutes = getAppRoutes(appPathsManifest, basePath, existingPaths);
+  if (appRoutes.length > 0) {
+    routes.push(...appRoutes);
   }
   routes.push({
     src: `^${basePath}/.*$`

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