fix: when the enableCustomEntry is set to true, the entry.tsx should …

…be recognized first (#6420)
web-infra-dev · Oct 22, 2024 · 0c072d8 · 0c072d8
1 parent c686e60
commit 0c072d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.changeset/nine-turkeys-hope.md b/.changeset/nine-turkeys-hope.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/app-tools': patch
+---
+
+fix: when the enableCustomEntry is set to true, the `entry.tsx` should be recognized first.
+
+fix: 开启 enableCustomEntry 后， `entry.tsx` 入口应优先被识别
diff --git a/packages/solutions/app-tools/src/plugins/analyze/getFileSystemEntry.ts b/packages/solutions/app-tools/src/plugins/analyze/getFileSystemEntry.ts
@@ -67,7 +67,7 @@ const scanDir = async (
       const customEntryFile = hasEntry(dir);
       const customServerEntry = hasServerEntry(dir);
 
-      if (indexFile && !customBootstrap) {
+      if (!enableCustomEntry && indexFile && !customBootstrap) {
         return {
           entryName,
           isMainEntry: false,
@@ -97,6 +97,7 @@ const scanDir = async (
           customEntry: enableCustomEntry ? Boolean(customEntryFile) : false,
         };
       }
+
       if (enableCustomEntry && customEntryFile) {
         return {
           entryName,
@@ -108,6 +109,7 @@ const scanDir = async (
           customEntry: Boolean(customEntryFile),
         };
       }
+
       return false;
     }),
   ).then(entries => entries.filter(Boolean) as Entrypoint[]);