Skip to content

Commit f7ec491

Browse files
bpaserobpasero
authored
Electron v2.0.0 (microsoft#47289)
* Update to Electron 2.0.0-beta.7 * bump to electron 2.0.0-beta.7 * localStorage - workaround birthtime rounding issues that clear workspace storage * fix compile error * workaround microsoft#47569 * localStorage - add telemetry for successful migration * increment to localStorageTimers4 * localStorage - allow to restore from backup if starting with 1.7.x again * logLocalStorageMigrationStatus only on insider * back to official distro * 💄 * still use exploration distro * remove GTK3 emoji picker which does not seem to work * 💄
1 parent fe0177d commit f7ec491

17 files changed

Lines changed: 7573 additions & 3979 deletions

File tree

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "1.7.12"
2+
target "2.0.0-beta.7"
33
runtime "electron"

‎scripts/code-cli.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set ELECTRON_ENABLE_LOGGING=1
2929
set ELECTRON_ENABLE_STACK_DUMPING=1
3030

3131
:: Launch Code
32-
%CODE% --debug=5874 out\cli.js . %*
32+
%CODE% --inspect=5874 out\cli.js . %*
3333
popd
3434

3535
endlocal

‎scripts/code-cli.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function code() {
3232
VSCODE_DEV=1 \
3333
ELECTRON_ENABLE_LOGGING=1 \
3434
ELECTRON_ENABLE_STACK_DUMPING=1 \
35-
"$CODE" --debug=5874 "$ROOT/out/cli.js" . "$@"
35+
"$CODE" --inspect=5874 "$ROOT/out/cli.js" . "$@"
3636
}
3737

3838
code "$@"

‎scripts/code.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
if [[ "$OSTYPE" == "darwin"* ]]; then
44
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
55
ROOT=$(dirname "$(dirname "$(realpath "$0")")")
6+
7+
# On Linux with Electron 2.0.x running out of a VM causes
8+
# a freeze so we only enable this flag on macOS
9+
export ELECTRON_ENABLE_LOGGING=1
610
else
711
ROOT=$(dirname "$(dirname "$(readlink -f $0)")")
812
fi
@@ -40,7 +44,6 @@ function code() {
4044
export NODE_ENV=development
4145
export VSCODE_DEV=1
4246
export VSCODE_CLI=1
43-
export ELECTRON_ENABLE_LOGGING=1
4447
export ELECTRON_ENABLE_STACK_DUMPING=1
4548

4649
# Launch Code

‎scripts/test.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
if [[ "$OSTYPE" == "darwin"* ]]; then
55
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
66
ROOT=$(dirname $(dirname $(realpath "$0")))
7+
8+
# On Linux with Electron 2.0.x running out of a VM causes
9+
# a freeze so we only enable this flag on macOS
10+
export ELECTRON_ENABLE_LOGGING=1
711
else
812
ROOT=$(dirname $(dirname $(readlink -f $0)))
913
fi
@@ -25,7 +29,6 @@ test -d node_modules || yarn
2529
node build/lib/electron.js || ./node_modules/.bin/gulp electron
2630

2731
# Unit Tests
28-
export ELECTRON_ENABLE_LOGGING=1
2932
if [[ "$OSTYPE" == "darwin"* ]]; then
3033
cd $ROOT ; ulimit -n 4096 ; \
3134
"$CODE" \

0 commit comments

Comments
 (0)