From fb88375ab4d2161dbf7e958a2a94c7c6d97dc84c Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Wed, 31 Jan 2024 00:38:56 +0100 Subject: [PATCH] refactor: type-safe imports in lib/node/init.ts (#41148) --- lib/node/init.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/node/init.ts b/lib/node/init.ts index 207d16108cbc..451251e3b390 100644 --- a/lib/node/init.ts +++ b/lib/node/init.ts @@ -3,14 +3,14 @@ import { wrapFsWithAsar } from './asar-fs-wrapper'; wrapFsWithAsar(require('fs')); // Hook child_process.fork. -const cp = require('child_process'); +import cp = require('child_process'); // eslint-disable-line import/first const originalFork = cp.fork; -cp.fork = (modulePath: string, args: any, options: any) => { +cp.fork = (modulePath, args?, options?: cp.ForkOptions) => { // Parse optional args. if (args == null) { args = []; } else if (typeof args === 'object' && !Array.isArray(args)) { - options = args; + options = args as cp.ForkOptions; args = []; } // Fallback to original fork to report arg type errors. @@ -22,7 +22,7 @@ cp.fork = (modulePath: string, args: any, options: any) => { // the electron binary run like upstream Node.js. options = options ?? {}; options.env = Object.create(options.env || process.env); - options.env.ELECTRON_RUN_AS_NODE = 1; + options.env!.ELECTRON_RUN_AS_NODE = '1'; // On mac the child script runs in helper executable. if (!options.execPath && process.platform === 'darwin') { options.execPath = process.helperExecPath; @@ -31,11 +31,11 @@ cp.fork = (modulePath: string, args: any, options: any) => { }; // Prevent Node from adding paths outside this app to search paths. -const path = require('path'); +import path = require('path'); // eslint-disable-line import/first const Module = require('module') as NodeJS.ModuleInternal; const resourcesPathWithTrailingSlash = process.resourcesPath + path.sep; const originalNodeModulePaths = Module._nodeModulePaths; -Module._nodeModulePaths = function (from: string) { +Module._nodeModulePaths = function (from) { const paths: string[] = originalNodeModulePaths(from); const fromPath = path.resolve(from) + path.sep; // If "from" is outside the app then we do nothing.