rename electron-node to electron-utility (#227672)

.eslintplugin/code-import-patterns.ts

@@ -18,7 +18,7 @@ interface ConditionalPattern {
 
 interface RawImportPatternsConfig {
 	target: string;
-	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-node' | 'electron-main';
+	layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
 	test?: boolean;
 	restrictions: string | (string | ConditionalPattern)[];
 }
@@ -79,7 +79,7 @@ export = new class implements eslint.Rule.RuleModule {
 			return this._optionsCache.get(options)!;
 		}
 
-		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-node' | 'electron-main';
+		type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
 
 		interface ILayerRule {
 			layer: Layer;
@@ -99,8 +99,8 @@ export = new class implements eslint.Rule.RuleModule {
 			{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
 			{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
 			{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
-			{ layer: 'electron-node', deps: orSegment(['common', 'node', 'electron-node']), isNode: true, isElectron: true },
-			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-node', 'electron-main']), isNode: true, isElectron: true },
+			{ layer: 'electron-utility', deps: orSegment(['common', 'node', 'electron-utility']), isNode: true, isElectron: true },
+			{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-utility', 'electron-main']), isNode: true, isElectron: true },
 		];
 
 		let browserAllow: string[] = [];

.eslintrc.json

@@ -92,14 +92,14 @@
 					"common",
 					"browser"
 				],
-				"electron-node": [
+				"electron-utility": [
 					"common",
 					"node"
 				],
 				"electron-main": [
 					"common",
 					"node",
-					"electron-node"
+					"electron-utility"
 				]
 			}
 		],
@@ -635,7 +635,7 @@
 					{
 						// imports that are allowed in all files of layers:
 						// - node
-						// - electron-node
+						// - electron-utility
 						// - electron-main
 						"when": "hasNode",
 						"allow": [
@@ -694,7 +694,7 @@
 					},
 					{
 						// imports that are allowed in all files of layers:
-						// - electron-node
+						// - electron-utility
 						// - electron-main
 						"when": "hasElectron",
 						"allow": [

build/buildfile.js

@@ -109,7 +109,7 @@ exports.code = [
 	createModuleDescription('vs/code/electron-main/main'),
 	createModuleDescription('vs/code/node/cli'),
 	createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
-	createModuleDescription('vs/code/electron-node/sharedProcess/sharedProcessMain'),
+	createModuleDescription('vs/code/electron-utility/sharedProcess/sharedProcessMain'),
 	createModuleDescription('vs/code/electron-sandbox/processExplorer/processExplorerMain')
 ];
 

build/gulpfile.reh.js

@@ -78,7 +78,7 @@ const serverResourceIncludes = [
 ];
 
 const serverResourceExcludes = [
-	'!out-build/vs/**/{electron-sandbox,electron-main,electron-node}/**',
+	'!out-build/vs/**/{electron-sandbox,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
 	'!**/test/**'

build/gulpfile.vscode.web.js

@@ -87,7 +87,7 @@ const vscodeWebResources = [
 	...vscodeWebResourceIncludes,
 
 	// Excludes
-	'!out-build/vs/**/{node,electron-sandbox,electron-main,electron-node}/**',
+	'!out-build/vs/**/{node,electron-sandbox,electron-main,electron-utility}/**',
 	'!out-build/vs/editor/standalone/**',
 	'!out-build/vs/workbench/**/*-tb.png',
 	'!out-build/vs/code/**/*-dev.html',

build/lib/layersChecker.js

@@ -235,9 +235,9 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
-    // Electron (node)
+    // Electron (utility)
     {
-        target: '**/vs/**/electron-node/**',
+        target: '**/vs/**/electron-utility/**',
         allowedTypes: [
             ...CORE_TYPES,
             // --> types from electron.d.ts that duplicate from lib.dom.d.ts

build/lib/layersChecker.ts

@@ -257,9 +257,9 @@ const RULES: IRule[] = [
 		]
 	},
 
-	// Electron (node)
+	// Electron (utility)
 	{
-		target: '**/vs/**/electron-node/**',
+		target: '**/vs/**/electron-utility/**',
 		allowedTypes: [
 			...CORE_TYPES,
 

src/vs/code/electron-main/main.ts

@@ -53,7 +53,7 @@ import { ProtocolMainService } from '../../platform/protocol/electron-main/proto
 import { ITunnelService } from '../../platform/tunnel/common/tunnel.js';
 import { TunnelService } from '../../platform/tunnel/node/tunnelService.js';
 import { IRequestService } from '../../platform/request/common/request.js';
-import { RequestService } from '../../platform/request/electron-node/requestService.js';
+import { RequestService } from '../../platform/request/electron-utility/requestService.js';
 import { ISignService } from '../../platform/sign/common/sign.js';
 import { SignService } from '../../platform/sign/node/signService.js';
 import { IStateReadService, IStateService } from '../../platform/state/node/state.js';

src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts

@@ -117,7 +117,7 @@ import { SharedProcessRawConnection, SharedProcessLifecycle } from '../../../pla
 import { getOSReleaseInfo } from '../../../base/node/osReleaseInfo.js';
 import { getDesktopEnvironment } from '../../../base/common/desktopEnvironmentInfo.js';
 import { getCodeDisplayProtocol, getDisplayProtocol } from '../../../base/node/osDisplayProtocolInfo.js';
-import { RequestService } from '../../../platform/request/electron-node/requestService.js';
+import { RequestService } from '../../../platform/request/electron-utility/requestService.js';
 
 class SharedProcessMain extends Disposable implements IClientConnectionFilter {
 

src/vs/platform/sharedProcess/electron-main/sharedProcess.ts

@@ -169,7 +169,7 @@ export class SharedProcess extends Disposable {
 
 		this.utilityProcess.start({
 			type: 'shared-process',
-			entryPoint: 'vs/code/electron-node/sharedProcess/sharedProcessMain',
+			entryPoint: 'vs/code/electron-utility/sharedProcess/sharedProcessMain',
 			payload: this.createSharedProcessConfiguration(),
 			respondToAuthRequestsFromMainProcess: true,
 			execArgv

test/unit/browser/index.amd.js

@@ -111,7 +111,7 @@ function ensureIsArray(a) {
 
 const testModules = (async function () {
 
-	const excludeGlob = '**/{node,electron-sandbox,electron-main,electron-node}/**/*.test.js';
+	const excludeGlob = '**/{node,electron-sandbox,electron-main,electron-utility}/**/*.test.js';
 	let isDefaultModules = true;
 	let promise;
 

test/unit/browser/index.js

@@ -114,7 +114,7 @@ function ensureIsArray(a) {
 
 const testModules = (async function () {
 
-	const excludeGlob = '**/{node,electron-sandbox,electron-main,electron-node}/**/*.test.js';
+	const excludeGlob = '**/{node,electron-sandbox,electron-main,electron-utility}/**/*.test.js';
 	let isDefaultModules = true;
 	let promise;
 

test/unit/node/index.amd.js

@@ -56,7 +56,7 @@ Options:
 const TEST_GLOB = '**/test/**/*.test.js';
 
 const excludeGlobs = [
-	'**/{browser,electron-sandbox,electron-main,electron-node}/**/*.test.js',
+	'**/{browser,electron-sandbox,electron-main,electron-utility}/**/*.test.js',
 	'**/vs/platform/environment/test/node/nativeModules.test.js', // native modules are compiled against Electron and this test would fail with node.js
 	'**/vs/base/parts/storage/test/node/storage.test.js', // same as above, due to direct dependency to sqlite native module
 	'**/vs/workbench/contrib/testing/test/**' // flaky (https://github.com/microsoft/vscode/issues/137853)

test/unit/node/index.mjs

@@ -58,7 +58,7 @@ Options:
 const TEST_GLOB = '**/test/**/*.test.js';
 
 const excludeGlobs = [
-	'**/{browser,electron-sandbox,electron-main,electron-node}/**/*.test.js',
+	'**/{browser,electron-sandbox,electron-main,electron-utility}/**/*.test.js',
 	'**/vs/platform/environment/test/node/nativeModules.test.js', // native modules are compiled against Electron and this test would fail with node.js
 	'**/vs/base/parts/storage/test/node/storage.test.js', // same as above, due to direct dependency to sqlite native module
 	'**/vs/workbench/contrib/testing/test/**' // flaky (https://github.com/microsoft/vscode/issues/137853)