Skip to content

Commit 76f0cc5

Browse files
aeschliaeschli
authored
Merge branch 'main' into aeschli/quintessential-llama
2 parents 0ad9e22 + d49ebe6 commit 76f0cc5

File tree

116 files changed

+1541
-1368
lines changed

Some content is hidden

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

116 files changed

+1541
-1368
lines changed

‎.devcontainer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Next, let's try debugging.
9999

100100
2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
101101

102-
> **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../../.vscode/launch.json). However, running `./scripts/code.sh` first will set up Electron which will usually solve timeout issues.
102+
> **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../.vscode/launch.json). However, running `./scripts/code.sh` first will set up Electron which will usually solve timeout issues.
103103
104104
3. After a bit, Code - OSS will appear with the debugger attached!
105105

‎.npmrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
disturl="https://electronjs.org/headers"
2-
target="35.5.0"
3-
ms_build_id="11678209"
2+
target="35.5.1"
3+
ms_build_id="11708675"
44
runtime="electron"
55
build_from_source="true"
66
legacy-peer-deps="true"

‎.vscode/notebooks/my-endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
{
158158
"kind": 2,
159159
"language": "github-issues",
160-
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:*out-of-scope -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrisdias -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:joyceerhl -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar -author:daviddossett -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:legomushroom"
160+
"value": "$REPOS $MILESTONE -$MINE is:issue is:closed reason:completed sort:updated-asc label:bug -label:unreleased -label:verified -label:z-author-verified -label:on-testplan -label:*duplicate -label:duplicate -label:invalid -label:*as-designed -label:*out-of-scope -label:error-telemetry -label:verification-steps-needed -label:verification-found -author:aeschli -author:alexdima -author:alexr00 -author:AmandaSilver -author:andreamah -author:bamurtaugh -author:bpasero -author:chrmarti -author:Chuxel -author:claudiaregio -author:connor4312 -author:dbaeumer -author:deepak1556 -author:devinvalenciano -author:digitarald -author:DonJayamanne -author:egamma -author:fiveisprime -author:ntrogh -author:hediet -author:isidorn -author:joaomoreno -author:jrieken -author:kieferrm -author:lramos15 -author:lszomoru -author:meganrogge -author:misolori -author:mjbvz -author:rebornix -author:roblourens -author:rzhao271 -author:sandy081 -author:sbatten -author:stevencl -author:tanhakabir -author:TylerLeonhardt -author:Tyriar -author:weinand -author:amunger -author:karthiknadig -author:eleanorjboyd -author:Yoyokrazy -author:paulacamargo25 -author:ulugbekna -author:aiday-mar -author:bhavyaus -author:justschen -author:benibenj -author:luabud -author:anthonykim1 -author:joshspicer -author:osortega -author:hawkticehurst -author:pierceboggan"
161161
},
162162
{
163163
"kind": 1,

‎build/azure-pipelines/product-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ extends:
337337
- ${{ if or(eq(parameters.VSCODE_BUILD_LINUX, true),eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true),eq(parameters.VSCODE_BUILD_LINUX_ARM64, true),eq(parameters.VSCODE_BUILD_ALPINE, true),eq(parameters.VSCODE_BUILD_ALPINE_ARM64, true),eq(parameters.VSCODE_BUILD_MACOS, true),eq(parameters.VSCODE_BUILD_MACOS_ARM64, true),eq(parameters.VSCODE_BUILD_WIN32, true),eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
338338
- CompileCLI
339339
pool:
340-
name: 1es-windows-2019-x64
340+
name: 1es-windows-2022-x64
341341
os: windows
342342
jobs:
343343
- ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:

‎build/lib/layersChecker.js renamed to ‎build/checker/layersChecker.js

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

‎build/lib/layersChecker.ts renamed to ‎build/checker/layersChecker.ts

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -172,22 +172,6 @@ const RULES: IRule[] = [
172172
]
173173
},
174174

175-
// Common: vs/workbench/api/common/extHostExtensionService.ts
176-
{
177-
target: '**/vs/workbench/api/common/extHostExtensionService.ts',
178-
allowedTypes: [
179-
...CORE_TYPES,
180-
181-
// Safe access to global
182-
'global'
183-
],
184-
disallowedTypes: NATIVE_TYPES,
185-
disallowedDefinitions: [
186-
'lib.dom.d.ts', // no DOM
187-
'@types/node' // no node.js
188-
]
189-
},
190-
191175
// Common: vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts
192176
{
193177
target: '**/vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts',
@@ -229,16 +213,6 @@ const RULES: IRule[] = [
229213
]
230214
},
231215

232-
// Browser (editor contrib)
233-
{
234-
target: '**/src/vs/editor/contrib/**',
235-
allowedTypes: CORE_TYPES,
236-
disallowedTypes: NATIVE_TYPES,
237-
disallowedDefinitions: [
238-
'@types/node' // no node.js
239-
]
240-
},
241-
242216
// node.js
243217
{
244218
target: '**/vs/**/node/**',
@@ -318,7 +292,7 @@ function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule)
318292

319293
if (rule.disallowedTypes?.some(disallowed => disallowed === text)) {
320294
const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
321-
console.log(`[build/lib/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}). Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
295+
console.log(`[build/checker/layersChecker.ts]: Reference to type '${text}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}). Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
322296

323297
hasErrors = true;
324298
return;
@@ -345,7 +319,7 @@ function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule)
345319
if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
346320
const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
347321

348-
console.log(`[build/lib/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}) Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
322+
console.log(`[build/checker/layersChecker.ts]: Reference to symbol '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1}) Learn more about our source code organization at https://github.com/microsoft/vscode/wiki/Source-Code-Organization.`);
349323

350324
hasErrors = true;
351325
return;

‎build/checker/tsconfig.desktop.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"extends": "./tsconfig.web.json",
3+
"include": [
4+
"../../src/**/common/**/*.ts",
5+
"../../src/**/browser/**/*.ts",
6+
"../../src/**/electron-sandbox/**/*.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/@webgpu/types/dist/index.d.ts",
12+
"../../node_modules/@types/trusted-types/index.d.ts",
13+
"../../node_modules/@types/wicg-file-system-access/index.d.ts"
14+
],
15+
"exclude": [
16+
"../../src/**/test/**",
17+
"../../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
20+
]
21+
}

‎build/checker/tsconfig.server.json

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

‎build/checker/tsconfig.web.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+
"DOM",
7+
"DOM.Iterable"
8+
],
9+
"types": [],
10+
"noEmit": true,
11+
"skipLibCheck": true
12+
},
13+
"include": [
14+
"../../src/**/common/**/*.ts",
15+
"../../src/**/browser/**/*.ts",
16+
"../../src/typings/*.d.ts",
17+
"../../src/vs/monaco.d.ts",
18+
"../../src/vscode-dts/vscode.proposed.*.d.ts",
19+
"../../src/vscode-dts/vscode.d.ts",
20+
"../../node_modules/@webgpu/types/dist/index.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)