Skip to content

Commit 2029689

Browse files
jriekenjrieken
committed
Merge branch 'main' into joh/swc
2 parents 7820de9 + e367b12 commit 2029689

File tree

1,141 files changed

+15456
-12793
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,141 files changed

+15456
-12793
lines changed

‎.eslintrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
"constructor-super": "warn",
1515
"curly": "warn",
1616
"eqeqeq": "warn",
17+
"prefer-const": [
18+
"warn",
19+
{
20+
"destructuring": "all"
21+
}
22+
],
1723
"no-buffer-constructor": "warn",
1824
"no-caller": "warn",
1925
"no-case-declarations": "warn",

‎.github/workflows/basic.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ jobs:
4141
uses: actions/cache@v3
4242
with:
4343
path: "**/node_modules"
44-
key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }}
45-
restore-keys: ${{ runner.os }}-cacheNodeModules21-
44+
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
45+
restore-keys: ${{ runner.os }}-cacheNodeModules22-
4646
- name: Get yarn cache directory path
4747
id: yarnCacheDirPath
4848
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -97,8 +97,8 @@ jobs:
9797
uses: actions/cache@v3
9898
with:
9999
path: "**/node_modules"
100-
key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }}
101-
restore-keys: ${{ runner.os }}-cacheNodeModules21-
100+
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
101+
restore-keys: ${{ runner.os }}-cacheNodeModules22-
102102
- name: Get yarn cache directory path
103103
id: yarnCacheDirPath
104104
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -163,8 +163,8 @@ jobs:
163163
uses: actions/cache@v3
164164
with:
165165
path: "**/node_modules"
166-
key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }}
167-
restore-keys: ${{ runner.os }}-cacheNodeModules21-
166+
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
167+
restore-keys: ${{ runner.os }}-cacheNodeModules22-
168168
- name: Get yarn cache directory path
169169
id: yarnCacheDirPath
170170
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}

‎.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ jobs:
125125
uses: actions/cache@v2
126126
with:
127127
path: "**/node_modules"
128-
key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }}
129-
restore-keys: ${{ runner.os }}-cacheNodeModules21-
128+
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
129+
restore-keys: ${{ runner.os }}-cacheNodeModules22-
130130
- name: Get yarn cache directory path
131131
id: yarnCacheDirPath
132132
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -197,8 +197,8 @@ jobs:
197197
uses: actions/cache@v2
198198
with:
199199
path: "**/node_modules"
200-
key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }}
201-
restore-keys: ${{ runner.os }}-cacheNodeModules21-
200+
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
201+
restore-keys: ${{ runner.os }}-cacheNodeModules22-
202202
- name: Get yarn cache directory path
203203
id: yarnCacheDirPath
204204
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -271,8 +271,8 @@ jobs:
271271
uses: actions/cache@v2
272272
with:
273273
path: "**/node_modules"
274-
key: ${{ runner.os }}-cacheNodeModules21-${{ steps.nodeModulesCacheKey.outputs.value }}
275-
restore-keys: ${{ runner.os }}-cacheNodeModules21-
274+
key: ${{ runner.os }}-cacheNodeModules22-${{ steps.nodeModulesCacheKey.outputs.value }}
275+
restore-keys: ${{ runner.os }}-cacheNodeModules22-
276276
- name: Get yarn cache directory path
277277
id: yarnCacheDirPath
278278
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}

‎.github/workflows/pr-chat.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ jobs:
2121
with:
2222
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
2323
slack_token: ${{ secrets.SLACK_TOKEN }}
24+
slack_user_token: ${{ secrets.SLACK_USER_TOKEN }}
2425
slack_bot_name: "VSCodeBot"
2526
notification_channel: codereview

‎.vscode/launch.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
"request": "attach",
1717
"restart": true,
1818
"name": "Attach to Extension Host",
19-
// set to a large number: if there is an issue we're debugging that keeps
20-
// the extension host from coming up, or the renderer is paused/crashes
21-
// before it happens, developers will get an annoying alert, e.g. #126826.
22-
// This can be set to 0 in 1.59.
23-
"timeout": 999999999,
19+
"timeout": 0,
2420
"port": 5870,
2521
"outFiles": [
2622
"${workspaceFolder}/out/**/*.js",
@@ -244,6 +240,7 @@
244240
"runtimeArgs": [
245241
"--inspect=5875",
246242
"--no-cached-data",
243+
"--crash-reporter-directory=${workspaceFolder}/.profile-oss/crashes",
247244
// for general runtime freezes: https://github.com/microsoft/vscode/issues/127861#issuecomment-904144910
248245
"--disable-features=CalculateNativeWinOcclusion",
249246
],

‎.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:\"May 2022\""
10+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"June 2022\""
1111
},
1212
{
1313
"kind": 1,

‎.vscode/notebooks/my-work.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": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"May 2022\""
10+
"value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-dev repo:microsoft/vscode-unpkg repo:microsoft/vscode-references-view repo:microsoft/vscode-anycode repo:microsoft/vscode-hexeditor repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-livepreview repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-remote-repositories-github repo:microsoft/monaco-editor repo:microsoft/vscode-vsce\n\n// current milestone name\n$milestone=milestone:\"June 2022\""
1111
},
1212
{
1313
"kind": 1,

‎.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 "17.4.7"
2+
target "18.3.2"
33
runtime "electron"
44
build_from_source "true"

‎build/.cachesalt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2022-05-10T08:20:50.162Z
1+
2022-06-10T10:20:54.664Z

‎build/azure-pipelines/common/computeNodeModulesCacheKey.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ shasum.update(fs.readFileSync(path.join(ROOT, 'build/.cachesalt')));
1414
shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
1515
shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
1616
// Add `package.json` and `yarn.lock` files
17-
for (let dir of dirs) {
17+
for (const dir of dirs) {
1818
const packageJsonPath = path.join(ROOT, dir, 'package.json');
1919
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath).toString());
2020
const relevantPackageJsonSections = {

0 commit comments

Comments
 (0)