Skip to content

Commit cdf404f

Browse files
bpaserobpasero
authored
debt - restore old layer name (#250928)
1 parent 1a41ff6 commit cdf404f

File tree

212 files changed

+332
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+332
-270
lines changed

‎.eslint-plugin-local/code-import-patterns.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ interface ConditionalPattern {
1818

1919
interface RawImportPatternsConfig {
2020
target: string;
21-
layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
21+
layer?: 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main';
2222
test?: boolean;
2323
restrictions: string | (string | ConditionalPattern)[];
2424
}
@@ -80,7 +80,7 @@ export = new class implements eslint.Rule.RuleModule {
8080
return this._optionsCache.get(options)!;
8181
}
8282

83-
type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main';
83+
type Layer = 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main';
8484

8585
interface ILayerRule {
8686
layer: Layer;
@@ -98,7 +98,7 @@ export = new class implements eslint.Rule.RuleModule {
9898
{ layer: 'common', deps: orSegment(['common']) },
9999
{ layer: 'worker', deps: orSegment(['common', 'worker']) },
100100
{ layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true },
101-
{ layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true },
101+
{ layer: 'electron-browser', deps: orSegment(['common', 'browser', 'electron-browser']), isBrowser: true },
102102
{ layer: 'node', deps: orSegment(['common', 'node']), isNode: true },
103103
{ layer: 'electron-utility', deps: orSegment(['common', 'node', 'electron-utility']), isNode: true, isElectron: true },
104104
{ layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-utility', 'electron-main']), isNode: true, isElectron: true },

‎build/buildfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ exports.workerExtensionHost = createModuleDescription('vs/workbench/api/worker/e
1818
exports.workerNotebook = createModuleDescription('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain');
1919
exports.workerLanguageDetection = createModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain');
2020
exports.workerLocalFileSearch = createModuleDescription('vs/workbench/services/search/worker/localFileSearchMain');
21-
exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain');
21+
exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain');
2222
exports.workerOutputLinks = createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputerMain');
2323
exports.workerBackgroundTokenization = createModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain');
2424

@@ -43,7 +43,7 @@ exports.code = [
4343
// 'vs/code/node/cli' is not included here because it comes in via ./src/cli.js
4444
createModuleDescription('vs/code/node/cliProcessMain'),
4545
createModuleDescription('vs/code/electron-utility/sharedProcess/sharedProcessMain'),
46-
createModuleDescription('vs/code/electron-sandbox/workbench/workbench'),
46+
createModuleDescription('vs/code/electron-browser/workbench/workbench'),
4747
createModuleDescription('vs/workbench/contrib/webview/browser/pre/service-worker')
4848
];
4949

‎build/checker/layersChecker.js

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/checker/layersChecker.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ const RULES: IRule[] = [
5555
disallowedTypes: [/* Ignore native types that are defined from here */],
5656
},
5757

58-
// Common: vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts
58+
// Common: vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts
5959
{
60-
target: '**/vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts',
60+
target: '**/vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts',
6161
disallowedTypes: NATIVE_TYPES,
6262
},
6363

@@ -67,6 +67,12 @@ const RULES: IRule[] = [
6767
disallowedTypes: NATIVE_TYPES,
6868
},
6969

70+
// Common
71+
{
72+
target: '**/vs/**/worker/**',
73+
disallowedTypes: NATIVE_TYPES,
74+
},
75+
7076
// Browser
7177
{
7278
target: '**/vs/**/browser/**',

‎build/checker/tsconfig.browser.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"skipLibCheck": true
1212
},
1313
"include": [
14+
"../../src/*.ts",
1415
"../../src/**/common/**/*.ts",
1516
"../../src/**/browser/**/*.ts",
1617
"../../src/typings/*.d.ts",

‎build/checker/tsconfig.electron-sandbox.json renamed to ‎build/checker/tsconfig.electron-browser.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"include": [
44
"../../src/**/common/**/*.ts",
55
"../../src/**/browser/**/*.ts",
6-
"../../src/**/electron-sandbox/**/*.ts",
6+
"../../src/**/electron-browser/**/*.ts",
77
"../../src/typings/*.d.ts",
88
"../../src/vs/monaco.d.ts",
99
"../../src/vscode-dts/vscode.proposed.*.d.ts",
@@ -15,7 +15,7 @@
1515
"exclude": [
1616
"../../src/**/test/**",
1717
"../../src/**/fixtures/**",
18-
"../../src/vs/base/parts/sandbox/electron-sandbox/preload.ts", // Preload scripts for Electron sandbox
19-
"../../src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts" // have limited access to node.js APIs
18+
"../../src/vs/base/parts/sandbox/electron-browser/preload.ts", // Preload scripts for Electron sandbox
19+
"../../src/vs/base/parts/sandbox/electron-browser/preload-aux.ts" // have limited access to node.js APIs
2020
]
2121
}

‎build/checker/tsconfig.electron-main.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"extends": "./tsconfig.node.json",
33
"include": [
4+
"../../src/**/common/**/*.ts",
5+
"../../src/**/node/**/*.ts",
46
"../../src/**/electron-main/**/*.ts",
5-
"../../src/**/electron-utility/**/*.ts",
67
"../../src/typings/*.d.ts",
8+
"../../src/vs/monaco.d.ts",
9+
"../../src/vscode-dts/vscode.proposed.*.d.ts",
10+
"../../src/vscode-dts/vscode.d.ts",
711
"../../node_modules/@types/trusted-types/index.d.ts",
812
],
913
"exclude": [

‎build/checker/tsconfig.electron-utility.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"extends": "./tsconfig.node.json",
3+
"include": [
4+
"../../src/**/common/**/*.ts",
5+
"../../src/**/node/**/*.ts",
6+
"../../src/**/electron-utility/**/*.ts",
7+
"../../src/typings/*.d.ts",
8+
"../../src/vs/monaco.d.ts",
9+
"../../src/vscode-dts/vscode.proposed.*.d.ts",
10+
"../../src/vscode-dts/vscode.d.ts",
11+
"../../node_modules/@types/trusted-types/index.d.ts",
12+
],
13+
"exclude": [
14+
"../../src/**/test/**",
15+
"../../src/**/fixtures/**",
16+
]
17+
}

‎build/checker/tsconfig.node.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"skipLibCheck": true
1212
},
1313
"include": [
14+
"../../src/*.ts",
1415
"../../src/**/common/**/*.ts",
1516
"../../src/**/node/**/*.ts",
1617
"../../src/typings/*.d.ts",

‎build/checker/tsconfig.worker.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"extends": "../../src/tsconfig.base.json",
3+
"compilerOptions": {
4+
"lib": [
5+
"ES2022",
6+
"WebWorker",
7+
"Webworker.Iterable",
8+
"WebWorker.AsyncIterable"
9+
],
10+
"types": [],
11+
"noEmit": true,
12+
"skipLibCheck": true
13+
},
14+
"include": [
15+
"../../src/**/common/**/*.ts",
16+
"../../src/**/worker/**/*.ts",
17+
"../../src/typings/*.d.ts",
18+
"../../src/vs/monaco.d.ts",
19+
"../../src/vscode-dts/vscode.proposed.*.d.ts",
20+
"../../src/vscode-dts/vscode.d.ts",
21+
"../../node_modules/@types/trusted-types/index.d.ts",
22+
"../../node_modules/@types/wicg-file-system-access/index.d.ts"
23+
],
24+
"exclude": [
25+
"../../src/**/test/**",
26+
"../../src/**/fixtures/**"
27+
]
28+
}

0 commit comments

Comments
 (0)