From 82500debdef83ff74f229a5f02800d7fa3a4b09c Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Fri, 19 Jul 2019 11:37:37 -0400
Subject: [PATCH] fix: node runfiles resolution from external workspaces

---
 internal/node/node_loader.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/internal/node/node_loader.js b/internal/node/node_loader.js
index 9fc148e0ce..051d1b1eca 100644
--- a/internal/node/node_loader.js
+++ b/internal/node/node_loader.js
@@ -276,15 +276,19 @@ function resolveManifestDirectory(res) {
 
 function resolveRunfiles(parent, ...pathSegments) {
   // Remove any empty strings from pathSegments
-  pathSegments = pathSegments.filter(segment => segment);
+  // Normalize to forward slash, because even on Windows the runfiles_manifest file
+  // is written with forward slash.
+  let runfilesEntry = pathSegments.filter(segment => segment).join('/').replace(/\\/g, '/');
+
+  // Trim `${USER_WORKSPACE_NAME}/external/` from start of runfilesEntry
+  const externalWorkspacePrefix = `${USER_WORKSPACE_NAME}/external/`;
+  if (runfilesEntry.startsWith(externalWorkspacePrefix)) {
+    runfilesEntry = runfilesEntry.slice(externalWorkspacePrefix.length);
+  }
 
-  const defaultPath = path.join(process.env.RUNFILES, ...pathSegments);
+  const runfilesPath = path.join(process.env.RUNFILES, runfilesEntry);
 
   if (runfilesManifest) {
-    // Normalize to forward slash, because even on Windows the runfiles_manifest file
-    // is written with forward slash.
-    let runfilesEntry = pathSegments.join('/').replace(/\\/g, '/');
-
     if (parent && runfilesEntry.startsWith('.')) {
       // Resolve relative paths from manifest files.
       const normalizedParent = parent.replace(/\\/g, '/');
@@ -321,29 +325,28 @@ function resolveRunfiles(parent, ...pathSegments) {
       return maybe;
     }
   } else {
-    if (DEBUG) console.error('node_loader: try to resolve in runfiles', defaultPath);
+    if (DEBUG) console.error('node_loader: try to resolve in runfiles', runfilesPath);
 
-    let maybe = loadAsFileSync(defaultPath);
+    let maybe = loadAsFileSync(runfilesPath);
     if (maybe) {
       if (DEBUG) console.error('node_loader: resolved file', maybe);
       return maybe;
     }
 
-    maybe = loadAsDirectorySync(defaultPath);
+    maybe = loadAsDirectorySync(runfilesPath);
     if (maybe) {
       if (DEBUG) console.error('node_loader: resolved via directory', maybe);
       return maybe;
     }
   }
 
-  return defaultPath;
+  return runfilesPath;
 }
 
 var originalResolveFilename = module.constructor._resolveFilename;
 module.constructor._resolveFilename = function(request, parent, isMain, options) {
   const parentFilename = (parent && parent.filename) ? parent.filename : undefined;
-  if (DEBUG)
-    console.error(`node_loader: resolve ${request} from ${parentFilename}`);
+  if (DEBUG) console.error(`\n\nnode_loader: resolve ${request} from ${parentFilename}`);
 
   const failedResolutions = [];