Update to Electron 4.0.x (#73119)

* Bump electron@4.0.0-beta.9 * electron 4 - temporarily warn about exploration change * update to Electron 4.0.0 stable * remove electron 4 notification * bump to electron@4.0.1 * electron 4: adopt format change of "version" file * build - set to use exploration image * Revert "build - set to use exploration image" This reverts commit 1bb280f. * electron@4.0.2 * fix electron.d.ts * update distro * bump electron@4.0.4 * debt - adopt new process.getProcessMemoryInfo() * update electron@4.0.5 * electron@4.0.6 * electron 4.0.x - remove Linux 32bit build * electron@4.0.7 * electron - update to 4.1.2 * bump electron@4.1.4 * update build (remove Linux32) * electron@4.1.5 * electron 4 - remove linux 32bit warning * Remove more 32-bit Linux build stuff Fixes #66271 * electron@4.2.0 * electron@4.2.1 * electron@4.2.2 * electron@4.2.3 * Revert "electron@4.2.3" This reverts commit ae375ef. * Revert "Revert "electron@4.2.3"" This reverts commit 513581e.
microsoft · Jun 4, 2019 · 73643c6 · 73643c6
1 parent f27ce91
commit 73643c6
Show file tree

Hide file tree

Showing 19 changed files with 832 additions and 464 deletions.
diff --git a/.yarnrc b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "3.1.8"
+target "4.2.3"
 runtime "electron"
diff --git a/build/azure-pipelines/common/symbols.ts b/build/azure-pipelines/common/symbols.ts
@@ -36,7 +36,6 @@ export interface IVersionAccessor extends IApplicationAccessor {
 enum Platform {
 	WIN_32 = 'win32-ia32',
 	WIN_64 = 'win32-x64',
-	LINUX_32 = 'linux-ia32',
 	LINUX_64 = 'linux-x64',
 	MAC_OS = 'darwin-x64'
 }
@@ -191,7 +190,7 @@ if (process.platform === 'darwin') {
 } else if (process.platform === 'win32') {
 	platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
 } else {
-	platform = is64 ? Platform.LINUX_64 : Platform.LINUX_32;
+	platform = Platform.LINUX_64;
 }
 
 // Create version and upload symbols in HockeyApp

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
@@ -16,9 +16,6 @@ steps:
 - script: |
     set -e
     export npm_config_arch="$(VSCODE_ARCH)"
-    if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
-      export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
-    fi
 
     cat << EOF > ~/.netrc
     machine monacotools.visualstudio.com

diff --git a/build/azure-pipelines/linux/publish.sh b/build/azure-pipelines/linux/publish.sh
@@ -5,8 +5,6 @@ ROOT="$REPO/.."
 
 # Publish tarball
 PLATFORM_LINUX="linux-$VSCODE_ARCH"
-[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
-[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
 BUILDNAME="VSCode-$PLATFORM_LINUX"
 BUILD="$ROOT/$BUILDNAME"
 BUILD_VERSION="$(date +%s)"
@@ -39,7 +37,7 @@ node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_H
 # Publish DEB
 yarn gulp "vscode-linux-$VSCODE_ARCH-build-deb"
 PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
-[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+DEB_ARCH="amd64"
 DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
 DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
 
@@ -48,7 +46,7 @@ node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" p
 # Publish RPM
 yarn gulp "vscode-linux-$VSCODE_ARCH-build-rpm"
 PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
-[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+RPM_ARCH="x86_64"
 RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
 RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
 

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
@@ -3,9 +3,6 @@ resources:
   - container: vscode-x64
     image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
     endpoint: VSCodeHub
-  - container: vscode-ia32
-    image: vscodehub.azurecr.io/vscode-linux-build-agent:ia32
-    endpoint: VSCodeHub
   - container: snapcraft
     image: snapcore/snapcraft
 
@@ -49,16 +46,6 @@ jobs:
   steps:
   - template: linux/snap-build-linux.yml
 
-- job: Linux32
-  condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
-  pool:
-    vmImage: 'Ubuntu-16.04'
-  variables:
-    VSCODE_ARCH: ia32
-  container: vscode-ia32
-  steps:
-  - template: linux/product-build-linux.yml
-
 - job: LinuxArmhf
   condition: eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true')
   pool:
@@ -84,7 +71,6 @@ jobs:
   - Windows32
   - Linux
   - LinuxSnap
-  - Linux32
   - LinuxArmhf
   - macOS
   steps:

diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
@@ -23,7 +23,7 @@ const commit = util.getVersion(root);
 const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 
 function getDebPackageArch(arch) {
-	return { x64: 'amd64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
+	return { x64: 'amd64', arm: 'armhf', arm64: "arm64" }[arch];
 }
 
 function prepareDebPackage(arch) {
@@ -114,7 +114,7 @@ function getRpmBuildPath(rpmArch) {
 }
 
 function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
+	return { x64: 'x86_64', arm: 'armhf', arm64: "arm64" }[arch];
 }
 
 function prepareRpmPackage(arch) {
@@ -238,7 +238,6 @@ function buildSnapPackage(arch) {
 }
 
 const BUILD_TARGETS = [
-	{ arch: 'ia32' },
 	{ arch: 'x64' },
 	{ arch: 'arm' },
 	{ arch: 'arm64' },

diff --git a/build/lib/electron.js b/build/lib/electron.js
@@ -24,7 +24,7 @@ module.exports.getElectronVersion = getElectronVersion;
 if (require.main === module) {
 	const version = getElectronVersion();
 	const versionFile = path.join(root, '.build', 'electron', 'version');
-	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `v${version}`;
+	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
 
 	process.exit(isUpToDate ? 0 : 1);
 }
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "164c37e3f235134c88e80fac2a182cfba3f07f00"
+					"commitHash": "c6a08e5368de4352903e702cde750b33239a50ab"
 				}
 			},
 			"licenseDetail": [
@@ -40,45 +40,32 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "66.0.3359.181"
-		},
-		{
-			"component": {
-				"type": "git",
-				"git": {
-					"name": "libchromiumcontent",
-					"repositoryUrl": "https://github.com/electron/libchromiumcontent",
-					"commitHash": "7ea271f92018b1eeb8e70ec6de8c29f9758a0c05"
-				}
-			},
-			"isOnlyProductionDependency": true,
-			"license": "MIT",
-			"version": "66.0.3359.181"
+			"version": "69.0.3497.128"
 		},
 		{
 			"component": {
 				"type": "git",
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "5cbb905c1af7cea2d709932d59827d7c6d03ef4a"
+					"commitHash": "8c70b2084ce5f76ea1e3b3c4ccdeee4483fe338b"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "10.2.0"
+			"version": "10.11.0"
 		},
 		{
 			"component": {
 				"type": "git",
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "e84a6860e35e14b4031b88bb9b49841cdb89a305"
+					"commitHash": "c1b5a1cfc8a14a337540193daecfa5d0f50dd7bb"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "3.1.8"
+			"version": "4.2.3"
 		},
 		{
 			"component": {

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "v8-inspect-profiler": "^0.0.20",
     "vscode-chokidar": "1.6.5",
     "vscode-debugprotocol": "1.35.0",
-    "vscode-nsfw": "1.1.1",
+    "vscode-nsfw": "1.1.2",
     "vscode-proxy-agent": "0.4.0",
     "vscode-ripgrep": "^1.2.5",
     "vscode-sqlite3": "4.0.7",

diff --git a/resources/linux/rpm/dependencies.json b/resources/linux/rpm/dependencies.json
@@ -63,83 +63,5 @@
 		"libxcb.so.1()(64bit)",
 		"libxkbfile.so.1()(64bit)",
 		"libsecret-1.so.0()(64bit)"
-	],
-	"i386": [
-		"ld-linux.so.2",
-		"ld-linux.so.2(GLIBC_2.1)",
-		"libX11-xcb.so.1",
-		"libX11.so.6",
-		"libXcomposite.so.1",
-		"libXcursor.so.1",
-		"libXdamage.so.1",
-		"libXext.so.6",
-		"libXfixes.so.3",
-		"libXi.so.6",
-		"libXrandr.so.2",
-		"libXrender.so.1",
-		"libXss.so.1",
-		"libXtst.so.6",
-		"libasound.so.2",
-		"libatk-1.0.so.0",
-		"libc.so.6",
-		"libc.so.6(GLIBC_2.0)",
-		"libc.so.6(GLIBC_2.1)",
-		"libc.so.6(GLIBC_2.1.3)",
-		"libc.so.6(GLIBC_2.11)",
-		"libc.so.6(GLIBC_2.2)",
-		"libc.so.6(GLIBC_2.2.3)",
-		"libc.so.6(GLIBC_2.3)",
-		"libc.so.6(GLIBC_2.3.2)",
-		"libc.so.6(GLIBC_2.3.4)",
-		"libc.so.6(GLIBC_2.4)",
-		"libc.so.6(GLIBC_2.6)",
-		"libc.so.6(GLIBC_2.7)",
-		"libcairo.so.2",
-		"libcups.so.2",
-		"libdbus-1.so.3",
-		"libdl.so.2",
-		"libdl.so.2(GLIBC_2.0)",
-		"libdl.so.2(GLIBC_2.1)",
-		"libexpat.so.1",
-		"libfontconfig.so.1",
-		"libfreetype.so.6",
-		"libgcc_s.so.1",
-		"libgcc_s.so.1(GCC_4.0.0)",
-		"libgcc_s.so.1(GLIBC_2.0)",
-		"libgdk-x11-2.0.so.0",
-		"libgdk_pixbuf-2.0.so.0",
-		"libgio-2.0.so.0",
-		"libglib-2.0.so.0",
-		"libgmodule-2.0.so.0",
-		"libgobject-2.0.so.0",
-		"libgtk-3.so.0",
-		"libm.so.6",
-		"libm.so.6(GLIBC_2.0)",
-		"libm.so.6(GLIBC_2.1)",
-		"libnspr4.so",
-		"libnss3.so",
-		"libnssutil3.so",
-		"libpango-1.0.so.0",
-		"libpangocairo-1.0.so.0",
-		"libpthread.so.0",
-		"libpthread.so.0(GLIBC_2.0)",
-		"libpthread.so.0(GLIBC_2.1)",
-		"libpthread.so.0(GLIBC_2.2)",
-		"libpthread.so.0(GLIBC_2.2.3)",
-		"libpthread.so.0(GLIBC_2.3.2)",
-		"libpthread.so.0(GLIBC_2.3.3)",
-		"librt.so.1",
-		"librt.so.1(GLIBC_2.2)",
-		"libsmime3.so",
-		"libstdc++.so.6",
-		"libstdc++.so.6(GLIBCXX_3.4)",
-		"libstdc++.so.6(GLIBCXX_3.4.10)",
-		"libstdc++.so.6(GLIBCXX_3.4.11)",
-		"libstdc++.so.6(GLIBCXX_3.4.14)",
-		"libstdc++.so.6(GLIBCXX_3.4.15)",
-		"libstdc++.so.6(GLIBCXX_3.4.9)",
-		"libxcb.so.1",
-		"libxkbfile.so.1",
-		"libsecret-1.so.0"
 	]
 }