@modern-js/runtime 2.54.0 → 2.54.2

package/dist/cjs/cli/entry.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var entry_exports = {};
 __export(entry_exports, {
+  hasApp: () => hasApp,
   isRuntimeEntry: () => isRuntimeEntry
 });
 module.exports = __toCommonJS(entry_exports);
@@ -38,5 +39,6 @@ const hasApp = (dir) => (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.
 const isRuntimeEntry = (dir) => hasApp(dir);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  hasApp,
   isRuntimeEntry
 });

package/dist/cjs/router/cli/entry.js

@@ -36,6 +36,7 @@ __export(entry_exports, {
 module.exports = __toCommonJS(entry_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_entry = require("../../cli/entry");
 var import_constants = require("./constants");
 const hasPages = (dir) => import_utils.fs.existsSync(import_path.default.join(dir, import_constants.PAGES_DIR_NAME));
 const hasNestedRoutes = (dir) => import_utils.fs.existsSync(import_path.default.join(dir, import_constants.NESTED_ROUTES_DIR));
@@ -53,6 +54,10 @@ const modifyEntrypoints = (entrypoints, config = {}) => {
     if (!entrypoint.isAutoMount) {
       return entrypoint;
     }
+    const isHasApp = (0, import_entry.hasApp)(entrypoint.absoluteEntryDir);
+    if (isHasApp) {
+      return entrypoint;
+    }
     const isHasNestedRoutes = hasNestedRoutes(entrypoint.absoluteEntryDir);
     const isHasPages = hasPages(entrypoint.absoluteEntryDir);
     if (!isHasNestedRoutes && !isHasPages) {

package/dist/esm/cli/entry.js

@@ -10,5 +10,6 @@ var isRuntimeEntry = function(dir) {
   return hasApp(dir);
 };
 export {
+  hasApp,
   isRuntimeEntry
 };

package/dist/esm/router/cli/entry.js

@@ -1,5 +1,6 @@
 import path from "path";
 import { JS_EXTENSIONS, findExists, fs, isRouterV5 } from "@modern-js/utils";
+import { hasApp } from "../../cli/entry";
 import { FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR, PAGES_DIR_NAME } from "./constants";
 var hasPages = function(dir) {
   return fs.existsSync(path.join(dir, PAGES_DIR_NAME));
@@ -22,6 +23,10 @@ var modifyEntrypoints = function(entrypoints) {
     if (!entrypoint.isAutoMount) {
       return entrypoint;
     }
+    var isHasApp = hasApp(entrypoint.absoluteEntryDir);
+    if (isHasApp) {
+      return entrypoint;
+    }
     var isHasNestedRoutes = hasNestedRoutes(entrypoint.absoluteEntryDir);
     var isHasPages = hasPages(entrypoint.absoluteEntryDir);
     if (!isHasNestedRoutes && !isHasPages) {

package/dist/esm-node/cli/entry.js

@@ -4,5 +4,6 @@ import { APP_FILE_NAME } from "./constants";
 const hasApp = (dir) => findExists(JS_EXTENSIONS.map((ext) => path.resolve(dir, `${APP_FILE_NAME}${ext}`)));
 const isRuntimeEntry = (dir) => hasApp(dir);
 export {
+  hasApp,
   isRuntimeEntry
 };

package/dist/esm-node/router/cli/entry.js

@@ -1,5 +1,6 @@
 import path from "path";
 import { JS_EXTENSIONS, findExists, fs, isRouterV5 } from "@modern-js/utils";
+import { hasApp } from "../../cli/entry";
 import { FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT, NESTED_ROUTES_DIR, PAGES_DIR_NAME } from "./constants";
 const hasPages = (dir) => fs.existsSync(path.join(dir, PAGES_DIR_NAME));
 const hasNestedRoutes = (dir) => fs.existsSync(path.join(dir, NESTED_ROUTES_DIR));
@@ -17,6 +18,10 @@ const modifyEntrypoints = (entrypoints, config = {}) => {
     if (!entrypoint.isAutoMount) {
       return entrypoint;
     }
+    const isHasApp = hasApp(entrypoint.absoluteEntryDir);
+    if (isHasApp) {
+      return entrypoint;
+    }
     const isHasNestedRoutes = hasNestedRoutes(entrypoint.absoluteEntryDir);
     const isHasPages = hasPages(entrypoint.absoluteEntryDir);
     if (!isHasNestedRoutes && !isHasPages) {

package/dist/types/cli/entry.d.ts

@@ -1 +1,2 @@
+export declare const hasApp: (dir: string) => string | false;
 export declare const isRuntimeEntry: (dir: string) => string | false;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.54.0",
+  "version": "2.54.2",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -195,11 +195,11 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/plugin": "2.54.0",
-    "@modern-js/types": "2.54.0",
-    "@modern-js/runtime-utils": "2.54.0",
-    "@modern-js/plugin-data-loader": "2.54.0",
-    "@modern-js/utils": "2.54.0"
+    "@modern-js/plugin": "2.54.2",
+    "@modern-js/types": "2.54.2",
+    "@modern-js/utils": "2.54.2",
+    "@modern-js/plugin-data-loader": "2.54.2",
+    "@modern-js/runtime-utils": "2.54.2"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -220,11 +220,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.92.0",
-    "@modern-js/app-tools": "2.54.0",
-    "@modern-js/core": "2.54.0",
-    "@modern-js/server-core": "2.54.0",
-    "@scripts/build": "2.54.0",
-    "@scripts/jest-config": "2.54.0"
+    "@modern-js/app-tools": "2.54.2",
+    "@modern-js/server-core": "2.54.2",
+    "@modern-js/core": "2.54.2",
+    "@scripts/build": "2.54.2",
+    "@scripts/jest-config": "2.54.2"
   },
   "sideEffects": false,
   "publishConfig": {