Update to Electron v2.0.0-beta.6 (microsoft#46552)

* electron@2.0.0-beta-1 * Update distro * Update electron.d.ts to 2.0.0-beta.1 * Disable asar as it causes a native crash * Adopt Module._resolveLookupPaths ASAR patch * electron 2.x - restore inspector URL in extension host * electron 2.x - adopt context menu callback for onHide * electron 2.x - remove workaround for electron/electron#10442 * electron 2.x - update node.d.ts * electron 2.x - update node.d.ts to 8.9.x * electron 2.x - keep node.d.ts changes to a minimum * electron 2.x - remove workaround for electron/electron#10862 * electron 2.x - bump to 2.0.0-beta2 * bump to 2.0.0-beta.3 * Context menu: selecting "Rename" does not put focs into rename box (fix microsoft#45601) * quality "exploration" for easier testing * empty commit * push a workaround for microsoft#45700 * Certain themes show UI artifacts over activity bar icons (fixes microsoft#45700) * better fix for microsoft#45700 * bump to 2.0.0-beta.4 * another fix to prevent flickering for microsoft#45700 * avoid remote access in index.js * bump distro commit * electron 2.x - do not use --debug anymore * bump electron to 2.0.0-beta.5 * electron 2.x - add libgtk-3-dev as build dependency for Linux 64 * electron 2.x - workaround freeze on linux on startup * bump local storage telemetry key * electron 2.x - do a one time backup of local storage * enable ELECTRON_ENABLE_LOGGING on macOS at least * 2.0.0-beta.6 * Fix ctrl+shift+e not focusing explorer on Linux * distro - use GH electron builds for now
sliker · Apr 3, 2018 · 88603b3 · 88603b3
1 parent ef55294
commit 88603b3
Show file tree

Hide file tree

Showing 38 changed files with 7,538 additions and 4,018 deletions.
diff --git a/.yarnrc b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "1.7.12"
+target "2.0.0-beta.6"
 runtime "electron"
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.23.0",
-  "distro": "ed36a29ddadc357cdceba6ff5e3e7d5e27893dee",
+  "distro": "6834b79a655ade3dce6df4799a264ff29bff6652",
   "author": {
     "name": "Microsoft Corporation"
   },

diff --git a/scripts/code-cli.bat b/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
diff --git a/scripts/code-cli.sh b/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 "$@"
diff --git a/scripts/code.sh b/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

diff --git a/scripts/test.sh b/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" \

diff --git a/src/main.js b/src/main.js
@@ -448,7 +448,6 @@ global.getOpenUrls = function () {
 	return openUrls;
 };
 
-
 // use '<UserData>/CachedData'-directory to store
 // node/v8 cached data.
 let nodeCachedDataDir = getNodeCachedDataDir().then(function (value) {