chore: revert to Electron 19 (#175851)

* Revert "Update to min supported version of node (#175723)" This reverts commit f749e6b. * Revert "chore: update min node version for development (#175663)" This reverts commit f2a822f. * Revert "electron 22 sandbox - enable for OSS (#175659)" This reverts commit 2551af2. * Revert "chore: update to Electron 22 (#166430)" This reverts commit 6e85d2b.
microsoft · Mar 2, 2023 · 3a11b47 · 3a11b47
1 parent 3a5a1f8
commit 3a11b47
Show file tree

Hide file tree

Showing 33 changed files with 467 additions and 284 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.17
+16.14
diff --git a/.yarnrc b/.yarnrc
@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "22.3.1"
+target "19.1.9"
 runtime "electron"
 build_from_source "true"
diff --git a/build/azure-pipelines/linux/product-build-linux-client.yml b/build/azure-pipelines/linux/product-build-linux-client.yml
@@ -170,7 +170,7 @@ steps:
 
       if [ -z "$CC" ] || [ -z "$CXX" ]; then
         # Download clang based on chromium revision used by vscode
-        curl -s https://raw.githubusercontent.com/chromium/chromium/108.0.5359.215/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
+        curl -s https://raw.githubusercontent.com/chromium/chromium/98.0.4758.109/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
         # Download libcxx headers and objects from upstream electron releases
         DEBUG=libcxx-fetcher \
         VSCODE_LIBCXX_OBJECTS_DIR=$PWD/.build/libcxx-objects \
@@ -180,12 +180,12 @@ steps:
         node build/linux/libcxx-fetcher.js
         # Set compiler toolchain
         # Flags for the client build are based on
-        # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/arm.gni
-        # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/compiler/BUILD.gn
-        # https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:build/config/c++/BUILD.gn
+        # https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:build/config/arm.gni
+        # https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:build/config/compiler/BUILD.gn
+        # https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:build/config/c++/BUILD.gn
         export CC=$PWD/.build/CR_Clang/bin/clang
         export CXX=$PWD/.build/CR_Clang/bin/clang++
-        export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr"
+        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"
         export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -Wl,--lto-O0"
         export VSCODE_REMOTE_CC=$(which gcc)
         export VSCODE_REMOTE_CXX=$(which g++)

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
@@ -153,11 +153,11 @@ resources:
       endpoint: VSCodeHub
       options: --user 0:0 --cap-add SYS_ADMIN
     - container: vscode-arm64
-      image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-arm64
+      image: vscodehub.azurecr.io/vscode-linux-build-agent:stretch-arm64
       endpoint: VSCodeHub
       options: --user 0:0 --cap-add SYS_ADMIN
     - container: vscode-armhf
-      image: vscodehub.azurecr.io/vscode-linux-build-agent:buster-armhf
+      image: vscodehub.azurecr.io/vscode-linux-build-agent:stretch-armhf
       endpoint: VSCodeHub
       options: --user 0:0 --cap-add SYS_ADMIN
     - container: centos7-devtoolset8-x64

diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml
@@ -259,7 +259,7 @@ stages:
                 # Set compiler toolchain
                 export CC=$PWD/.build/CR_Clang/bin/clang
                 export CXX=$PWD/.build/CR_Clang/bin/clang++
-                export CXXFLAGS="-std=c++17 -nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr"
+                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"
                 export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -fsplit-lto-unit -L$PWD/.build/libcxx-objects -lc++abi"
                 export VSCODE_REMOTE_CC=$(which gcc)
                 export VSCODE_REMOTE_CXX=$(which g++)

diff --git a/build/lib/electron.js b/build/lib/electron.js
diff --git a/build/lib/electron.ts b/build/lib/electron.ts
@@ -91,7 +91,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
 }
 
 export const config = {
-	version: product.electronRepository ? '22.10.0' : util.getElectronVersion(),
+	version: product.electronRepository ? '19.1.11' : util.getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2022 Microsoft. All rights reserved',
@@ -212,7 +212,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 }
 
 async function main(arch = process.arch): Promise<void> {
-	const version = product.electronRepository ? '22.10.0' : util.getElectronVersion();
+	const version = product.electronRepository ? '19.1.11' : util.getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');
 	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

diff --git a/build/lib/layersChecker.js b/build/lib/layersChecker.js
diff --git a/build/lib/layersChecker.ts b/build/lib/layersChecker.ts
@@ -81,6 +81,12 @@ const RULES: IRule[] = [
 		skip: true // -> skip all test files
 	},
 
+	// TODO@bpasero remove me once electron utility process has landed
+	{
+		target: '**/vs/workbench/services/extensions/electron-sandbox/nativeLocalProcessExtensionHost.ts',
+		skip: true
+	},
+
 	// Common: vs/base/common/platform.ts
 	{
 		target: '**/vs/base/common/platform.ts',

diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
@@ -23,7 +23,7 @@ export const recommendedDeps = [
 export const referenceGeneratedDepsByArch = {
 	'amd64': [
 		'ca-certificates',
-		'libasound2 (>= 1.0.17)',
+		'libasound2 (>= 1.0.16)',
 		'libatk-bridge2.0-0 (>= 2.5.3)',
 		'libatk1.0-0 (>= 2.2.0)',
 		'libatspi2.0-0 (>= 2.9.90)',
@@ -34,9 +34,9 @@ export const referenceGeneratedDepsByArch = {
 		'libcairo2 (>= 1.6.0)',
 		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
 		'libdbus-1-3 (>= 1.5.12)',
-		'libdrm2 (>= 2.4.60)',
+		'libdrm2 (>= 2.4.38)',
 		'libexpat1 (>= 2.0.1)',
-		'libgbm1 (>= 17.1.0~rc2)',
+		'libgbm1 (>= 8.1~0)',
 		'libglib2.0-0 (>= 2.16.0)',
 		'libglib2.0-0 (>= 2.39.4)',
 		'libgtk-3-0 (>= 3.9.10)',
@@ -60,20 +60,20 @@ export const referenceGeneratedDepsByArch = {
 	],
 	'armhf': [
 		'ca-certificates',
-		'libasound2 (>= 1.0.17)',
+		'libasound2 (>= 1.0.16)',
 		'libatk-bridge2.0-0 (>= 2.5.3)',
 		'libatk1.0-0 (>= 2.2.0)',
 		'libatspi2.0-0 (>= 2.9.90)',
+		'libc6 (>= 2.15)',
 		'libc6 (>= 2.17)',
-		'libc6 (>= 2.28)',
 		'libc6 (>= 2.4)',
 		'libc6 (>= 2.9)',
 		'libcairo2 (>= 1.6.0)',
 		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
 		'libdbus-1-3 (>= 1.5.12)',
-		'libdrm2 (>= 2.4.60)',
+		'libdrm2 (>= 2.4.38)',
 		'libexpat1 (>= 2.0.1)',
-		'libgbm1 (>= 17.1.0~rc2)',
+		'libgbm1 (>= 8.1~0)',
 		'libglib2.0-0 (>= 2.16.0)',
 		'libglib2.0-0 (>= 2.39.4)',
 		'libgtk-3-0 (>= 3.9.10)',
@@ -84,7 +84,6 @@ export const referenceGeneratedDepsByArch = {
 		'libpango-1.0-0 (>= 1.14.0)',
 		'libsecret-1-0 (>= 0.18)',
 		'libstdc++6 (>= 4.1.1)',
-		'libstdc++6 (>= 5)',
 		'libstdc++6 (>= 5.2)',
 		'libstdc++6 (>= 6)',
 		'libx11-6',
@@ -101,18 +100,20 @@ export const referenceGeneratedDepsByArch = {
 	],
 	'arm64': [
 		'ca-certificates',
-		'libasound2 (>= 1.0.17)',
+		'libasound2 (>= 1.0.16)',
 		'libatk-bridge2.0-0 (>= 2.5.3)',
 		'libatk1.0-0 (>= 2.2.0)',
 		'libatspi2.0-0 (>= 2.9.90)',
 		'libc6 (>= 2.17)',
-		'libc6 (>= 2.28)',
 		'libcairo2 (>= 1.6.0)',
 		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
 		'libdbus-1-3 (>= 1.0.2)',
-		'libdrm2 (>= 2.4.60)',
+		'libdrm2 (>= 2.4.38)',
 		'libexpat1 (>= 2.0.1)',
-		'libgbm1 (>= 17.1.0~rc2)',
+		'libgbm1 (>= 8.1~0)',
+		'libgcc1 (>= 1:3.0)',
+		'libgcc1 (>= 1:4.2)',
+		'libgcc1 (>= 1:4.5)',
 		'libglib2.0-0 (>= 2.16.0)',
 		'libglib2.0-0 (>= 2.39.4)',
 		'libgtk-3-0 (>= 3.9.10)',
@@ -123,7 +124,6 @@ export const referenceGeneratedDepsByArch = {
 		'libpango-1.0-0 (>= 1.14.0)',
 		'libsecret-1-0 (>= 0.18)',
 		'libstdc++6 (>= 4.1.1)',
-		'libstdc++6 (>= 5)',
 		'libstdc++6 (>= 5.2)',
 		'libstdc++6 (>= 6)',
 		'libx11-6',