Skip to content

Commit b64f985

Browse files
deepak1556deepak1556
committed
Revert "chore: revert to electron@13 (#143851)"
This reverts commit df645f1.
1 parent da5b30d commit b64f985

File tree

109 files changed

+485
-400
lines changed

Some content is hidden

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

109 files changed

+485
-400
lines changed

‎.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-node@v2
2525
with:
26-
node-version: 14
26+
node-version: 16
2727

2828
- uses: actions/setup-python@v2
2929
with:
@@ -124,7 +124,7 @@ jobs:
124124
125125
- uses: actions/setup-node@v2
126126
with:
127-
node-version: 14
127+
node-version: 16
128128

129129
- name: Compute node modules cache key
130130
id: nodeModulesCacheKey
@@ -134,8 +134,8 @@ jobs:
134134
uses: actions/cache@v2
135135
with:
136136
path: "**/node_modules"
137-
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
138-
restore-keys: ${{ runner.os }}-cacheNodeModules20-
137+
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
138+
restore-keys: ${{ runner.os }}-cacheNodeModules19-
139139
- name: Get yarn cache directory path
140140
id: yarnCacheDirPath
141141
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -196,7 +196,7 @@ jobs:
196196

197197
- uses: actions/setup-node@v2
198198
with:
199-
node-version: 14
199+
node-version: 16
200200

201201
- name: Compute node modules cache key
202202
id: nodeModulesCacheKey
@@ -206,8 +206,8 @@ jobs:
206206
uses: actions/cache@v2
207207
with:
208208
path: "**/node_modules"
209-
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
210-
restore-keys: ${{ runner.os }}-cacheNodeModules20-
209+
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
210+
restore-keys: ${{ runner.os }}-cacheNodeModules19-
211211
- name: Get yarn cache directory path
212212
id: yarnCacheDirPath
213213
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -270,7 +270,7 @@ jobs:
270270

271271
- uses: actions/setup-node@v2
272272
with:
273-
node-version: 14
273+
node-version: 16
274274

275275
- name: Compute node modules cache key
276276
id: nodeModulesCacheKey
@@ -280,8 +280,8 @@ jobs:
280280
uses: actions/cache@v2
281281
with:
282282
path: "**/node_modules"
283-
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
284-
restore-keys: ${{ runner.os }}-cacheNodeModules20-
283+
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
284+
restore-keys: ${{ runner.os }}-cacheNodeModules19-
285285
- name: Get yarn cache directory path
286286
id: yarnCacheDirPath
287287
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}

‎.github/workflows/rich-navigation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- uses: actions/setup-node@v2
2626
with:
27-
node-version: 14
27+
node-version: 16
2828

2929
- name: Install dependencies
3030
if: steps.caching-stage.outputs.cache-hit != 'true'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pr:
1111
steps:
1212
- task: NodeTool@0
1313
inputs:
14-
versionSpec: "14.x"
14+
versionSpec: "16.x"
1515

1616
- task: AzureKeyVault@1
1717
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pr: none
77
steps:
88
- task: NodeTool@0
99
inputs:
10-
versionSpec: "14.x"
10+
versionSpec: "16.x"
1111

1212
- task: AzureKeyVault@1
1313
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"
@@ -114,7 +114,7 @@ steps:
114114
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.74:build/config/c++/BUILD.gn
115115
export CC=$PWD/.build/CR_Clang/bin/clang
116116
export CXX=$PWD/.build/CR_Clang/bin/clang++
117-
export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -D__NO_INLINE__ -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
117+
export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -isystem$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
118118
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -Wl,--lto-O0"
119119
export VSCODE_REMOTE_CC=$(which gcc)
120120
export VSCODE_REMOTE_CXX=$(which g++)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

‎build/azure-pipelines/linux/snap-build-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: DownloadPipelineArtifact@0
77
displayName: "Download Pipeline Artifact"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureCLI@2
77
inputs:

‎build/azure-pipelines/publish-types/publish-types.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pool:
1212
steps:
1313
- task: NodeTool@0
1414
inputs:
15-
versionSpec: "14.x"
15+
versionSpec: "16.x"
1616

1717
- bash: |
1818
TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)

‎build/azure-pipelines/sdl-scan.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ stages:
4747
outputFormat: "pre"
4848
- task: NodeTool@0
4949
inputs:
50-
versionSpec: "14.x"
50+
versionSpec: "16.x"
5151

5252
- task: AzureKeyVault@1
5353
displayName: "Azure Key Vault: Get Secrets"
@@ -139,7 +139,7 @@ stages:
139139
toolMajorVersion: "V2"
140140
- task: NodeTool@0
141141
inputs:
142-
versionSpec: "14.x"
142+
versionSpec: "16.x"
143143

144144
- task: AzureKeyVault@1
145145
displayName: "Azure Key Vault: Get Secrets"
@@ -189,10 +189,9 @@ stages:
189189
set -e
190190
export npm_config_arch=$(NPM_ARCH)
191191
192-
<<<<<<< HEAD
193192
if [ -z "$CC" ] || [ -z "$CXX" ]; then
194193
# Download clang based on chromium revision used by vscode
195-
curl -s https://raw.githubusercontent.com/chromium/chromium/91.0.4472.164/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
194+
curl -s https://raw.githubusercontent.com/chromium/chromium/96.0.4664.110/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
196195
# Download libcxx headers and objects from upstream electron releases
197196
DEBUG=libcxx-fetcher \
198197
VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
@@ -203,11 +202,8 @@ stages:
203202
# Set compiler toolchain
204203
export CC=$PWD/.build/CR_Clang/bin/clang
205204
export CXX=$PWD/.build/CR_Clang/bin/clang++
206-
export CXXFLAGS="-nostdinc++ -D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
205+
export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -isystem$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit"
207206
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
208-
=======
209-
if [ "$VSCODE_ARCH" == "x64" ]; then
210-
>>>>>>> f90f60e956e (chore: bump [email protected])
211207
export VSCODE_REMOTE_CC=$(which gcc)
212208
export VSCODE_REMOTE_CXX=$(which g++)
213209
fi

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "14.x"
4+
versionSpec: "16.x"
55

66
- task: UsePythonVersion@0
77
inputs:

‎build/lib/layersChecker.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,21 @@ const CORE_TYPES = [
5353
'trimLeft',
5454
'trimRight',
5555
'queueMicrotask',
56+
'Array',
57+
'Uint8Array',
58+
'Uint16Array',
59+
'Uint32Array',
60+
'Int8Array',
61+
'Int16Array',
62+
'Int32Array',
63+
'Float32Array',
64+
'Float64Array',
65+
'Uint8ClampedArray',
66+
'BigUint64Array',
67+
'BigInt64Array',
68+
'btoa',
69+
'atob',
70+
'AbortSignal',
5671
'MessageChannel',
5772
'MessagePort'
5873
];
@@ -145,6 +160,9 @@ const RULES = [
145160
target: '**/vs/**/browser/**',
146161
allowedTypes: CORE_TYPES,
147162
disallowedTypes: NATIVE_TYPES,
163+
allowedDefinitions: [
164+
'@types/node/stream/consumers.d.ts' // node.js started to duplicate types from lib.dom.d.ts so we have to account for that
165+
],
148166
disallowedDefinitions: [
149167
'@types/node' // no node.js
150168
]

‎build/lib/layersChecker.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,21 @@ const CORE_TYPES = [
5454
'trimLeft',
5555
'trimRight',
5656
'queueMicrotask',
57+
'Array',
58+
'Uint8Array',
59+
'Uint16Array',
60+
'Uint32Array',
61+
'Int8Array',
62+
'Int16Array',
63+
'Int32Array',
64+
'Float32Array',
65+
'Float64Array',
66+
'Uint8ClampedArray',
67+
'BigUint64Array',
68+
'BigInt64Array',
69+
'btoa',
70+
'atob',
71+
'AbortSignal',
5772
'MessageChannel',
5873
'MessagePort'
5974
];
@@ -158,6 +173,9 @@ const RULES = [
158173
target: '**/vs/**/browser/**',
159174
allowedTypes: CORE_TYPES,
160175
disallowedTypes: NATIVE_TYPES,
176+
allowedDefinitions: [
177+
'@types/node/stream/consumers.d.ts' // node.js started to duplicate types from lib.dom.d.ts so we have to account for that
178+
],
161179
disallowedDefinitions: [
162180
'@types/node' // no node.js
163181
]

‎build/npm/postinstall.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ for (let dir of dirs) {
6161
if (process.env['VSCODE_REMOTE_CC']) { env['CC'] = process.env['VSCODE_REMOTE_CC']; }
6262
if (process.env['VSCODE_REMOTE_CXX']) { env['CXX'] = process.env['VSCODE_REMOTE_CXX']; }
6363
if (process.env['CXXFLAGS']) { delete env['CXXFLAGS']; }
64+
if (process.env['CFLAGS']) { delete env['CFLAGS']; }
6465
if (process.env['LDFLAGS']) { delete env['LDFLAGS']; }
6566
if (process.env['VSCODE_REMOTE_NODE_GYP']) { env['npm_config_node_gyp'] = process.env['VSCODE_REMOTE_NODE_GYP']; }
6667

‎build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@types/minimist": "^1.2.1",
3030
"@types/mkdirp": "^1.0.1",
3131
"@types/mocha": "^8.2.0",
32-
"@types/node": "14.x",
32+
"@types/node": "16.x",
3333
"@types/p-limit": "^2.2.0",
3434
"@types/plist": "^3.0.2",
3535
"@types/pump": "^1.0.1",

‎build/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,10 +507,10 @@
507507
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
508508
integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==
509509

510-
"@types/node@14.x":
511-
version "14.14.43"
512-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
513-
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
510+
"@types/node@16.x":
511+
version "16.11.6"
512+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
513+
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
514514

515515
"@types/p-limit@^2.2.0":
516516
version "2.2.0"

‎extensions/configuration-editing/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
]
145145
},
146146
"devDependencies": {
147-
"@types/node": "14.x"
147+
"@types/node": "16.x"
148148
},
149149
"repository": {
150150
"type": "git",

‎extensions/configuration-editing/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"@types/node@14.x":
6-
version "14.14.43"
7-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
8-
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
5+
"@types/node@16.x":
6+
version "16.11.6"
7+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
8+
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
99

1010
jsonc-parser@^2.2.1:
1111
version "2.2.1"

‎extensions/css-language-features/client/src/node/nodeFs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function getNodeFSRequestService(): RequestService {
1414
}
1515
}
1616
return {
17-
getContent(location: string, encoding?: string) {
17+
getContent(location: string, encoding?: BufferEncoding) {
1818
ensureFileUri(location);
1919
return new Promise((c, e) => {
2020
const uri = Uri.parse(location);

‎extensions/css-language-features/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@
852852
"vscode-uri": "^3.0.3"
853853
},
854854
"devDependencies": {
855-
"@types/node": "14.x"
855+
"@types/node": "16.x"
856856
},
857857
"repository": {
858858
"type": "git",

‎extensions/css-language-features/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"devDependencies": {
1818
"@types/mocha": "^8.2.0",
19-
"@types/node": "14.x"
19+
"@types/node": "16.x"
2020
},
2121
"scripts": {
2222
"compile": "gulp compile-extension:css-language-features-server",

0 commit comments

Comments
 (0)