Cleanup .bin folders from node_modules (#1213)

yarnpkg · Apr 17, 2020 · a17c83c · a17c83c
1 parent fc6ccb2
commit a17c83c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/.yarn/versions/1007e617.yml b/.yarn/versions/1007e617.yml
@@ -0,0 +1,20 @@
+releases:
+  "@yarnpkg/cli": prerelease
+  "@yarnpkg/plugin-pnp": prerelease
+
+declined:
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-node-modules"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"
diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/pnp.test.js b/packages/acceptance-tests/pkg-tests-specs/sources/pnp.test.js
@@ -1371,6 +1371,7 @@ describe(`Plug'n'Play`, () => {
   test(
     `it should remove lingering folders from the node_modules even when they contain dot-folders`,
     makeTemporaryEnv({}, async ({path, run, source}) => {
+      await xfs.mkdirpPromise(`${path}/node_modules/.bin`);
       await xfs.mkdirpPromise(`${path}/node_modules/.cache`);
       await xfs.mkdirpPromise(`${path}/node_modules/foo`);
 

diff --git a/packages/plugin-pnp/sources/PnpLinker.ts b/packages/plugin-pnp/sources/PnpLinker.ts
@@ -178,7 +178,7 @@ export class PnpInstaller extends AbstractPnpInstaller {
       });
 
       const nonCacheEntries = directoryListing.filter(entry => {
-        return !entry.isDirectory() || !entry.name.startsWith(`.`);
+        return !entry.isDirectory() || entry.name === '.bin' || !entry.name.startsWith(`.`);
       });
 
       if (nonCacheEntries.length === directoryListing.length) {