From db4de414c67dae0f9cd84fef496dc8a8c6652d25 Mon Sep 17 00:00:00 2001
From: Barak <baraki@wix.com>
Date: Thu, 12 Sep 2024 11:48:53 +0300
Subject: [PATCH] fix: stop calling require.resolve on top level module code.

---
 packages/runtime-node/src/node-environments-manager.ts | 6 ++----
 packages/runtime-node/src/worker-thread-initializer.ts | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/runtime-node/src/node-environments-manager.ts b/packages/runtime-node/src/node-environments-manager.ts
index e92c5528d..0e78369ee 100644
--- a/packages/runtime-node/src/node-environments-manager.ts
+++ b/packages/runtime-node/src/node-environments-manager.ts
@@ -87,8 +87,6 @@ export interface RunEnvironmentOptions {
     mode?: LaunchEnvironmentMode;
 }
 
-const cliEntry = require.resolve('./remote-node-entry');
-
 export interface INodeEnvironmentsManagerOptions {
     features: Map<string, IStaticFeatureDefinition>;
     bundlePath?: string;
@@ -120,7 +118,7 @@ export interface ILaunchEnvironmentOptions {
 
 export class NodeEnvironmentsManager {
     private runningFeatures = new Map<string, { com: Communication; runningEnvironments: RunningEnvironmentRecord }>();
-
+    private cliEntry = require.resolve('./remote-node-entry');
     constructor(
         private socketServer: io.Server,
         private options: INodeEnvironmentsManagerOptions,
@@ -467,7 +465,7 @@ export class NodeEnvironmentsManager {
     }
 
     private async runRemoteNodeEnvironment(options: StartEnvironmentOptions) {
-        const { remoteNodeEnvironment, process: childProc } = await startRemoteNodeEnvironment(cliEntry, {
+        const { remoteNodeEnvironment, process: childProc } = await startRemoteNodeEnvironment(this.cliEntry, {
             inspect: this.options.inspect,
             port: this.options.port,
             socketServerOptions: this.socketServerOptions,
diff --git a/packages/runtime-node/src/worker-thread-initializer.ts b/packages/runtime-node/src/worker-thread-initializer.ts
index f928b54d5..56d44c3e4 100644
--- a/packages/runtime-node/src/worker-thread-initializer.ts
+++ b/packages/runtime-node/src/worker-thread-initializer.ts
@@ -17,13 +17,12 @@ export type WorkerThreadInitializerOptions = InitializerOptions & {
     };
 };
 
-const workerThreadEntryPath = require.resolve('./worker-thread-entry');
-
 export function workerThreadInitializer({
     communication,
     env,
     environmentStartupOptions,
 }: WorkerThreadInitializerOptions): WorkerThreadInitializer {
+    const workerThreadEntryPath = require.resolve('./worker-thread-entry');
     const disposables = createDisposables('workerThreadInitializer');
 
     const instanceId = communication.getEnvironmentInstanceId(env.env, env.endpointType);
@@ -93,6 +92,6 @@ export function workerThreadInitializer({
     return {
         id: instanceId,
         initialize,
-        dispose: ()=>disposables.dispose(),
+        dispose: () => disposables.dispose(),
     };
 }