Merge pull request #54873 from Microsoft/tyriar/electron-2.0.x

Electron 2.0.5

Author: Tyriar

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "1.7.12"
+target "2.0.5"
 runtime "electron"

resources/linux/debian/control.template

@@ -1,7 +1,7 @@
 Package: @@NAME@@
 Version: @@VERSION@@
 Section: devel
-Depends: libnotify4, libnss3, gnupg, apt, libxkbfile1, libgconf-2-4, libsecret-1-0
+Depends: libnotify4, libnss3, gnupg, apt, libxkbfile1, libgconf-2-4, libsecret-1-0, libgtk-3-0 (>= 3.10.0)
 Priority: optional
 Architecture: @@ARCHITECTURE@@
 Maintainer: Microsoft Corporation <vscode-linux@microsoft.com>
@@ -12,3 +12,4 @@ Conflicts: visual-studio-@@NAME@@
 Replaces: visual-studio-@@NAME@@
 Description: Code editing. Redefined.
  Visual Studio Code is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. See https://code.visualstudio.com/docs/setup/linux for installation instructions and FAQ.
+ 

resources/linux/rpm/dependencies.json

@@ -4,7 +4,7 @@
 		"libpthread.so.0(GLIBC_2.2.5)(64bit)",
 		"libpthread.so.0(GLIBC_2.3.2)(64bit)",
 		"libpthread.so.0(GLIBC_2.3.3)(64bit)",
-		"libgtk-x11-2.0.so.0()(64bit)",
+		"libgtk-3.so.0()(64bit)",
 		"libgdk-x11-2.0.so.0()(64bit)",
 		"libatk-1.0.so.0()(64bit)",
 		"libgio-2.0.so.0()(64bit)",
@@ -114,7 +114,7 @@
 		"libglib-2.0.so.0",
 		"libgmodule-2.0.so.0",
 		"libgobject-2.0.so.0",
-		"libgtk-x11-2.0.so.0",
+		"libgtk-3.so.0",
 		"libm.so.6",
 		"libm.so.6(GLIBC_2.0)",
 		"libm.so.6(GLIBC_2.1)",

scripts/code-cli.bat

@@ -29,7 +29,7 @@ set ELECTRON_ENABLE_LOGGING=1
 set ELECTRON_ENABLE_STACK_DUMPING=1
 
 :: Launch Code
-%CODE% --debug=5874 out\cli.js . %*
+%CODE% --inspect=5874 out\cli.js . %*
 popd
 
 endlocal

scripts/code-cli.sh

@@ -32,7 +32,7 @@ function code() {
 	VSCODE_DEV=1 \
 	ELECTRON_ENABLE_LOGGING=1 \
 	ELECTRON_ENABLE_STACK_DUMPING=1 \
-	"$CODE" --debug=5874 "$ROOT/out/cli.js" . "$@"
+	"$CODE" --inspect=5874 "$ROOT/out/cli.js" . "$@"
 }
 
 code "$@"

scripts/code.sh

@@ -3,6 +3,10 @@
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname "$(dirname "$(realpath "$0")")")
+
+	# On Linux with Electron 2.0.x running out of a VM causes
+	# a freeze so we only enable this flag on macOS
+	export ELECTRON_ENABLE_LOGGING=1
 else
 	ROOT=$(dirname "$(dirname "$(readlink -f $0)")")
 fi
@@ -40,7 +44,6 @@ function code() {
 	export NODE_ENV=development
 	export VSCODE_DEV=1
 	export VSCODE_CLI=1
-	export ELECTRON_ENABLE_LOGGING=1
 	export ELECTRON_ENABLE_STACK_DUMPING=1
 
 	# Launch Code

scripts/test.sh

@@ -4,6 +4,10 @@
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname $(dirname $(realpath "$0")))
+
+	# On Linux with Electron 2.0.x running out of a VM causes
+	# a freeze so we only enable this flag on macOS
+	export ELECTRON_ENABLE_LOGGING=1
 else
 	ROOT=$(dirname $(dirname $(readlink -f $0)))
 fi
@@ -25,7 +29,6 @@ test -d node_modules || yarn
 node build/lib/electron.js || ./node_modules/.bin/gulp electron
 
 # Unit Tests
-export ELECTRON_ENABLE_LOGGING=1
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \

src/main.js

@@ -81,6 +81,13 @@ if (isTempPortable) {
 
 const app = require('electron').app;
 
+// TODO@Ben Electron 2.0.x: prevent localStorage migration from SQLite to LevelDB due to issues
+app.commandLine.appendSwitch('disable-mojo-local-storage');
+
+// TODO@Ben Electron 2.0.x: force srgb color profile (for https://github.com/Microsoft/vscode/issues/51791)
+// This also seems to fix: https://github.com/Microsoft/vscode/issues/48043
+app.commandLine.appendSwitch('force-color-profile', 'srgb');
+
 const minimist = require('minimist');
 const paths = require('./paths');