Fix yarnpkg#5816: Trailing slash with workspaces

j-maas · May 15, 2018 · d626b1c · d626b1c
1 parent f72f5a1
commit d626b1c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/config.js b/src/config.js
@@ -633,7 +633,15 @@ export default class Config {
       const ws = extractWorkspaces(manifest);
       if (ws && ws.packages) {
         const relativePath = path.relative(current, initial);
-        if (relativePath === '' || micromatch([relativePath], ws.packages).length > 0) {
+        // Make packages trailing-slash-agnostic
+        const sanitizedPackages = ws.packages.map(packageGlob => {
+          if (packageGlob.endsWith('/')) {
+            packageGlob = packageGlob.slice(0, -1);
+          }
+          return packageGlob + '{,/}';
+        });
+
+        if (relativePath === '' || micromatch.any(relativePath, sanitizedPackages)) {
           return current;
         } else {
           return null;