Skip to content

fix: stop calling require.resolve in top level module code. #2566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
barak007 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: stop calling require.resolve in top level module code. #2566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions packages/runtime-node/src/node-environments-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions packages/runtime-node/src/worker-thread-initializer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -93,6 +92,6 @@ export function workerThreadInitializer({
return {
id: instanceId,
initialize,
dispose: ()=>disposables.dispose(),
dispose: () => disposables.dispose(),
};
}