Skip to content

Commit f9b09e4

Browse files
jriekenjrieken
committed
Merge branch 'main' into joh/swc
2 parents d7d859c + 4cbbc0b commit f9b09e4

File tree

617 files changed

+13027
-7574
lines changed

Some content is hidden

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

617 files changed

+13027
-7574
lines changed

‎.eslintignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
**/src/typings/**/*.d.ts
2626
**/src/vs/*/**/*.d.ts
2727
**/src/vs/base/test/common/filters.perf.data.js
28-
**/src/vs/css.build.js
29-
**/src/vs/css.js
3028
**/src/vs/loader.js
31-
**/src/vs/nls.build.js
32-
**/src/vs/nls.js
3329
**/test/unit/assert.js
3430
**/typings/**

‎.eslintrc.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@
210210
// - electron-browser
211211
"when": "hasBrowser",
212212
"allow": [
213-
"vs/css!./**/*"
213+
"vs/css!./**/*",
214+
"@microsoft/applicationinsights-web"
214215
]
215216
},
216217
{
@@ -220,13 +221,14 @@
220221
// - electron-main
221222
"when": "hasNode",
222223
"allow": [
223-
"@microsoft/applicationinsights-web",
224224
"@parcel/watcher",
225225
"@vscode/sqlite3",
226226
"@vscode/vscode-languagedetection",
227227
"@vscode/ripgrep",
228228
"@vscode/iconv-lite-umd",
229229
"applicationinsights",
230+
"@microsoft/1ds-core-js",
231+
"@microsoft/1ds-post-js",
230232
"assert",
231233
"child_process",
232234
"console",
@@ -443,8 +445,7 @@
443445
}, // TODO@layers
444446
"tas-client-umd", // node module allowed even in /common/
445447
"vscode-textmate", // node module allowed even in /common/
446-
"@vscode/vscode-languagedetection", // node module allowed even in /common/
447-
"@microsoft/applicationinsights-web" // node module allowed even in /common/
448+
"@vscode/vscode-languagedetection" // node module allowed even in /common/
448449
]
449450
},
450451
{
@@ -575,7 +576,7 @@
575576
"restrictions": []
576577
},
577578
{
578-
"target": "src/vs/{css.d.ts,monaco.d.ts,nls.d.ts,nls.mock.ts}",
579+
"target": "src/vs/{loader.d.ts,css.ts,css.build.ts,monaco.d.ts,nls.ts,nls.build.ts,nls.mock.ts}",
579580
"restrictions": []
580581
},
581582
{

‎.github/workflows/basic.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ jobs:
6262
run: yarn --frozen-lockfile --network-timeout 180000
6363

6464
- name: Compile and Download
65-
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
66-
67-
- name: Compile Integration Tests
68-
run: yarn --cwd test/integration/browser compile
65+
run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64"
6966

7067
- name: Run Unit Tests
7168
id: electron-unit-tests
@@ -117,9 +114,6 @@ jobs:
117114
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
118115
run: yarn --frozen-lockfile --network-timeout 180000
119116

120-
- name: Download Playwright
121-
run: yarn playwright-install
122-
123117
- name: Run Hygiene Checks
124118
run: yarn gulp hygiene
125119

‎.vscode/launch.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,23 @@
9292
"order": 6
9393
}
9494
},
95+
{
96+
"type": "extensionHost",
97+
"request": "launch",
98+
"name": "VS Code Configuration Editing Tests",
99+
"runtimeExecutable": "${execPath}",
100+
"args": [
101+
"--extensionDevelopmentPath=${workspaceFolder}/extensions/configuration-editing",
102+
"--extensionTestsPath=${workspaceFolder}/extensions/configuration-editing/out/test"
103+
],
104+
"outFiles": [
105+
"${workspaceFolder}/out/**/*.js"
106+
],
107+
"presentation": {
108+
"group": "5_tests",
109+
"order": 6
110+
}
111+
},
95112
{
96113
"type": "extensionHost",
97114
"request": "launch",

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

‎build/.moduleignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ vscode-windows-ca-certs/**/*
122122
node-addon-api/**/*
123123
prebuild-install/**/*
124124

125-
@microsoft/applicationinsights*/**
126-
@microsoft/dynamicproto-js/**
127-
!@microsoft/applicationinsights-web/dist/applicationinsights-web.min.js
128-
129125
# other node modules
130126

131127
**/docs/**

‎build/.webignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,3 @@ xterm-addon-webgl/out/**
3333
# This makes sure the model is included in the package
3434
!@vscode/vscode-languagedetection/model/**
3535

36-
@microsoft/applicationinsights*/**
37-
@microsoft/dynamicproto-js/**
38-
!@microsoft/applicationinsights-web/dist/applicationinsights-web.min.js

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

Lines changed: 67 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
steps:
2-
- checkout: self
3-
fetchDepth: 1
4-
52
- task: NodeTool@0
63
inputs:
74
versionSpec: "16.x"
@@ -11,35 +8,93 @@ steps:
118
inputs:
129
azureSubscription: "vscode-builds-subscription"
1310
KeyVaultName: vscode
14-
SecretsFilter: "ESRP-PKI,esrp-aad-username,esrp-aad-password"
11+
SecretsFilter: "github-distro-mixin-password,ESRP-PKI,esrp-aad-username,esrp-aad-password"
12+
13+
- script: |
14+
set -e
15+
cat << EOF > ~/.netrc
16+
machine github.com
17+
login vscode
18+
password $(github-distro-mixin-password)
19+
EOF
20+
21+
git config user.email "[email protected]"
22+
git config user.name "VSCode"
23+
displayName: Prepare tooling
24+
25+
- script: |
26+
set -e
27+
git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF
28+
echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)"
29+
git checkout FETCH_HEAD
30+
condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' '))
31+
displayName: Checkout override commit
32+
33+
- script: |
34+
set -e
35+
git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
36+
displayName: Merge distro
37+
38+
- script: |
39+
mkdir -p .build
40+
node build/azure-pipelines/common/computeNodeModulesCacheKey.js x64 $ENABLE_TERRAPIN > .build/yarnlockhash
41+
displayName: Prepare yarn cache flags
1542
1643
- task: Cache@2
1744
inputs:
18-
key: "buildNodeModules | $(Agent.OS) | $(VSCODE_ARCH) | build/yarn.lock"
19-
path: build/node_modules
20-
cacheHitVar: BUILD_NODE_MODULES_RESTORED
21-
displayName: Restore build node_modules cache
45+
key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
46+
path: .build/node_modules_cache
47+
cacheHitVar: NODE_MODULES_RESTORED
48+
displayName: Restore node_modules cache
49+
50+
- script: |
51+
set -e
52+
tar -xzf .build/node_modules_cache/cache.tgz
53+
displayName: Extract node_modules cache
54+
condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
55+
56+
- script: |
57+
set -e
58+
npm install -g node-gyp@latest
59+
node-gyp --version
60+
displayName: Update node-gyp
61+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
2262
2363
- script: |
2464
set -e
2565
npx https://aka.ms/enablesecurefeed standAlone
2666
timeoutInMinutes: 5
2767
retryCountOnTaskFailure: 3
28-
condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'), ne(variables.BUILD_NODE_MODULES_RESTORED, 'true'))
68+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
2969
displayName: Switch to Terrapin packages
3070
3171
- script: |
3272
set -e
73+
export npm_config_arch=$(VSCODE_ARCH)
74+
export npm_config_node_gyp=$(which node-gyp)
75+
3376
for i in {1..3}; do # try 3 times, for Terrapin
34-
yarn --cwd build --frozen-lockfile --check-files && break
77+
yarn --frozen-lockfile --check-files && break
3578
if [ $i -eq 3 ]; then
3679
echo "Yarn failed too many times" >&2
3780
exit 1
3881
fi
3982
echo "Yarn failed $i, trying again..."
4083
done
41-
displayName: Install build dependencies
42-
condition: and(succeeded(), ne(variables.BUILD_NODE_MODULES_RESTORED, 'true'))
84+
env:
85+
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
86+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
87+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
88+
displayName: Install dependencies
89+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
90+
91+
- script: |
92+
set -e
93+
node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
94+
mkdir -p .build/node_modules_cache
95+
tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
96+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
97+
displayName: Create node_modules archive
4398
4499
- download: current
45100
artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ steps:
3838
- script: |
3939
set -e
4040
yarn gulp \
41+
compile-extension:configuration-editing \
4142
compile-extension:css-language-features-server \
4243
compile-extension:emmet \
4344
compile-extension:git \

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

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,70 @@ steps:
3636
displayName: Merge distro
3737
3838
- script: |
39-
set -e
40-
node build/azure-pipelines/mixin
41-
displayName: Mix in quality
39+
mkdir -p .build
40+
node build/azure-pipelines/common/computeNodeModulesCacheKey.js x64 $ENABLE_TERRAPIN > .build/yarnlockhash
41+
displayName: Prepare yarn cache flags
4242
4343
- task: Cache@2
4444
inputs:
45-
key: "buildNodeModules | $(Agent.OS) | $(VSCODE_ARCH) | build/yarn.lock"
46-
path: build/node_modules
47-
cacheHitVar: BUILD_NODE_MODULES_RESTORED
48-
displayName: Restore build node_modules cache
45+
key: "nodeModules | $(Agent.OS) | .build/yarnlockhash"
46+
path: .build/node_modules_cache
47+
cacheHitVar: NODE_MODULES_RESTORED
48+
displayName: Restore node_modules cache
49+
50+
- script: |
51+
set -e
52+
tar -xzf .build/node_modules_cache/cache.tgz
53+
displayName: Extract node_modules cache
54+
condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
55+
56+
- script: |
57+
set -e
58+
npm install -g node-gyp@latest
59+
node-gyp --version
60+
displayName: Update node-gyp
61+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
4962
5063
- script: |
5164
set -e
5265
npx https://aka.ms/enablesecurefeed standAlone
5366
timeoutInMinutes: 5
5467
retryCountOnTaskFailure: 3
55-
condition: and(succeeded(), eq(variables['ENABLE_TERRAPIN'], 'true'), ne(variables.BUILD_NODE_MODULES_RESTORED, 'true'))
68+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
5669
displayName: Switch to Terrapin packages
5770
5871
- script: |
5972
set -e
73+
export npm_config_arch=$(VSCODE_ARCH)
74+
export npm_config_node_gyp=$(which node-gyp)
75+
6076
for i in {1..3}; do # try 3 times, for Terrapin
61-
yarn --cwd build --frozen-lockfile --check-files && break
77+
yarn --frozen-lockfile --check-files && break
6278
if [ $i -eq 3 ]; then
6379
echo "Yarn failed too many times" >&2
6480
exit 1
6581
fi
6682
echo "Yarn failed $i, trying again..."
6783
done
68-
displayName: Install build dependencies
69-
condition: and(succeeded(), ne(variables.BUILD_NODE_MODULES_RESTORED, 'true'))
84+
env:
85+
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
86+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
87+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
88+
displayName: Install dependencies
89+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
90+
91+
- script: |
92+
set -e
93+
node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
94+
mkdir -p .build/node_modules_cache
95+
tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
96+
condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
97+
displayName: Create node_modules archive
98+
99+
- script: |
100+
set -e
101+
node build/azure-pipelines/mixin
102+
displayName: Mix in quality
70103
71104
- download: current
72105
artifact: unsigned_vscode_client_darwin_x64_archive

0 commit comments

Comments
 (0)