fix: correctly detect conflicting function names consistently (#1258)

netlify · Nov 7, 2022 · e7e3eb5 · e7e3eb5 · github-actions · Nov 7, 2022
1 parent a7517a7
commit e7e3eb5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/runtimes/node/finder.ts b/src/runtimes/node/finder.ts
@@ -74,6 +74,8 @@ const getMainFile = async function (srcPath: string, filename: string, stat: Sta
   if (stat.isDirectory()) {
     return await locatePath(
       [
+        // The order of these declarations is important, so that we always bundle the same way
+        // even if multiple files are found
         join(srcPath, `${filename}.js`),
         join(srcPath, 'index.js'),
         join(srcPath, `${filename}.ts`),
@@ -89,7 +91,7 @@ const getMainFile = async function (srcPath: string, filename: string, stat: Sta
         join(srcPath, `${filename}.cts`),
         join(srcPath, 'index.cts'),
       ],
-      { type: 'file', preserveOrder: false },
+      { type: 'file' },
     )
   }
 

diff --git a/tests/helpers/main.ts b/tests/helpers/main.ts
@@ -47,6 +47,8 @@ export const zipFixture = async function (
   const bundlerString = getBundlerNameFromConfig(config) || 'default'
   const { path: tmpDir } = await getTmpDir({
     prefix: `zip-it-test-bundler-${bundlerString}`,
+    // Cleanup the folder on process exit even if there are still files in them
+    unsafeCleanup: true,
   })
 
   if (env.ZISI_KEEP_TEMP_DIRS !== undefined) {

diff --git a/tests/helpers/test_many.ts b/tests/helpers/test_many.ts
@@ -73,7 +73,7 @@ export const makeTestMany = <M extends string>(
   const testFns = ['fails', 'only', 'concurrent', 'skip', 'todo']
 
   testFns.forEach((fn) => {
-    testBundlers[fn] = ((...args) => testBundlers(...args, test[fn])) as TestMany<M>
+    testBundlers[fn] = ((...args) => testBundlers(...args, testAPI[fn])) as TestMany<M>
   })
 
   return testBundlers as TestManyAPI<M | `todo:${M}`>