fix broken test and esm shim

huozhi · Jan 11, 2025 · 6791d6c · 6791d6c
1 parent 90d4e2d
commit 6791d6c
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 13 deletions.
diff --git a/test/integration/dynamic-require/dynamic-require.test.ts b/test/integration/dynamic-require/dynamic-require.test.ts
@@ -1,5 +1,5 @@
 import fs from 'fs'
-import { createIntegrationTest, getFileNamesFromDirectory } from 'testing-utils'
+import { createIntegrationTest, getFileNamesFromDirectory } from '../utils'
 
 describe('integration - dynamic-require', () => {
   it('should work', async () => {

diff --git a/test/integration/esm-shims/index.test.ts b/test/integration/esm-shims/index.test.ts
@@ -1,4 +1,8 @@
-import { createIntegrationTest, assertFilesContent } from '../utils'
+import {
+  createIntegrationTest,
+  assertFilesContent,
+  getFileContents,
+} from '../utils'
 
 describe('integration esm-shims', () => {
   it('should work with ESM shims', async () => {
@@ -15,7 +19,6 @@ describe('integration esm-shims', () => {
           'const __dirname = __node_cjsPath.dirname(__filename)'
 
         await assertFilesContent(distDir, {
-          'require.mjs': requirePolyfill,
           'filename.mjs': filenamePolyfill,
           'dirname.mjs': dirnamePolyfill,
           'custom-require.mjs': (code) => !code.includes(requirePolyfill),
@@ -24,6 +27,11 @@ describe('integration esm-shims', () => {
           'dirname.js': /__dirname/,
           'custom-require.js': (code) => !code.includes(requirePolyfill),
         })
+
+        const contents = await getFileContents(distDir, ['require.mjs'])
+        expect(contents['require.mjs']).not.toContain(requirePolyfill)
+        expect(contents['require.mjs']).toContain('function getRequireModule')
+        expect(contents['require.mjs']).toContain('import.meta.url')
       },
     )
   })

diff --git a/test/integration/unspecified-types-paths/index.test.ts b/test/integration/unspecified-types-paths/index.test.ts
@@ -1,7 +1,10 @@
-import fs from 'fs'
-import { assertFilesContent, createIntegrationTest } from '../utils'
+import {
+  assertFilesContent,
+  createIntegrationTest,
+  getFileNamesFromDirectory,
+} from '../utils'
 
-describe('integration tsconfig-override', () => {
+describe('integration - tsconfig-override', () => {
   it('should not generate js types paths if not specified', async () => {
     await createIntegrationTest(
       {
@@ -12,8 +15,11 @@ describe('integration tsconfig-override', () => {
           './dist/subpath/nested.js': 'subpath/nested',
           './dist/subpath/nested.cjs': 'subpath/nested',
         })
-        const subpathTypes = await import(`${dir}/dist/index.js`)
-        expect(fs.existsSync(subpathTypes)).toBe(false)
+        // No types files should be generated
+        expect(await getFileNamesFromDirectory(dir)).toEqual([
+          'dist/subpath/nested.cjs',
+          'dist/subpath/nested.js',
+        ])
       },
     )
   })

diff --git a/test/testing-utils.ts b/test/testing-utils.ts
@@ -37,6 +37,17 @@ export function assertContainFiles(dir: string, filePaths: string[]) {
 
 type FunctionCondition = (content: string) => Boolean
 
+export async function getFileContents(dir: string, filePaths?: string[]) {
+  const results: Record<string, string> = {}
+  const files = filePaths || (await fsp.readdir(dir))
+  for (const file of files) {
+    const fullPath = path.resolve(dir, file)
+    const content = await fsp.readFile(fullPath, { encoding: 'utf-8' })
+    results[file] = content
+  }
+  return results
+}
+
 export async function assertFilesContent(
   dir: string,
   conditionMap: Record<string, RegExp | string | FunctionCondition>,

diff --git a/test/tsconfig.json b/test/tsconfig.json
@@ -5,15 +5,20 @@
     "target": "ESNext",
     "strict": false,
     "jsx": "preserve",
-    "baseUrl": ".",
+    "baseUrl": "..",
     "paths": {
-      "bunchee": ["../src/index.ts"],
-      "testing-utils": ["./integration/utils.ts"]
+      "bunchee": ["./src/index.ts"]
     }
   },
   "include": [
-    "../src/**/*.test.ts",
-    "../src/**/*.test.tsx"
+    "./test/**/*.test.ts",
+    "./test**/*.test.tsx",
+    // TODO: group those internal utils
+    "./test/utils/*",
+    "./test/testing-utils.ts",
+    "./test/integration/utils.ts",
+    "./src/**/*.test.ts",
+    "./src/**/*.test.tsx"
   ],
   "references": [{ "path": "../tsconfig.json" }]
 }