Revert "Electron v2.0.0 (microsoft#47289)"

This reverts commit f7ec491.
jvasileff · Apr 20, 2018 · 6cb06b7 · 6cb06b7
1 parent 1aa0bb8
commit 6cb06b7
Show file tree

Hide file tree

Showing 17 changed files with 3,977 additions and 7,571 deletions.
diff --git a/.yarnrc b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "2.0.0-beta.7"
+target "1.7.12"
 runtime "electron"
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% --inspect=5874 out\cli.js . %*
+%CODE% --debug=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" --inspect=5874 "$ROOT/out/cli.js" . "$@"
+	"$CODE" --debug=5874 "$ROOT/out/cli.js" . "$@"
 }
 
 code "$@"
diff --git a/scripts/code.sh b/scripts/code.sh
@@ -3,10 +3,6 @@
 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
@@ -44,6 +40,7 @@ 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,10 +4,6 @@
 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
@@ -29,6 +25,7 @@ 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" \