Skip to content

Commit 738acf1

Browse files
Tyriarbpasero
authored andcommitted
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
1 parent 5d45618 commit 738acf1

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

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

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 "$@"

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

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)