Merge pull request microsoft#22512 from Microsoft/fixUseOfProcess

mhegazy · web-flow · commit 85df31cde45e · 2018-03-13T11:24:31.000-07:00
Do not use unguarded process in tsc.ts
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -456,6 +456,7 @@ namespace ts {
         setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
         clearTimeout?(timeoutId: any): void;
         clearScreen?(): void;
+        /*@internal*/ setBlocking?(): void;
     }
 
     export interface FileWatcher {
@@ -614,6 +615,11 @@ namespace ts {
                 clearTimeout,
                 clearScreen: () => {
                     process.stdout.write("\x1Bc");
+                },
+                setBlocking: () => {
+                    if (process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {
+                        process.stdout._handle.setBlocking(true);
+                    }
                 }
             };
             return nodeSystem;
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -399,8 +399,9 @@ if (ts.Debug.isDebugging) {
 if (ts.sys.tryEnableSourceMapsForHost && /^development$/i.test(ts.sys.getEnvironmentVariable("NODE_ENV"))) {
     ts.sys.tryEnableSourceMapsForHost();
 }
-declare var process: any;
-if (process && process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {
-    process.stdout._handle.setBlocking(true);
+
+if (ts.sys.setBlocking) {
+    ts.sys.setBlocking();
 }
+
 ts.executeCommandLine(ts.sys.args);
diff --git a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
@@ -1 +1 @@
-Subproject commit ed149eb0c787b1195a95b44105822c64bb6eb636
+Subproject commit 40bdb4eadabc9fbed7d83e3f26817a931c0763b6

Original file line number	Diff line number	Diff line change
`@@ -399,8 +399,9 @@ if (ts.Debug.isDebugging) {`
`399`	`399`	`if (ts.sys.tryEnableSourceMapsForHost && /^development$/i.test(ts.sys.getEnvironmentVariable("NODE_ENV"))) {`
`400`	`400`	`ts.sys.tryEnableSourceMapsForHost();`
`401`	`401`	`}`
`402`		`-declare var process: any;`
`403`		`-if (process && process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {`
`404`		`- process.stdout._handle.setBlocking(true);`
	`402`	`+`
	`403`	`+if (ts.sys.setBlocking) {`
	`404`	`+ ts.sys.setBlocking();`
`405`	`405`	`}`
	`406`	`+`
`406`	`407`	`ts.executeCommandLine(ts.sys.args);`