@@ -26,7 +26,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 git_repository(
     name = "build_bazel_rules_nodejs",
     remote = "https://github.com/bazelbuild/rules_nodejs.git",
-    tag = "0.0.1", # check for the latest tag when you install
+    tag = "0.1.0", # check for the latest tag when you install
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
 
@@ -16,25 +16,25 @@
 set -e
 
 # Launcher for NodeJS applications.
-# Find our runfiles tree. We need this to launch node with the correct
+# Find our runfiles manifest. We need this to launch node with the correct
 # entry point.
 #
 # Call this program X. X was generated by a genrule and may be invoked
 # in many ways:
 #   1a) directly by a user, with $0 in the output tree
 #   1b) via 'bazel run' (similar to case 1a)
-#   2) directly by a user, with $0 in X's runfiles tree
+#   2) directly by a user, with $0 in X's runfiles manifest
 #   3) by another program Y which has a data dependency on X, with $0 in Y's
-#      runfiles tree
+#      runfiles manifest
 #   4a) via 'bazel test'
 #   4b) case 3 in the context of a test
 #   5a) by a genrule cmd, with $0 in the output tree
 #   6a) case 3 in the context of a genrule
 #
-# For case 1, $0 will be a regular file, and the runfiles tree will be
+# For case 1, $0 will be a regular file, and the runfiles manifest will be
 # at $0.runfiles.
 # For case 2 or 3, $0 will be a symlink to the file seen in case 1.
-# For case 4, $TEST_SRCDIR should already be set to the runfiles tree by
+# For case 4, $TEST_SRCDIR should already be set to the runfiles manifest by
 # blaze.
 # Case 5a is handled like case 1.
 # Case 6a is handled like case 3.
@@ -46,16 +46,16 @@ esac
 
 if [[ -n "$TEST_SRCDIR" ]]; then
   # Case 4, bazel has identified runfiles for us.
-  RUNFILES="$TEST_SRCDIR"
+  RUNFILES="${TEST_SRCDIR}_manifest"
 else
   while true; do
     if [[ -e "$self.runfiles" ]]; then
-      RUNFILES="$self.runfiles"
+      RUNFILES="$self.runfiles_manifest"
       break
     fi
 
     if [[ $self == *.runfiles/* ]]; then
-      RUNFILES="${self%%.runfiles/*}.runfiles"
+      RUNFILES="${self%%.runfiles/*}.runfiles_manifest"
       # don't break; this is a last resort for case 6b
     fi
 
@@ -92,4 +92,21 @@ done
 # Note: for debugging it is useful to see what files are actually present, eg:
 # find . -name thingImLookingFor
 
-exec "${RUNFILES}/TEMPLATED_node" "${NODE_OPTIONS[@]}" "${RUNFILES}/TEMPLATED_script_path" "${ARGS[@]}"
+# Lookup the real paths from the runfiles manifest with no dependency on posix
+while read line; do
+  declare -a PARTS=($line)
+  if [ "${PARTS[0]}" == "TEMPLATED_node" ]; then
+    readonly node="${PARTS[1]}"
+  elif [ "${PARTS[0]}" == "TEMPLATED_script_path" ]; then
+    readonly script="${PARTS[1]}"
+  fi
+done < ${RUNFILES}
+if [ -z "${node}" ]; then
+  echo "Failed to find node binary TEMPLATED_node in manifest ${RUNFILES}"
+  exit 1
+fi
+if [ -z "${script}" ]; then
+  echo "Failed to find script TEMPLATED_script_path in manifest ${RUNFILES}"
+  exit 1
+fi
+exec "${node}" "${NODE_OPTIONS[@]}" "${script}" "${ARGS[@]}"
@@ -23,6 +23,8 @@
  */
 'use strict';
 var path = require('path');
+var fs = require('fs');
+var readline = require('readline');
 
 /**
  * The module roots as pairs of a RegExp to match the require path, and a
@@ -56,8 +58,28 @@ function resolveToModuleRoot(path) {
   return null;
 }
 
-function runfilesDir() {
-  return process.env.RUNFILES || process.env.TEST_SRCDIR;
+/**
+ * The runfiles manifest maps from short_path
+ * https://docs.bazel.build/versions/master/skylark/lib/File.html#short_path
+ * to the actual location on disk where the file can be read.
+ */
+const runfilesManifest = Object.create(null);
+function loadRunfilesManifest(manifestPath) {
+  return new Promise((resolve, reject) => {
+    try {
+      const input = fs.createReadStream(manifestPath, {encoding: 'utf-8'});
+      const manifest = readline.createInterface({input});
+      manifest.on('line', line => {
+        if (!line) return;
+        const [runfilesPath, realPath] = line.split(" ");
+        runfilesManifest[runfilesPath] = realPath;
+      }).on('close', () => {
+        resolve(runfilesManifest);
+      });
+    } catch (e) {
+      reject(e);
+    }
+  });
 }
 
 var originalResolveFilename = module.constructor._resolveFilename;
@@ -66,10 +88,12 @@ module.constructor._resolveFilename =
   var failedResolutions = [];
   var resolveLocations = [
     request,
-    path.join(runfilesDir(), request),
-    path.join(
-      runfilesDir(), 'TEMPLATED_workspace_name', 'TEMPLATED_label_package',
-      'node_modules', request),
+    runfilesManifest[request],
+    // Join on forward slash, because even on Windows the runfiles_manifest
+    // file is written with forward slash.
+    runfilesManifest[[
+      'TEMPLATED_workspace_name', 'TEMPLATED_label_package',
+      'node_modules', request].join('/')],
   ];
   for (var location of resolveLocations) {
     try {
@@ -100,7 +124,9 @@ if (require.main === module) {
   // NB: entry_point below is replaced during the build process.
   var mainScript = process.argv[1] = 'TEMPLATED_entry_point';
   try {
-    module.constructor._load(mainScript, this, /*isMain=*/true);
+    loadRunfilesManifest(process.env.RUNFILES).then(mf => {
+      module.constructor._load(mainScript, this, /*isMain=*/true);
+    });
   } catch (e) {
     console.error('failed to load main ', e.stack || e);
     process.exit(1);
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")`
`26`	`26`	`git_repository(`
`27`	`27`	`name = "build_bazel_rules_nodejs",`
`28`	`28`	`remote = "https://github.com/bazelbuild/rules_nodejs.git",`
`29`		`- tag = "0.0.1", # check for the latest tag when you install`
	`29`	`+ tag = "0.1.0", # check for the latest tag when you install`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")`