@modern-js/runtime 2.68.7 → 2.68.9

package/dist/cjs/router/cli/code/nestedRoutes.js

@@ -76,7 +76,7 @@ const optimizeRoute = (routeTree) => {
   const { children } = routeTree;
   if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
     const newRoutes = children.map((child) => {
-      const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
+      const routePath = routeTree.path ? `${routeTree.path}${child.path ? `/${child.path}` : ""}` : child.path || "";
       const newRoute = {
         ...child,
         path: routePath.replace(/\/\//g, "/")

package/dist/cjs/router/runtime/plugin.js

@@ -105,7 +105,10 @@ const routerPlugin = (userConfig = {}) => {
         if (!finalRouteConfig.routes && !createRoutes) {
           return App;
         }
-        const selectBasePath = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
+        const selectBasePath = (pathname) => {
+          const match = serverBase.find((baseUrl) => isSegmentPrefix(pathname, baseUrl));
+          return match || "/";
+        };
         const RouterWrapper = (props) => {
           const { router, routes } = useRouterCreation({
             ...props,
@@ -152,6 +155,16 @@ const safeUse = (promise) => {
   }
   return null;
 };
+function normalizeBase(b) {
+  if (b.length > 1 && b.endsWith("/"))
+    return b.slice(0, -1);
+  return b || "/";
+}
+function isSegmentPrefix(pathname, base) {
+  const b = normalizeBase(base);
+  const p = pathname || "/";
+  return p === b || p.startsWith(`${b}/`);
+}
 function useRouterCreation(props, options) {
   const { api, createRoutes, supportHtml5History, selectBasePath, basename } = options;
   const runtimeContext = (0, import_react.useContext)(import_core.RuntimeReactContext);

package/dist/esm/router/cli/code/nestedRoutes.js

@@ -43,7 +43,7 @@ var optimizeRoute = function(routeTree) {
   var children = routeTree.children;
   if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
     var newRoutes = children.map(function(child) {
-      var routePath = "".concat(routeTree.path ? routeTree.path : "").concat(child.path ? "/".concat(child.path) : "");
+      var routePath = routeTree.path ? "".concat(routeTree.path).concat(child.path ? "/".concat(child.path) : "") : child.path || "";
       var newRoute = _object_spread_props(_object_spread({}, child), {
         path: routePath.replace(/\/\//g, "/")
       });

package/dist/esm/router/runtime/plugin.js

@@ -73,9 +73,10 @@ var routerPlugin = function() {
           return App;
         }
         var selectBasePath = function(pathname) {
-          return serverBase.find(function(baseUrl) {
-            return pathname.search(baseUrl) === 0;
-          }) || "/";
+          var match = serverBase.find(function(baseUrl) {
+            return isSegmentPrefix(pathname, baseUrl);
+          });
+          return match || "/";
         };
         var RouterWrapper = function(props) {
           var _useRouterCreation = useRouterCreation(_object_spread_props(_object_spread({}, props), {
@@ -126,6 +127,16 @@ var safeUse = function(promise) {
   }
   return null;
 };
+function normalizeBase(b) {
+  if (b.length > 1 && b.endsWith("/"))
+    return b.slice(0, -1);
+  return b || "/";
+}
+function isSegmentPrefix(pathname, base) {
+  var b = normalizeBase(base);
+  var p = pathname || "/";
+  return p === b || p.startsWith("".concat(b, "/"));
+}
 function useRouterCreation(props, options) {
   var api = options.api, createRoutes = options.createRoutes, supportHtml5History = options.supportHtml5History, selectBasePath = options.selectBasePath, basename = options.basename;
   var runtimeContext = useContext(RuntimeReactContext);

package/dist/esm-node/router/cli/code/nestedRoutes.js

@@ -41,7 +41,7 @@ const optimizeRoute = (routeTree) => {
   const { children } = routeTree;
   if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
     const newRoutes = children.map((child) => {
-      const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
+      const routePath = routeTree.path ? `${routeTree.path}${child.path ? `/${child.path}` : ""}` : child.path || "";
       const newRoute = {
         ...child,
         path: routePath.replace(/\/\//g, "/")

package/dist/esm-node/router/runtime/plugin.js

@@ -69,7 +69,10 @@ const routerPlugin = (userConfig = {}) => {
         if (!finalRouteConfig.routes && !createRoutes) {
           return App;
         }
-        const selectBasePath = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
+        const selectBasePath = (pathname) => {
+          const match = serverBase.find((baseUrl) => isSegmentPrefix(pathname, baseUrl));
+          return match || "/";
+        };
         const RouterWrapper = (props) => {
           const { router, routes } = useRouterCreation({
             ...props,
@@ -116,6 +119,16 @@ const safeUse = (promise) => {
   }
   return null;
 };
+function normalizeBase(b) {
+  if (b.length > 1 && b.endsWith("/"))
+    return b.slice(0, -1);
+  return b || "/";
+}
+function isSegmentPrefix(pathname, base) {
+  const b = normalizeBase(base);
+  const p = pathname || "/";
+  return p === b || p.startsWith(`${b}/`);
+}
 function useRouterCreation(props, options) {
   const { api, createRoutes, supportHtml5History, selectBasePath, basename } = options;
   const runtimeContext = useContext(RuntimeReactContext);

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.7",
+  "version": "2.68.9",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -219,13 +219,13 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.2",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.68.7",
-    "@modern-js/plugin-data-loader": "2.68.7",
-    "@modern-js/plugin-v2": "2.68.7",
-    "@modern-js/runtime-utils": "2.68.7",
-    "@modern-js/render": "2.68.7",
-    "@modern-js/types": "2.68.7",
-    "@modern-js/utils": "2.68.7"
+    "@modern-js/plugin": "2.68.9",
+    "@modern-js/plugin-data-loader": "2.68.9",
+    "@modern-js/plugin-v2": "2.68.9",
+    "@modern-js/render": "2.68.9",
+    "@modern-js/runtime-utils": "2.68.9",
+    "@modern-js/types": "2.68.9",
+    "@modern-js/utils": "2.68.9"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -233,7 +233,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.4.14",
+    "@rsbuild/core": "1.4.15",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -249,10 +249,10 @@
     "ts-node": "^10.9.1",
     "typescript": "^5",
     "webpack": "^5.101.0",
+    "@modern-js/app-tools": "2.68.9",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0",
-    "@modern-js/app-tools": "2.68.7",
-    "@modern-js/core": "2.68.7"
+    "@modern-js/core": "2.68.9"
   },
   "sideEffects": false,
   "publishConfig": {