diff --git a/.eslintplugin/code-import-patterns.ts b/.eslintplugin/code-import-patterns.ts index a3077654f09..460409514bc 100644 --- a/.eslintplugin/code-import-patterns.ts +++ b/.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[] = []; diff --git a/.eslintrc.json b/.eslintrc.json index 8196f8d828b..8fd129ef802 100644 --- a/.eslintrc.json +++ b/.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": [ diff --git a/build/buildfile.js b/build/buildfile.js index f82019860a7..0e323ac0faf 100644 --- a/build/buildfile.js +++ b/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') ]; diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index bc4796ed988..aa9ed610787 100644 --- a/build/gulpfile.reh.js +++ b/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/**' diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index 6b6927ec8ac..edcd5e462d6 100644 --- a/build/gulpfile.vscode.web.js +++ b/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', diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js index 100884ee90c..98241a368b5 100644 --- a/build/lib/layersChecker.js +++ b/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 diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts index 8098daa8f48..26a18a48da7 100644 --- a/build/lib/layersChecker.ts +++ b/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, diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index f0eec192932..7b6961ddf88 100644 --- a/src/vs/code/electron-main/main.ts +++ b/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'; diff --git a/src/vs/code/electron-node/sharedProcess/contrib/codeCacheCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts similarity index 100% rename from src/vs/code/electron-node/sharedProcess/contrib/codeCacheCleaner.ts rename to src/vs/code/electron-utility/sharedProcess/contrib/codeCacheCleaner.ts diff --git a/src/vs/code/electron-node/sharedProcess/contrib/extensions.ts b/src/vs/code/electron-utility/sharedProcess/contrib/extensions.ts similarity index 100% rename from src/vs/code/electron-node/sharedProcess/contrib/extensions.ts rename to src/vs/code/electron-utility/sharedProcess/contrib/extensions.ts diff --git a/src/vs/code/electron-node/sharedProcess/contrib/languagePackCachedDataCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts similarity index 100% rename from src/vs/code/electron-node/sharedProcess/contrib/languagePackCachedDataCleaner.ts rename to src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts diff --git a/src/vs/code/electron-node/sharedProcess/contrib/localizationsUpdater.ts b/src/vs/code/electron-utility/sharedProcess/contrib/localizationsUpdater.ts similarity index 100% rename from src/vs/code/electron-node/sharedProcess/contrib/localizationsUpdater.ts rename to src/vs/code/electron-utility/sharedProcess/contrib/localizationsUpdater.ts diff --git a/src/vs/code/electron-node/sharedProcess/contrib/logsDataCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/logsDataCleaner.ts similarity index 100% rename from src/vs/code/electron-node/sharedProcess/contrib/logsDataCleaner.ts rename to src/vs/code/electron-utility/sharedProcess/contrib/logsDataCleaner.ts diff --git a/src/vs/code/electron-node/sharedProcess/contrib/storageDataCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/storageDataCleaner.ts similarity index 100% rename from src/vs/code/electron-node/sharedProcess/contrib/storageDataCleaner.ts rename to src/vs/code/electron-utility/sharedProcess/contrib/storageDataCleaner.ts diff --git a/src/vs/code/electron-node/sharedProcess/contrib/userDataProfilesCleaner.ts b/src/vs/code/electron-utility/sharedProcess/contrib/userDataProfilesCleaner.ts similarity index 100% rename from src/vs/code/electron-node/sharedProcess/contrib/userDataProfilesCleaner.ts rename to src/vs/code/electron-utility/sharedProcess/contrib/userDataProfilesCleaner.ts diff --git a/src/vs/code/electron-node/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts similarity index 99% rename from src/vs/code/electron-node/sharedProcess/sharedProcessMain.ts rename to src/vs/code/electron-utility/sharedProcess/sharedProcessMain.ts index 55e54e37e8f..ac39f266781 100644 --- a/src/vs/code/electron-node/sharedProcess/sharedProcessMain.ts +++ b/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 { diff --git a/src/vs/platform/request/electron-node/requestService.ts b/src/vs/platform/request/electron-utility/requestService.ts similarity index 100% rename from src/vs/platform/request/electron-node/requestService.ts rename to src/vs/platform/request/electron-utility/requestService.ts diff --git a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts b/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts index 0ba2418ad74..054f3b7419d 100644 --- a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts +++ b/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 diff --git a/test/unit/browser/index.amd.js b/test/unit/browser/index.amd.js index 54a1551d902..359a071b61e 100644 --- a/test/unit/browser/index.amd.js +++ b/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; diff --git a/test/unit/browser/index.js b/test/unit/browser/index.js index ce24b569aff..f19c21e46c4 100644 --- a/test/unit/browser/index.js +++ b/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; diff --git a/test/unit/node/index.amd.js b/test/unit/node/index.amd.js index 76fde4bce4d..e38984febdf 100644 --- a/test/unit/node/index.amd.js +++ b/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) diff --git a/test/unit/node/index.mjs b/test/unit/node/index.mjs index 55d4eb416ed..9e96412109d 100644 --- a/test/unit/node/index.mjs +++ b/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)