Skip to content

Commit 7dc3c03

Browse files
jriekenjrieken
committed
Merge branch 'main' into joh/swc
2 parents 1c79e26 + d1de1c6 commit 7dc3c03

File tree

1,083 files changed

+25442
-14528
lines changed

Some content is hidden

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

1,083 files changed

+25442
-14528
lines changed

‎.eslintrc.json

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,7 @@
210210
// - electron-browser
211211
"when": "hasBrowser",
212212
"allow": [
213-
"vs/css!./**/*",
214-
"@microsoft/applicationinsights-web"
213+
"vs/css!./**/*"
215214
]
216215
},
217216
{
@@ -226,9 +225,6 @@
226225
"@vscode/vscode-languagedetection",
227226
"@vscode/ripgrep",
228227
"@vscode/iconv-lite-umd",
229-
"applicationinsights",
230-
"@microsoft/1ds-core-js",
231-
"@microsoft/1ds-post-js",
232228
"assert",
233229
"child_process",
234230
"console",
@@ -277,6 +273,7 @@
277273
// imports that are allowed in all /test/ files
278274
"when": "test",
279275
"allow": [
276+
"vs/css.build",
280277
"assert",
281278
"sinon",
282279
"sinon-test"
@@ -331,7 +328,9 @@
331328
"vs/base/~",
332329
"vs/base/parts/*/~",
333330
"vs/platform/*/~",
334-
"tas-client-umd" // node module allowed even in /common/
331+
"tas-client-umd", // node module allowed even in /common/
332+
"@microsoft/1ds-core-js",// node module allowed even in /common/
333+
"@microsoft/1ds-post-js" // node module allowed even in /common/
335334
]
336335
},
337336
{
@@ -535,27 +534,9 @@
535534
"vs/workbench/workbench.common.main"
536535
]
537536
},
538-
{
539-
"target": "src/vs/workbench/{workbench.sandbox.main.ts,workbench.desktop.sandbox.main.ts}",
540-
"layer": "electron-sandbox",
541-
"restrictions": [
542-
"vs/base/*/~",
543-
"vs/base/parts/*/~",
544-
"vs/platform/*/~",
545-
"vs/editor/~",
546-
"vs/editor/contrib/*/~",
547-
"vs/editor/editor.all",
548-
"vs/workbench/~",
549-
"vs/workbench/api/~",
550-
"vs/workbench/services/*/~",
551-
"vs/workbench/contrib/*/~",
552-
"vs/workbench/workbench.common.main",
553-
"vs/workbench/workbench.sandbox.main"
554-
]
555-
},
556537
{
557538
"target": "src/vs/workbench/workbench.desktop.main.ts",
558-
"layer": "electron-browser",
539+
"layer": "electron-sandbox",
559540
"restrictions": [
560541
"vs/base/*/~",
561542
"vs/base/parts/*/~",
@@ -567,8 +548,7 @@
567548
"vs/workbench/api/~",
568549
"vs/workbench/services/*/~",
569550
"vs/workbench/contrib/*/~",
570-
"vs/workbench/workbench.common.main",
571-
"vs/workbench/workbench.sandbox.main"
551+
"vs/workbench/workbench.common.main"
572552
]
573553
},
574554
{

‎.github/classifier.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"snippets": {"assign": ["jrieken"]},
146146
"splitview": {"assign": ["joaomoreno"]},
147147
"suggest": {"assign": ["jrieken"]},
148-
"tasks": {"assign": ["alexr00"], "accuracy": 0.85},
148+
"tasks": {"assign": ["meganrogge"], "accuracy": 0.85},
149149
"telemetry": {"assign": []},
150150
"themes": {"assign": ["aeschli"]},
151151
"timeline": {"assign": ["lramos15"]},

‎.github/workflows/basic.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
# TODO: rename azure-pipelines/linux/xvfb.init to github-actions
2323
- name: Setup Build Environment
2424
run: |
25-
sudo apt-get update
26-
sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
2725
sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
2826
sudo chmod +x /etc/init.d/xvfb
2927
sudo update-rc.d xvfb defaults

‎.github/workflows/no-yarn-lock-changes.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ jobs:
1818
run: |
1919
echo "user: ${{ github.event.pull_request.user.login }}"
2020
echo "role: ${{ fromJson(steps.get_permissions.outputs.data).permission }}"
21+
echo "is dependabot: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}"
2122
echo "should_run: ${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
22-
echo "::set-output name=should_run::${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) }}"
23+
echo "::set-output name=should_run::${{ !contains(fromJson('["admin", "write"]'), fromJson(steps.get_permissions.outputs.data).permission) && github.event.pull_request.user.login != 'dependabot[bot]' }}"
2324
- name: Get file changes
2425
uses: trilom/file-changes-action@ce38c8ce2459ca3c303415eec8cb0409857b4272
2526
if: ${{ steps.control.outputs.should_run == 'true' }}

‎.vscode/launch.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -201,24 +201,6 @@
201201
"order": 5
202202
}
203203
},
204-
{
205-
"type": "extensionHost",
206-
"request": "launch",
207-
"name": "VS Code Custom Editor Tests",
208-
"runtimeExecutable": "${execPath}",
209-
"args": [
210-
"${workspaceFolder}/extensions/vscode-custom-editor-tests/test-workspace",
211-
"--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode-custom-editor-tests",
212-
"--extensionTestsPath=${workspaceFolder}/extensions/vscode-custom-editor-tests/out/test"
213-
],
214-
"outFiles": [
215-
"${workspaceFolder}/out/**/*.js"
216-
],
217-
"presentation": {
218-
"group": "5_tests",
219-
"order": 6
220-
}
221-
},
222204
{
223205
"type": "pwa-chrome",
224206
"request": "attach",

‎.vscode/notebooks/api.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"June 2022\""
10+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"July 2022\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/endgame.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\r\n\r\n$MILESTONE=milestone:\"May 2022\""
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-unpkg\n\n$MILESTONE=milestone:\"June 2022\""
1111
},
1212
{
1313
"kind": 1,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"May 2022\"\n\n$MINE=assignee:@me"
10+
"value": "$REPOS=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-js-debug repo:microsoft/vscode-remote-release repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remotehub repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-livepreview repo:microsoft/vscode-python repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal\n\n$MILESTONE=milestone:\"June 2022\"\n\n$MINE=assignee:@me"
1111
},
1212
{
1313
"kind": 1,

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
],
7474
"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
7575
"git.branchRandomName.enable": true,
76+
"git.mergeEditor": true,
7677
"remote.extensionKind": {
7778
"msjsdiag.debugger-for-chrome": "workspace"
7879
},

‎.yarnrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
disturl "https://electronjs.org/headers"
2-
target "18.3.3"
2+
target "18.3.5"
33
runtime "electron"
44
build_from_source "true"

0 commit comments

Comments
 (0)