Skip to content

Commit 24d87a7

Browse files
author
Benjamin Pasero
committed
Revert "Update to Electron v2.0.0-beta.6 (microsoft#46552)"
This reverts commit 88603b3.
1 parent 00cc78d commit 24d87a7

38 files changed

Lines changed: 4017 additions & 7534 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 "2.0.0-beta.6"
2+
target "1.7.12"
33
runtime "electron"

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.23.0",
4-
"distro": "6834b79a655ade3dce6df4799a264ff29bff6652",
4+
"distro": "ed36a29ddadc357cdceba6ff5e3e7d5e27893dee",
55
"author": {
66
"name": "Microsoft Corporation"
77
},

‎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% --inspect=5874 out\cli.js . %*
32+
%CODE% --debug=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" --inspect=5874 "$ROOT/out/cli.js" . "$@"
35+
"$CODE" --debug=5874 "$ROOT/out/cli.js" . "$@"
3636
}
3737

3838
code "$@"

‎scripts/code.sh‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
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
106
else
117
ROOT=$(dirname "$(dirname "$(readlink -f $0)")")
128
fi
@@ -44,6 +40,7 @@ function code() {
4440
export NODE_ENV=development
4541
export VSCODE_DEV=1
4642
export VSCODE_CLI=1
43+
export ELECTRON_ENABLE_LOGGING=1
4744
export ELECTRON_ENABLE_STACK_DUMPING=1
4845

4946
# Launch Code

‎scripts/test.sh‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
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
117
else
128
ROOT=$(dirname $(dirname $(readlink -f $0)))
139
fi
@@ -29,6 +25,7 @@ test -d node_modules || yarn
2925
node build/lib/electron.js || ./node_modules/.bin/gulp electron
3026

3127
# Unit Tests
28+
export ELECTRON_ENABLE_LOGGING=1
3229
if [[ "$OSTYPE" == "darwin"* ]]; then
3330
cd $ROOT ; ulimit -n 4096 ; \
3431
"$CODE" \

‎src/main.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ global.getOpenUrls = function () {
448448
return openUrls;
449449
};
450450

451+
451452
// use '<UserData>/CachedData'-directory to store
452453
// node/v8 cached data.
453454
let nodeCachedDataDir = getNodeCachedDataDir().then(function (value) {

0 commit comments

Comments
 (0)