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
oracle5th · Sep 14, 2016 · 6fa8522 · 6fa8522
1 parent 5a5a9f7
commit 6fa8522
Show file tree

Hide file tree

Showing 27 changed files with 623 additions and 172 deletions.
diff --git a/OSSREADME.json b/OSSREADME.json
@@ -38,7 +38,7 @@
 },
 {
 	"name": "chromium",
-	"version": "49.0.2623.75",
+	"version": "52.0.2743.82",
 	"repositoryURL": "http://www.chromium.org/Home",
 	"licenseDetail": [
 		"BSD License",
@@ -74,20 +74,20 @@
 },
 {
 	"name": "libchromiumcontent",
-	"version": "49.0.2623.75",
+	"version": "52.0.2743.82",
 	"license": "MIT",
 	"repositoryURL": "https://github.com/electron/libchromiumcontent",
 	"isProd": true
 },
 {
 	"name": "nodejs",
-	"version": "5.10.0",
+	"version": "6.3.0",
 	"repositoryURL": "https://github.com/nodejs/node",
 	"isProd": true
 },
 {
 	"name": "electron",
-	"version": "0.37.6",
+	"version": "1.3.5",
 	"license": "MIT",
 	"repositoryURL": "https://github.com/electron/electron",
 	"isProd": true

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 environment:
-  ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1
+  ELECTRON_RUN_AS_NODE: 1
   VSCODE_BUILD_VERBOSE: true
 
 install:

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
@@ -230,6 +230,7 @@ function packageTask(platform, arch, opts) {
 
 		if (platform === 'win32') {
 			result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32' }));
+			result = es.merge(result, gulp.src('resources/win32/bin/cat.exe', { base: 'resources/win32' }));
 
 			result = es.merge(result, gulp.src('resources/win32/bin/code.cmd', { base: 'resources/win32' })
 				.pipe(replace('@@NAME@@', product.nameShort))

diff --git a/extensions/typescript/src/utils/electron.ts b/extensions/typescript/src/utils/electron.ts
@@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string
 	newEnv['STDIN_PIPE_NAME'] = stdInPipeName;
 	newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName;
 	newEnv['STDERR_PIPE_NAME'] = stdErrPipeName;
-	newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1';
+	newEnv['ELECTRON_RUN_AS_NODE'] = '1';
 
 	return newEnv;
 }

diff --git a/extensions/typescript/src/utils/electronForkStart.ts b/extensions/typescript/src/utils/electronForkStart.ts
@@ -31,7 +31,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME'];
 log('STDIN_PIPE_NAME: ' + stdInPipeName);
 log('STDOUT_PIPE_NAME: ' + stdOutPipeName);
 log('STDERR_PIPE_NAME: ' + stdErrPipeName);
-log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']);
+log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']);
 
 // stdout redirection to named pipe
 (function() {
@@ -147,7 +147,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A
 		delete process.env['STDIN_PIPE_NAME'];
 		delete process.env['STDOUT_PIPE_NAME'];
 		delete process.env['STDERR_PIPE_NAME'];
-		delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'];
+		delete process.env['ELECTRON_RUN_AS_NODE'];
 
 		require(program);
 

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.6.0",
-  "electronVersion": "0.37.6",
+  "electronVersion": "1.3.5",
   "distro": "3d44b35db8d394d6d7b2bc224675735a0a8f2704",
   "author": {
     "name": "Microsoft Corporation"

diff --git a/resources/darwin/bin/code.sh b/resources/darwin/bin/code.sh
@@ -7,5 +7,5 @@ function realpath() { /usr/bin/python -c "import os,sys; print os.path.realpath(
 CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")"
 ELECTRON="$CONTENTS/MacOS/Electron"
 CLI="$CONTENTS/Resources/app/out/cli.js"
-ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
 exit $?
diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh
@@ -33,5 +33,5 @@ fi
 
 ELECTRON="$VSCODE_PATH/@@NAME@@"
 CLI="$VSCODE_PATH/resources/app/out/cli.js"
-ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
 exit $?
diff --git a/resources/win32/bin/cat.exe b/resources/win32/bin/cat.exe
diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd
@@ -1,6 +1,6 @@
 @echo off
 setlocal
 set VSCODE_DEV=
-set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
-call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\\app\\out\\cli.js" %*
+set ELECTRON_RUN_AS_NODE=1
+call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\\app\\out\\cli.js" %* | cat
 endlocal
diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh
@@ -11,5 +11,5 @@ if [ "$(expr substr $(uname -s) 1 9)" == "CYGWIN_NT" ]; then
 else
 	CLI="$VSCODE_PATH/resources/app/out/cli.js"
 fi
-ELECTRON_NO_ATTACH_CONSOLE=1 ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
+ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" | cat
 exit $?
diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh
@@ -30,7 +30,7 @@ function code() {
 
 	CLI="$ROOT/out/cli.js"
 
-	ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+	ELECTRON_RUN_AS_NODE=1 \
 	NODE_ENV=development \
 	VSCODE_DEV=1 \
 	ELECTRON_ENABLE_LOGGING=1 \

diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
@@ -1,10 +1,8 @@
 @echo off
 setlocal
 
-rem APPVEYOR Builds
 if not "%APPVEYOR%" == "" (
-	set ELECTRON_NO_ATTACH_CONSOLE=1
-	set ATOM_SHELL_INTERNAL_RUN_AS_NODE=
+	set ELECTRON_RUN_AS_NODE=
 )
 
 :: Integration Tests

diff --git a/scripts/test.bat b/scripts/test.bat
@@ -1,17 +1,7 @@
 @echo off
 setlocal
 
-set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
-
-rem TFS Builds
-if not "%BUILD_BUILDID%" == "" (
-	set ELECTRON_NO_ATTACH_CONSOLE=1
-)
-
-rem APPVEYOR Builds
-if not "%APPVEYOR%" == "" (
-	set ELECTRON_NO_ATTACH_CONSOLE=1
-)
+set ELECTRON_RUN_AS_NODE=1
 
 pushd %~dp0\..
 
@@ -20,7 +10,15 @@ set NAMESHORT=%NAMESHORT: "=%
 set NAMESHORT=%NAMESHORT:"=%.exe
 set CODE=".build\electron\%NAMESHORT%"
 
-%CODE% .\node_modules\mocha\bin\_mocha %*
+rem TFS Builds
+if not "%BUILD_BUILDID%" == "" (
+	%CODE% .\node_modules\mocha\bin\_mocha %*
+)
+
+rem Otherwise
+if "%BUILD_BUILDID%" == "" (
+	%CODE% .\node_modules\mocha\bin\_mocha %* | .\resources\win32\bin\cat
+)
 popd
 
 endlocal

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -30,11 +30,11 @@ test -d out || ./node_modules/.bin/gulp compile
 # Unit Tests
 export VSCODE_DEV=1
 if [[ "$OSTYPE" == "darwin"* ]]; then
-	cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+	cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \
 		"$CODE" \
 		node_modules/mocha/bin/_mocha "$@"
 else
-	cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+	cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \
 		"$CODE" \
 		node_modules/mocha/bin/_mocha "$@"
 fi