fix: dont generate build files in symlinked node_modules (#1111)

* fix: ignore symlinked packages fixes #871 * fix: skipping hide build fies for links in node_modules
bazel-contrib · Oct 9, 2019 · 2e7de34 · 2e7de34
1 parent f432f35
commit 2e7de34
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/internal/npm_install/generate_build_file.js b/internal/npm_install/generate_build_file.js
@@ -458,7 +458,13 @@ def _maybe(repo_rule, name, **kwargs):
             .filter(f => !f.startsWith('.'))
             .map(f => path.posix.join(p, f))
             .filter(f => isDirectory(f));
-        packages.forEach(f => pkgs.push(parsePackage(f), ...findPackages(path.posix.join(f, 'node_modules'))));
+        packages.forEach(f => {
+            let hide = true;
+            if (fs.lstatSync(f).isSymbolicLink()) {
+                hide = false;
+            }
+            pkgs.push(parsePackage(f, hide), ...findPackages(path.posix.join(f, 'node_modules')));
+        });
         const scopes = listing.filter(f => f.startsWith('@'))
             .map(f => path.posix.join(p, f))
             .filter(f => isDirectory(f));
@@ -486,7 +492,7 @@ def _maybe(repo_rule, name, **kwargs):
      * package json and return it as an object along with
      * some additional internal attributes prefixed with '_'.
      */
-    function parsePackage(p) {
+    function parsePackage(p, hide = true) {
         // Parse the package.json file of this package
         const packageJson = path.posix.join(p, 'package.json');
         const pkg = isFile(packageJson) ? JSON.parse(fs.readFileSync(packageJson, { encoding: 'utf8' })) :
@@ -509,7 +515,8 @@ def _maybe(repo_rule, name, **kwargs):
         // Hide bazel files in this package. We do this before parsing
         // the next package to prevent issues caused by symlinks between
         // package and nested packages setup by the package manager.
-        hideBazelFiles(pkg);
+        if (hide)
+            hideBazelFiles(pkg);
         return pkg;
     }
     /**

diff --git a/internal/npm_install/generate_build_file.ts b/internal/npm_install/generate_build_file.ts
@@ -504,8 +504,13 @@ function findPackages(p = 'node_modules') {
                        .map(f => path.posix.join(p, f))
                        .filter(f => isDirectory(f));
 
-  packages.forEach(
-      f => pkgs.push(parsePackage(f), ...findPackages(path.posix.join(f, 'node_modules'))));
+  packages.forEach(f => {
+    let hide = true;
+    if (fs.lstatSync(f).isSymbolicLink()) {
+      hide = false;
+    }
+    pkgs.push(parsePackage(f, hide), ...findPackages(path.posix.join(f, 'node_modules')))
+  });
 
   const scopes = listing.filter(f => f.startsWith('@'))
                      .map(f => path.posix.join(p, f))
@@ -541,7 +546,7 @@ function findScopes() {
  * package json and return it as an object along with
  * some additional internal attributes prefixed with '_'.
  */
-function parsePackage(p: string): Dep {
+function parsePackage(p: string, hide: boolean = true): Dep {
   // Parse the package.json file of this package
   const packageJson = path.posix.join(p, 'package.json');
   const pkg = isFile(packageJson) ? JSON.parse(fs.readFileSync(packageJson, {encoding: 'utf8'})) :
@@ -571,7 +576,7 @@ function parsePackage(p: string): Dep {
   // Hide bazel files in this package. We do this before parsing
   // the next package to prevent issues caused by symlinks between
   // package and nested packages setup by the package manager.
-  hideBazelFiles(pkg);
+  if (hide) hideBazelFiles(pkg);
 
   return pkg;
 }