fix(builtin): fix linker common path reduction bug where reduced path…

… conflicts with node_modules
bazelbuild · May 29, 2020 · 3b5350b · 3b5350b
1 parent 54cae78
commit 3b5350b
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 134 deletions.
diff --git a/internal/linker/index.js b/internal/linker/index.js
@@ -247,15 +247,6 @@ function liftElement(element) {
     if (link && allElementsAlignUnder(name, link, children)) {
         return { name, link };
     }
-    if (!link && allElementsAlign(name, children)) {
-        return {
-            name,
-            link: toParentLink(children[0].link),
-        };
-    }
-    if (children.length === 1 && !link) {
-        return children[0];
-    }
     return element;
 }
 function toParentLink(link) {

diff --git a/internal/linker/link_node_modules.ts b/internal/linker/link_node_modules.ts
@@ -409,21 +409,6 @@ function liftElement(element: LinkerTreeElement): LinkerTreeElement {
     return {name, link};
   }
 
-  // No link but all child elements have aligning links
-  // => the link can be lifted to here
-  if (!link && allElementsAlign(name, children)) {
-    return {
-      name,
-      link: toParentLink(children[0].link!),
-    };
-  }
-
-  // Only a single child and this element is just a directory (no link) => only need the child link
-  // Do this last only after trying to lift child links up
-  if (children.length === 1 && !link) {
-    return children[0];
-  }
-
   return element;
 }