Fix

bazel-contrib · Apr 20, 2019 · b885300 · b885300
1 parent 1de73a4
commit b885300
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/internal/npm_install/generate_build_file.js b/internal/npm_install/generate_build_file.js
@@ -120,6 +120,10 @@ module.exports = {
  */
 function renameBazelFiles(pkg) {
   pkg._files = pkg._files.map(file => {
+    if (/^node_modules[/\\]/.test(file)) {
+      // don't rename files in nested node_modules
+      return file;
+    }
     const basename = path.basename(file);
     if (/^WORKSPACE$/i.test(basename) || /^BUILD$/i.test(basename) ||
         /^BUILD\.bazel$/i.test(basename)) {
@@ -680,9 +684,10 @@ function filterFiles(files, exts = []) {
   files = files.filter(f => !f.match(/[^\x21-\x7E]/));
   files = files.filter(f => {
     const basename = path.basename(f);
-    // Bazel files would have been renamed earlier with a _ prefix
-    if (/^_WORKSPACE$/i.test(basename) || /^_BUILD$/i.test(basename) ||
-        /^_BUILD\.bazel$/i.test(basename)) {
+    // Bazel files of non-nested node_modules would have been renamed earlier with a _ prefix
+    if (/^WORKSPACE$/i.test(basename) || /^BUILD$/i.test(basename) ||
+        /^BUILD\.bazel$/i.test(basename) || /^_WORKSPACE$/i.test(basename) ||
+        /^_BUILD$/i.test(basename) || /^_BUILD\.bazel$/i.test(basename)) {
       return false;
     } else {
       return true;