@modern-js/app-tools 2.39.2-alpha.0 → 2.39.2-alpha.1

package/dist/cjs/analyze/getBundleEntry.js

@@ -42,12 +42,20 @@ const ensureExtensions = (file) => {
   return file;
 };
 const isDirectory = (file) => !import_path.default.extname(file);
+const isSubDirOrEqual = (parent, child) => {
+  if (parent === child) {
+    return true;
+  }
+  const relative = import_path.default.relative(parent, child);
+  const isSubdir = relative && !relative.startsWith("..") && !import_path.default.isAbsolute(relative);
+  return Boolean(isSubdir);
+};
 const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
   if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
     checked.entryName = entrypoint.entryName;
     return true;
   }
-  if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
+  if (isSubDirOrEqual(entrypoint.entry, checked.entry) || isSubDirOrEqual(checked.entry, entrypoint.entry)) {
     throw new Error(`Entry configuration conflicts
  Your configuration: ${checked.entry}.
  Default entrypoint: ${entrypoint.entry}

package/dist/cjs/analyze/nestedRoutes.js

@@ -79,7 +79,7 @@ const optimizeRoute = (routeTree) => {
   }
   const { children } = routeTree;
   const hasPage = children.some((child) => child.index);
-  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData && !hasPage) {
     const newRoutes = children.map((child) => {
       const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
       const newRoute = {
@@ -285,7 +285,6 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
     throw new Error("The root layout component is required, make sure the routes/layout.tsx file exists.");
   }
   if (isRoot && !oldVersion) {
-    console.log("oooooooooooo");
     const optimizedRoutes = optimizeRoute(finalRoute);
     return optimizedRoutes;
   }

package/dist/esm/analyze/getBundleEntry.js

@@ -13,13 +13,21 @@ var ensureExtensions = function(file) {
 var isDirectory = function(file) {
   return !path.extname(file);
 };
+var isSubDirOrEqual = function(parent, child) {
+  if (parent === child) {
+    return true;
+  }
+  var relative = path.relative(parent, child);
+  var isSubdir = relative && !relative.startsWith("..") && !path.isAbsolute(relative);
+  return Boolean(isSubdir);
+};
 var ifAlreadyExists = function(entrypoints, checked) {
   return entrypoints.some(function(entrypoint) {
     if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
       checked.entryName = entrypoint.entryName;
       return true;
     }
-    if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
+    if (isSubDirOrEqual(entrypoint.entry, checked.entry) || isSubDirOrEqual(checked.entry, entrypoint.entry)) {
       throw new Error("Entry configuration conflicts\n Your configuration: ".concat(checked.entry, ".\n Default entrypoint: ").concat(entrypoint.entry, "\n Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules."));
     }
     return false;

package/dist/esm/analyze/nestedRoutes.js

@@ -48,7 +48,7 @@ var optimizeRoute = function(routeTree) {
   var hasPage = children.some(function(child) {
     return child.index;
   });
-  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData && !hasPage) {
     var newRoutes = children.map(function(child) {
       var routePath = "".concat(routeTree.path ? routeTree.path : "").concat(child.path ? "/".concat(child.path) : "");
       var newRoute = _object_spread_props(_object_spread({}, child), {
@@ -379,7 +379,6 @@ var walk = function() {
             throw new Error("The root layout component is required, make sure the routes/layout.tsx file exists.");
           }
           if (isRoot && !oldVersion) {
-            console.log("oooooooooooo");
             optimizedRoutes = optimizeRoute(finalRoute);
             return [
               2,

package/dist/esm-node/analyze/getBundleEntry.js

@@ -9,12 +9,20 @@ const ensureExtensions = (file) => {
   return file;
 };
 const isDirectory = (file) => !path.extname(file);
+const isSubDirOrEqual = (parent, child) => {
+  if (parent === child) {
+    return true;
+  }
+  const relative = path.relative(parent, child);
+  const isSubdir = relative && !relative.startsWith("..") && !path.isAbsolute(relative);
+  return Boolean(isSubdir);
+};
 const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
   if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
     checked.entryName = entrypoint.entryName;
     return true;
   }
-  if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
+  if (isSubDirOrEqual(entrypoint.entry, checked.entry) || isSubDirOrEqual(checked.entry, entrypoint.entry)) {
     throw new Error(`Entry configuration conflicts
  Your configuration: ${checked.entry}.
  Default entrypoint: ${entrypoint.entry}

package/dist/esm-node/analyze/nestedRoutes.js

@@ -44,7 +44,7 @@ const optimizeRoute = (routeTree) => {
   }
   const { children } = routeTree;
   const hasPage = children.some((child) => child.index);
-  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData) {
+  if (!routeTree._component && !routeTree.error && !routeTree.loading && !routeTree.config && !routeTree.clientData && !hasPage) {
     const newRoutes = children.map((child) => {
       const routePath = `${routeTree.path ? routeTree.path : ""}${child.path ? `/${child.path}` : ""}`;
       const newRoute = {
@@ -250,7 +250,6 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
     throw new Error("The root layout component is required, make sure the routes/layout.tsx file exists.");
   }
   if (isRoot && !oldVersion) {
-    console.log("oooooooooooo");
     const optimizedRoutes = optimizeRoute(finalRoute);
     return optimizedRoutes;
   }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.39.2-alpha.0",
+  "version": "2.39.2-alpha.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -77,19 +77,19 @@
     "@modern-js/builder-plugin-node-polyfill": "2.39.1",
     "@modern-js/builder-shared": "2.39.1",
     "@modern-js/builder-webpack-provider": "2.39.1",
-    "@modern-js/new-action": "2.39.1",
     "@modern-js/core": "2.39.1",
+    "@modern-js/new-action": "2.39.1",
     "@modern-js/node-bundle-require": "2.39.1",
     "@modern-js/plugin": "2.39.1",
-    "@modern-js/plugin-data-loader": "2.39.1",
     "@modern-js/plugin-i18n": "2.39.1",
+    "@modern-js/plugin-data-loader": "2.39.1",
     "@modern-js/plugin-lint": "2.39.1",
-    "@modern-js/server": "2.39.1",
     "@modern-js/prod-server": "2.39.1",
-    "@modern-js/types": "2.39.1",
-    "@modern-js/server-core": "2.39.1",
+    "@modern-js/server": "2.39.1",
     "@modern-js/upgrade": "2.39.1",
-    "@modern-js/utils": "2.39.1"
+    "@modern-js/types": "2.39.1",
+    "@modern-js/utils": "2.39.1",
+    "@modern-js/server-core": "2.39.1"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -98,10 +98,10 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@scripts/build": "2.39.1",
     "@modern-js/builder-plugin-swc": "2.39.1",
-    "@modern-js/builder-rspack-provider": "2.39.1",
-    "@scripts/jest-config": "2.39.1"
+    "@scripts/build": "2.39.1",
+    "@scripts/jest-config": "2.39.1",
+    "@modern-js/builder-rspack-provider": "2.39.1"
   },
   "peerDependencies": {
     "@modern-js/builder-rspack-provider": "^2.39.1"