commit e4043dc3187429bba61f34cbc2757858e17dabd8
author Alex Eagle <eagle@post.harvard.edu> Mon Feb 24 11:12:52 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Feb 24 11:13:23 2020 -0800
tree b191aef8c10e40c35ef2ab83761983a404a63a99
parent bad5a075147b13faa7140213a7fd18065eb8d8e4

Fix worker loading when using require.resolve

The breakage was observed downstream in @bazel/worker package which no longer worked.

Closes #491

PiperOrigin-RevId: 296932382

internal/tsc_wrapped/worker.ts

diff --git a/internal/tsc_wrapped/worker.ts b/internal/tsc_wrapped/worker.ts
index 71fdf25..0a3239d 100644
--- a/internal/tsc_wrapped/worker.ts
+++ b/internal/tsc_wrapped/worker.ts
@@ -72,7 +72,7 @@
  */
 function loadWorkerPb() {
   const protoPath =
-      '../../third_party/github.com/bazelbuild/bazel/src/main/protobuf/worker_protocol.proto';
+      './third_party/github.com/bazelbuild/bazel/src/main/protobuf/worker_protocol.proto';
 
   // Use node module resolution so we can find the .proto file in any of the
   // root dirs
@@ -88,14 +88,14 @@
     // workspace location
     // This extra lookup should never happen in google3. It's only needed for
     // local development in the rules_typescript repo.
-
     const runfiles = process.env['BAZEL_NODE_RUNFILES_HELPER'];
     if (runfiles) {
       protofile = require(runfiles).resolve(
           'build_bazel_rules_typescript/third_party/github.com/bazelbuild/bazel/src/main/protobuf/worker_protocol.proto');
-    } else {
-      protofile =
-          'build_bazel_rules_typescript/third_party/github.com/bazelbuild/bazel/src/main/protobuf/worker_protocol.proto';
+    }
+    if (!protofile) {
+      throw new Error(
+          `cannot find worker_protocol.proto at ${protoPath} or in Runfiles`);
     }
   }