test: re-enable test

huozhi · Jan 25, 2025 · 93c1904 · 93c1904
1 parent f6390b4
commit 93c1904
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/util/file-path.test.ts b/src/util/file-path.test.ts
@@ -40,7 +40,7 @@ describe('validateEntryFiles', () => {
       validateEntryFiles(['index.js', 'index/index.ts']),
     ).toThrowError('Conflicted entry files found for entries: .')
   })
-  it.only('should throw error if the normalized base names are same', () => {
+  it('should throw error if the normalized base names are same', () => {
     expect(() => validateEntryFiles(['foo/index.jsx', 'foo.ts'])).toThrowError(
       'Conflicted entry files found for entries: ./foo',
     )

diff --git a/src/util/file-path.ts b/src/util/file-path.ts
@@ -29,10 +29,11 @@ export function validateEntryFiles(entryFiles: string[]) {
       .slice(0, -path.extname(filePath).length)
       .replace(/\\/g, '/')
     const segments = filePathWithoutExt.split('/')
-    const lastSegment = segments.pop() || ''
 
-    if (lastSegment !== 'index' && lastSegment !== '') {
-      segments.push(lastSegment)
+    let lastSegment = segments[segments.length - 1]
+    while (lastSegment && (lastSegment === 'index' || lastSegment === '')) {
+      segments.pop()
+      lastSegment = segments[segments.length - 1]
     }
     const fileBasePath = segments.join('/')
 

diff --git a/vitest.config.js b/vitest.config.js
@@ -14,7 +14,8 @@ export default defineConfig({
       '**/test/fixtures/**',
     ],
     // Test timeout
-    testTimeout: 60000,
+    testTimeout: 60 * 1000,
+    hookTimeout: 20 * 1000,
   },
   resolve: {
     conditions: ['import', 'default'], // Prefer ES modules if available