From 11395ea1bd86f5a3d62c1d7eaab7c1af3d0896f2 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 23 Nov 2022 14:04:46 -0800
Subject: [PATCH] fix: check RUNFILES env variable in @bazel/runfiles helper
 (#3602)

---
 internal/runfiles/index.cjs   | 5 ++++-
 packages/runfiles/runfiles.ts | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/internal/runfiles/index.cjs b/internal/runfiles/index.cjs
index e46f207ea4..e7a466c410 100644
--- a/internal/runfiles/index.cjs
+++ b/internal/runfiles/index.cjs
@@ -50,8 +50,11 @@ class Runfiles {
         else if (!!_env['RUNFILES_DIR']) {
             this.runfilesDir = path__default['default'].resolve(_env['RUNFILES_DIR']);
         }
+        else if (!!_env['RUNFILES']) {
+            this.runfilesDir = path__default['default'].resolve(_env['RUNFILES']);
+        }
         else {
-            throw new Error('Every node program run under Bazel must have a $RUNFILES_DIR or $RUNFILES_MANIFEST_FILE environment variable');
+            throw new Error('Every node program run under Bazel must have a $RUNFILES_DIR, $RUNFILES or $RUNFILES_MANIFEST_FILE environment variable');
         }
         // Under --noenable_runfiles (in particular on Windows)
         // Bazel sets RUNFILES_MANIFEST_ONLY=1.
diff --git a/packages/runfiles/runfiles.ts b/packages/runfiles/runfiles.ts
index d4e820af12..6ccf400f25 100755
--- a/packages/runfiles/runfiles.ts
+++ b/packages/runfiles/runfiles.ts
@@ -28,9 +28,11 @@ export class Runfiles {
       this.manifest = this.loadRunfilesManifest(_env['RUNFILES_MANIFEST_FILE']!);
     } else if (!!_env['RUNFILES_DIR']) {
       this.runfilesDir = path.resolve(_env['RUNFILES_DIR']!);
+    } else if (!!_env['RUNFILES']) {
+      this.runfilesDir = path.resolve(_env['RUNFILES']!);
     } else {
       throw new Error(
-        'Every node program run under Bazel must have a $RUNFILES_DIR or $RUNFILES_MANIFEST_FILE environment variable');
+        'Every node program run under Bazel must have a $RUNFILES_DIR, $RUNFILES or $RUNFILES_MANIFEST_FILE environment variable');
     }
     // Under --noenable_runfiles (in particular on Windows)
     // Bazel sets RUNFILES_MANIFEST_ONLY=1.