fix: ignore directories.bin if bin is present

npm · Jun 1, 2023 · 3b603c4 · 3b603c4
1 parent adb0c17
commit 3b603c4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/normalize.js b/lib/normalize.js
@@ -158,7 +158,7 @@ const normalize = async (pkg, { strict, steps }) => {
   }
 
   // expand "directories.bin"
-  if (steps.includes('binDir') && data.directories?.bin) {
+  if (steps.includes('binDir') && data.directories?.bin && !data.bin) {
     const binsDir = path.resolve(pkg.path, path.join('.', path.join('/', data.directories.bin)))
     const bins = await glob('**', { cwd: binsDir })
     data.bin = bins.reduce((acc, binFile) => {

diff --git a/test/prepare.js b/test/prepare.js
@@ -95,6 +95,25 @@ t.test('bin', t => {
     t.strictSame(content.bin, { echo: 'bin/echo' })
   })
 
+  t.test('directories.bin with bin', async t => {
+    const { content } = await pkg.prepare(t.testdir({
+      'package.json': JSON.stringify({
+        name: 'bin-test',
+        directories: {
+          bin: './bin',
+        },
+        bin: {
+          echo: './bin/echo',
+        },
+      }),
+      bin: {
+        echo: '#!/bin/sh\n\necho "hello world"',
+        echo2: '#!/bin/sh\n\necho "hello world2"',
+      },
+    }))
+    t.strictSame(content.bin, { echo: 'bin/echo' })
+  })
+
   t.end()
 })