Skip to content

Commit bc6cd21

Browse files
deepak1556deepak1556
committed
Revert "chore: update to electron 16 (#137241)"
This reverts commit 01df559. This reverts commit 4630133
1 parent 6cde4b0 commit bc6cd21

File tree

123 files changed

+615
-557
lines changed

Some content is hidden

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

123 files changed

+615
-557
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: 16
26+
node-version: 14
2727

2828
- uses: actions/setup-python@v2
2929
with:
@@ -113,7 +113,7 @@ jobs:
113113
114114
- uses: actions/setup-node@v2
115115
with:
116-
node-version: 16
116+
node-version: 14
117117

118118
- name: Compute node modules cache key
119119
id: nodeModulesCacheKey
@@ -123,8 +123,8 @@ jobs:
123123
uses: actions/cache@v2
124124
with:
125125
path: "**/node_modules"
126-
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
127-
restore-keys: ${{ runner.os }}-cacheNodeModules19-
126+
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
127+
restore-keys: ${{ runner.os }}-cacheNodeModules20-
128128
- name: Get yarn cache directory path
129129
id: yarnCacheDirPath
130130
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -185,7 +185,7 @@ jobs:
185185

186186
- uses: actions/setup-node@v2
187187
with:
188-
node-version: 16
188+
node-version: 14
189189

190190
- name: Compute node modules cache key
191191
id: nodeModulesCacheKey
@@ -195,8 +195,8 @@ jobs:
195195
uses: actions/cache@v2
196196
with:
197197
path: "**/node_modules"
198-
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
199-
restore-keys: ${{ runner.os }}-cacheNodeModules19-
198+
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
199+
restore-keys: ${{ runner.os }}-cacheNodeModules20-
200200
- name: Get yarn cache directory path
201201
id: yarnCacheDirPath
202202
if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
@@ -259,7 +259,7 @@ jobs:
259259

260260
- uses: actions/setup-node@v2
261261
with:
262-
node-version: 16
262+
node-version: 14
263263

264264
- name: Compute node modules cache key
265265
id: nodeModulesCacheKey
@@ -269,8 +269,8 @@ jobs:
269269
uses: actions/cache@v2
270270
with:
271271
path: "**/node_modules"
272-
key: ${{ runner.os }}-cacheNodeModules19-${{ steps.nodeModulesCacheKey.outputs.value }}
273-
restore-keys: ${{ runner.os }}-cacheNodeModules19-
272+
key: ${{ runner.os }}-cacheNodeModules20-${{ steps.nodeModulesCacheKey.outputs.value }}
273+
restore-keys: ${{ runner.os }}-cacheNodeModules20-
274274
- name: Get yarn cache directory path
275275
id: yarnCacheDirPath
276276
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: 16
27+
node-version: 14
2828

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

‎.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 "16.0.9"
2+
target "13.5.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-02-10T01:18:08.504Z
1+
2022-02-24T13:55:48.169Z

‎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: "16.x"
4+
versionSpec: "14.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: "16.x"
4+
versionSpec: "14.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: "16.x"
14+
versionSpec: "14.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: "16.x"
10+
versionSpec: "14.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: "16.x"
4+
versionSpec: "14.x"
55

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

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

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

66
- task: AzureKeyVault@1
77
displayName: "Azure Key Vault: Get Secrets"
@@ -99,7 +99,7 @@ steps:
9999
100100
if [ -z "$CC" ] || [ -z "$CXX" ]; then
101101
# Download clang based on chromium revision used by vscode
102-
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
102+
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
103103
# Download libcxx headers and objects from upstream electron releases
104104
DEBUG=libcxx-fetcher \
105105
VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
@@ -109,12 +109,12 @@ steps:
109109
node build/linux/libcxx-fetcher.js
110110
# Set compiler toolchain
111111
# Flags for the client build are based on
112-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/arm.gni
113-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/compiler/BUILD.gn
114-
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/96.0.4664.110:build/config/c++/BUILD.gn
112+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164:build/config/arm.gni
113+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164:build/config/compiler/BUILD.gn
114+
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/91.0.4472.164: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__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"
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"
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: "16.x"
4+
versionSpec: "14.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: "16.x"
4+
versionSpec: "14.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: "16.x"
4+
versionSpec: "14.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: "16.x"
4+
versionSpec: "14.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: "16.x"
15+
versionSpec: "14.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: 6 additions & 6 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: "16.x"
50+
versionSpec: "14.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: "16.x"
142+
versionSpec: "14.x"
143143

144144
- task: AzureKeyVault@1
145145
displayName: "Azure Key Vault: Get Secrets"
@@ -191,7 +191,7 @@ stages:
191191
192192
if [ -z "$CC" ] || [ -z "$CXX" ]; then
193193
# Download clang based on chromium revision used by vscode
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
194+
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
195195
# Download libcxx headers and objects from upstream electron releases
196196
DEBUG=libcxx-fetcher \
197197
VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
@@ -202,13 +202,13 @@ stages:
202202
# Set compiler toolchain
203203
export CC=$PWD/.build/CR_Clang/bin/clang
204204
export CXX=$PWD/.build/CR_Clang/bin/clang++
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"
205+
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"
206206
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
207207
fi
208208
209209
if [ "$VSCODE_ARCH" == "x64" ]; then
210-
export VSCODE_REMOTE_CC=$(which gcc-4.9)
211-
export VSCODE_REMOTE_CXX=$(which g++-4.9)
210+
export VSCODE_REMOTE_CC=$(which gcc-4.8)
211+
export VSCODE_REMOTE_CXX=$(which g++-4.8)
212212
fi
213213
214214
for i in {1..3}; do # try 3 times, for Terrapin

‎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: "16.x"
4+
versionSpec: "14.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: "16.x"
4+
versionSpec: "14.x"
55

66
- task: UsePythonVersion@0
77
inputs:

‎build/lib/layersChecker.js

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,6 @@ 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',
7156
'MessageChannel',
7257
'MessagePort'
7358
];
@@ -104,18 +89,19 @@ const RULES = [
10489
// Common: vs/platform/environment/common/*
10590
{
10691
target: '**/vs/platform/environment/common/*.ts',
107-
allowedTypes: CORE_TYPES,
10892
disallowedTypes: [ /* Ignore native types that are defined from here */],
93+
allowedTypes: CORE_TYPES,
10994
disallowedDefinitions: [
11095
'lib.dom.d.ts',
11196
'@types/node' // no node.js
11297
]
11398
},
11499
// Common: vs/platform/window/common/window.ts
115100
{
116-
target: '**/vs/platform/window/common/window.ts',
101+
target: '**/vs/platform/windows/common/windows.ts',
117102
allowedTypes: CORE_TYPES,
118103
disallowedTypes: [ /* Ignore native types that are defined from here */],
104+
allowedTypes: CORE_TYPES,
119105
disallowedDefinitions: [
120106
'lib.dom.d.ts',
121107
'@types/node' // no node.js
@@ -124,8 +110,8 @@ const RULES = [
124110
// Common: vs/platform/native/common/native.ts
125111
{
126112
target: '**/vs/platform/native/common/native.ts',
127-
allowedTypes: CORE_TYPES,
128113
disallowedTypes: [ /* Ignore native types that are defined from here */],
114+
allowedTypes: CORE_TYPES,
129115
disallowedDefinitions: [
130116
'lib.dom.d.ts',
131117
'@types/node' // no node.js
@@ -160,9 +146,6 @@ const RULES = [
160146
target: '**/vs/**/browser/**',
161147
allowedTypes: CORE_TYPES,
162148
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-
],
166149
disallowedDefinitions: [
167150
'@types/node' // no node.js
168151
]
@@ -246,20 +229,13 @@ function checkFile(program, sourceFile, rule) {
246229
if (symbol) {
247230
const declarations = symbol.declarations;
248231
if (Array.isArray(declarations)) {
249-
DeclarationLoop: for (const declaration of declarations) {
232+
for (const declaration of declarations) {
250233
if (declaration) {
251234
const parent = declaration.parent;
252235
if (parent) {
253236
const parentSourceFile = parent.getSourceFile();
254237
if (parentSourceFile) {
255238
const definitionFileName = parentSourceFile.fileName;
256-
if (rule.allowedDefinitions) {
257-
for (const allowedDefinition of rule.allowedDefinitions) {
258-
if (definitionFileName.indexOf(allowedDefinition) >= 0) {
259-
continue DeclarationLoop;
260-
}
261-
}
262-
}
263239
if (rule.disallowedDefinitions) {
264240
for (const disallowedDefinition of rule.disallowedDefinitions) {
265241
if (definitionFileName.indexOf(disallowedDefinition) >= 0) {

0 commit comments

Comments
 (0)