Skip to content

Commit 6fa8522

Browse files
bpaserobpasero
authored
Electron Update 1.x (microsoft#11157)
* use electron 1.3.4 * ATOM_SHELL_INTERNAL_RUN_AS_NODE => ELECTRON_RUN_AS_NODE * OSS input * update electron.d.ts * workaround for microsoft#8708 * bump oniguruma and chokidar with custom fsevents * build with appveyor config from master * oops, still use ELECTRON_RUN_AS_NODE * use electron 1.3.5 * optional fsevents * add cat.exe to workaround output issues * use cat for tests * remove some now obsolete ELECTRON_NO_ATTACH_CONSOLE * also pipe output to cat for code.sh on windows * unset ELECTRON_RUN_AS_NODE for appveyor * fix tfs builds? * fix build * fix build? * use cat only when running tests locally
1 parent 5a5a9f7 commit 6fa8522

27 files changed

Lines changed: 623 additions & 172 deletions

File tree

‎OSSREADME.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
{
4040
"name": "chromium",
41-
"version": "49.0.2623.75",
41+
"version": "52.0.2743.82",
4242
"repositoryURL": "http://www.chromium.org/Home",
4343
"licenseDetail": [
4444
"BSD License",
@@ -74,20 +74,20 @@
7474
},
7575
{
7676
"name": "libchromiumcontent",
77-
"version": "49.0.2623.75",
77+
"version": "52.0.2743.82",
7878
"license": "MIT",
7979
"repositoryURL": "https://github.com/electron/libchromiumcontent",
8080
"isProd": true
8181
},
8282
{
8383
"name": "nodejs",
84-
"version": "5.10.0",
84+
"version": "6.3.0",
8585
"repositoryURL": "https://github.com/nodejs/node",
8686
"isProd": true
8787
},
8888
{
8989
"name": "electron",
90-
"version": "0.37.6",
90+
"version": "1.3.5",
9191
"license": "MIT",
9292
"repositoryURL": "https://github.com/electron/electron",
9393
"isProd": true

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
environment:
2-
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
2+
ELECTRON_RUN_AS_NODE: 1
33
VSCODE_BUILD_VERBOSE: true
44

55
install:

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ function packageTask(platform, arch, opts) {
230230

231231
if (platform === 'win32') {
232232
result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32' }));
233+
result = es.merge(result, gulp.src('resources/win32/bin/cat.exe', { base: 'resources/win32' }));
233234

234235
result = es.merge(result, gulp.src('resources/win32/bin/code.cmd', { base: 'resources/win32' })
235236
.pipe(replace('@@NAME@@', product.nameShort))

‎extensions/typescript/src/utils/electron.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
4848
newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
4949
newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
5050
newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
51-
newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
51+
newEnv['ELECTRON_RUN_AS_NODE'] = '1';
5252

5353
return newEnv;
5454
}

‎extensions/typescript/src/utils/electronForkStart.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
3131
log('STDIN_PIPE_NAME: ' + stdInPipeName);
3232
log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
3333
log('STDERR_PIPE_NAME: ' + stdErrPipeName);
34-
log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']);
34+
log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
3535

3636
// stdout redirection to named pipe
3737
(function() {
@@ -147,7 +147,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
147147
delete process.env['STDIN_PIPE_NAME'];
148148
delete process.env['STDOUT_PIPE_NAME'];
149149
delete process.env['STDERR_PIPE_NAME'];
150-
delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
150+
delete process.env['ELECTRON_RUN_AS_NODE'];
151151

152152
require(program);
153153

‎npm-shrinkwrap.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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.6.0",
4-
"electronVersion": "0.37.6",
4+
"electronVersion": "1.3.5",
55
"distro": "3d44b35db8d394d6d7b2bc224675735a0a8f2704",
66
"author": {
77
"name": "Microsoft Corporation"

‎resources/darwin/bin/code.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ function realpath() { /usr/bin/python -c "import os,sys; print os.path.realpath(
77
CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
88
ELECTRON="$CONTENTS/MacOS/Electron"
99
CLI="$CONTENTS/Resources/app/out/cli.js"
10-
ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
10+
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
1111
exit $?

‎resources/linux/bin/code.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ fi
3333

3434
ELECTRON="$VSCODE_PATH/@@NAME@@"
3535
CLI="$VSCODE_PATH/resources/app/out/cli.js"
36-
ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
36+
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
3737
exit $?

‎resources/win32/bin/cat.exe‎

10 KB
Binary file not shown.

0 commit comments

Comments
 (0)