fix(exit): integrate exit module

adamdbradley · adamdbradley · commit 3557a4ab81e5 · 2018-10-31T10:06:32.000-05:00
diff --git a/package.json b/package.json
@@ -61,6 +61,7 @@
     "@types/autoprefixer": "^9.1.0",
     "@types/chokidar": "^1.7.4",
     "@types/cssnano": "^4.0.0",
+    "@types/exit": "^0.1.30",
     "@types/fs-extra": "^5.0.0",
     "@types/glob": "^7.1.1",
     "@types/graceful-fs": "^4.1.2",
@@ -82,6 +83,7 @@
     "cssnano": "4.1.7",
     "estree-walker": "0.5.2",
     "execa": "^0.8.0",
+    "exit": "^0.1.2",
     "fast-deep-equal": "^2.0.1",
     "fs-extra": "^5.0.0",
     "glob": "7.1.3",
diff --git a/scripts/build-dev-server.js b/scripts/build-dev-server.js
@@ -37,9 +37,19 @@ if (success) {
         'path',
         'querystring',
         'url',
-        'zlib'
+        'zlib',
+        '../sys/node/graceful-fs.js'
       ],
       plugins: [
+        (() => {
+          return {
+            resolveId(importee) {
+              if (importee === 'graceful-fs') {
+                return '../sys/node/graceful-fs.js';
+              }
+            }
+          }
+        })(),
         rollupResolve(),
         rollupCommonjs()
       ],
diff --git a/scripts/build-prod.js b/scripts/build-prod.js
@@ -35,6 +35,7 @@ fs.emptyDirSync(DIST_LICENSES);
   'autoprefixer',
   'cssnano',
   'css-what',
+  'exit',
   'glob',
   'graceful-fs',
   'is-glob',
diff --git a/src/cli/index.ts b/src/cli/index.ts
@@ -3,6 +3,7 @@ import { getConfigFilePath } from './cli-utils';
 import { parseFlags } from './parse-flags';
 import { runTask } from './run-task';
 import { shouldIgnoreError } from '../compiler/util';
+import exit from 'exit';
 
 
 export async function run(process: NodeJS.Process, sys: d.StencilSystem, logger: d.Logger) {
@@ -29,7 +30,7 @@ export async function run(process: NodeJS.Process, sys: d.StencilSystem, logger:
 
   } catch (e) {
     logger.error(e);
-    process.exit(1);
+    exit(1);
   }
 
   try {
@@ -57,7 +58,7 @@ export async function run(process: NodeJS.Process, sys: d.StencilSystem, logger:
   } catch (e) {
     if (!shouldIgnoreError(e)) {
       config.logger.error(`uncaught cli error: ${e}`);
-      process.exit(1);
+      exit(1);
     }
   }
 }
diff --git a/src/cli/run-task.ts b/src/cli/run-task.ts
@@ -5,6 +5,7 @@ import { taskHelp } from './task-help';
 import { taskServe } from './task-serve';
 import { taskTest } from './task-test';
 import { taskCheckVersion, taskVersion } from './task-version';
+import exit from 'exit';
 
 
 export async function runTask(process: NodeJS.Process, config: d.Config, flags: d.ConfigFlags) {
@@ -24,7 +25,7 @@ export async function runTask(process: NodeJS.Process, config: d.Config, flags:
         break;
 
       case 'docs':
-        await taskDocs(process, config);
+        await taskDocs(config);
         break;
 
       case 'serve':
@@ -38,7 +39,7 @@ export async function runTask(process: NodeJS.Process, config: d.Config, flags:
       default:
         config.logger.error(`Invalid stencil command, please see the options below:`);
         taskHelp(process, config.logger);
-        process.exit(1);
+        exit(1);
     }
   }
 }
diff --git a/src/cli/task-build.ts b/src/cli/task-build.ts
@@ -1,14 +1,15 @@
 import * as d from '../declarations';
 import { getLatestCompilerVersion, validateCompilerVersion } from '../sys/node/check-version';
 import { hasError } from './cli-utils';
+import exit from 'exit';
 
 
 export async function taskBuild(process: NodeJS.Process, config: d.Config, flags: d.ConfigFlags) {
   const { Compiler } = require('../compiler/index.js');
 
   const compiler: d.Compiler = new Compiler(config);
   if (!compiler.isValid) {
-    process.exit(1);
+    exit(1);
   }
 
   let devServerStart: Promise<d.DevServer> = null;
@@ -17,7 +18,7 @@ export async function taskBuild(process: NodeJS.Process, config: d.Config, flags
       devServerStart = compiler.startDevServer();
     } catch (e) {
       config.logger.error(e);
-      process.exit(1);
+      exit(1);
     }
   }
 
@@ -37,7 +38,7 @@ export async function taskBuild(process: NodeJS.Process, config: d.Config, flags
       await devServer.close();
     }
 
-    process.exit(1);
+    exit(1);
   }
 
   if (config.watch || devServerStart) {
diff --git a/src/cli/task-docs.ts b/src/cli/task-docs.ts
@@ -1,12 +1,13 @@
 import * as d from '../declarations';
+import exit from 'exit';
 
 
-export function taskDocs(process: NodeJS.Process, config: d.Config) {
+export function taskDocs(config: d.Config) {
   const { Compiler } = require('../compiler/index.js');
 
   const compiler: d.Compiler = new Compiler(config);
   if (!compiler.isValid) {
-    process.exit(1);
+    exit(1);
   }
 
   return compiler.docs();
diff --git a/src/cli/task-serve.ts b/src/cli/task-serve.ts
@@ -1,13 +1,14 @@
 import * as d from '../declarations';
 import { normalizePath } from '../compiler/util';
+import exit from 'exit';
 
 
 export async function taskServe(process: NodeJS.Process, config: d.Config, flags: d.ConfigFlags) {
   const { Compiler } = require('../compiler/index.js');
 
   const compiler: d.Compiler = new Compiler(config);
   if (!compiler.isValid) {
-    process.exit(1);
+    exit(1);
   }
 
   config.flags.serve = true;
@@ -30,6 +31,6 @@ export async function taskServe(process: NodeJS.Process, config: d.Config, flags
   process.once('SIGINT', () => {
     compiler.config.sys.destroy();
     devServer.close();
-    process.exit(0);
+    exit(0);
   });
 }
diff --git a/src/cli/task-test.ts b/src/cli/task-test.ts
@@ -1,4 +1,5 @@
 import * as d from '../declarations';
+import exit from 'exit';
 
 
 export async function taskTest(config: d.Config) {
@@ -38,18 +39,18 @@ export async function taskTest(config: d.Config) {
 
     const testing: d.Testing = new Testing(config);
     if (!testing.isValid) {
-      process.exit(1);
+      exit(1);
     }
 
     const passed = await testing.runTests();
     await testing.destroy();
 
     if (!passed) {
-      process.exit(1);
+      exit(1);
     }
 
   } catch (e) {
     config.logger.error(e);
-    process.exit(1);
+    exit(1);
   }
 }
diff --git a/src/cli/task-version.ts b/src/cli/task-version.ts
@@ -1,6 +1,7 @@
 import * as d from '../declarations';
 import { printUpdateMessage, requestLatestCompilerVersion } from '../sys/node/check-version';
 import { lt } from 'semver';
+import exit from 'exit';
 
 
 export function taskVersion(config: d.Config) {
@@ -22,6 +23,6 @@ export async function taskCheckVersion(config: d.Config) {
 
   } catch (e) {
     config.logger.error(`unable to load latest compiler version: ${e}`);
-    process.exit(1);
+    exit(1);
   }
 }
diff --git a/src/dev-server/start-server-worker.ts b/src/dev-server/start-server-worker.ts
@@ -3,6 +3,7 @@ import { createHttpServer } from './server-http';
 import { createWebSocket } from './server-web-socket';
 import { DEV_SERVER_INIT_URL, getBrowserUrl, sendError, sendMsg } from './util';
 import { getEditors } from './open-in-editor';
+import exit from 'exit';
 
 
 export async function startDevServerWorker(process: NodeJS.Process, devServerConfig: d.DevServerConfig, fs: d.FileSystem) {
@@ -40,7 +41,7 @@ export async function startDevServerWorker(process: NodeJS.Process, devServerCon
       httpServer = null;
 
       setTimeout(() => {
-        process.exit();
+        exit(0);
       }, 5000).unref();
 
       process.removeAllListeners('message');
diff --git a/src/sys/node/worker/worker-child.ts b/src/sys/node/worker/worker-child.ts
@@ -1,4 +1,5 @@
 import * as d from '../../../declarations';
+import exit from 'exit';
 
 
 export class WorkerChild {
@@ -7,7 +8,7 @@ export class WorkerChild {
 
   async receiveMessageFromMain(msgFromMain: d.WorkerMessage) {
     if (msgFromMain.exit) {
-      this.exit();
+      exit(0);
     }
 
     const msgToMain: d.WorkerMessage = {
@@ -33,14 +34,10 @@ export class WorkerChild {
   sendMessageToMain(msg: d.WorkerMessage) {
     this.process.send(msg, (err: NodeJS.ErrnoException) => {
       if (err && err.code === 'ERR_IPC_CHANNEL_CLOSED') {
-        this.exit();
+        exit(0);
       }
     });
   }
-
-  exit() {
-    this.process.exit(0);
-  }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import { getConfigFilePath } from './cli-utils';`
`3`	`3`	`import { parseFlags } from './parse-flags';`
`4`	`4`	`import { runTask } from './run-task';`
`5`	`5`	`import { shouldIgnoreError } from '../compiler/util';`
	`6`	`+import exit from 'exit';`
`6`	`7`
`7`	`8`
`8`	`9`	`export async function run(process: NodeJS.Process, sys: d.StencilSystem, logger: d.Logger) {`
`@@ -29,7 +30,7 @@ export async function run(process: NodeJS.Process, sys: d.StencilSystem, logger:`
`29`	`30`
`30`	`31`	`} catch (e) {`
`31`	`32`	`logger.error(e);`
`32`		`- process.exit(1);`
	`33`	`+ exit(1);`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`try {`
`@@ -57,7 +58,7 @@ export async function run(process: NodeJS.Process, sys: d.StencilSystem, logger:`
`57`	`58`	`} catch (e) {`
`58`	`59`	`if (!shouldIgnoreError(e)) {`
`59`	`60`	config.logger.error(`uncaught cli error: ${e}`);
`60`		`- process.exit(1);`
	`61`	`+ exit(1);`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`	`1`	`import * as d from '../declarations';`
`2`	`2`	`import { getLatestCompilerVersion, validateCompilerVersion } from '../sys/node/check-version';`
`3`	`3`	`import { hasError } from './cli-utils';`
	`4`	`+import exit from 'exit';`
`4`	`5`
`5`	`6`
`6`	`7`	`export async function taskBuild(process: NodeJS.Process, config: d.Config, flags: d.ConfigFlags) {`
`7`	`8`	`const { Compiler } = require('../compiler/index.js');`
`8`	`9`
`9`	`10`	`const compiler: d.Compiler = new Compiler(config);`
`10`	`11`	`if (!compiler.isValid) {`
`11`		`- process.exit(1);`
	`12`	`+ exit(1);`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`let devServerStart: Promise<d.DevServer> = null;`
`@@ -17,7 +18,7 @@ export async function taskBuild(process: NodeJS.Process, config: d.Config, flags`
`17`	`18`	`devServerStart = compiler.startDevServer();`
`18`	`19`	`} catch (e) {`
`19`	`20`	`config.logger.error(e);`
`20`		`- process.exit(1);`
	`21`	`+ exit(1);`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`
`@@ -37,7 +38,7 @@ export async function taskBuild(process: NodeJS.Process, config: d.Config, flags`
`37`	`38`	`await devServer.close();`
`38`	`39`	`}`
`39`	`40`
`40`		`- process.exit(1);`
	`41`	`+ exit(1);`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`if (config.watch \|\| devServerStart) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import * as d from '../declarations';`
	`2`	`+import exit from 'exit';`
`2`	`3`
`3`	`4`
`4`	`5`	`export async function taskTest(config: d.Config) {`
`@@ -38,18 +39,18 @@ export async function taskTest(config: d.Config) {`
`38`	`39`
`39`	`40`	`const testing: d.Testing = new Testing(config);`
`40`	`41`	`if (!testing.isValid) {`
`41`		`- process.exit(1);`
	`42`	`+ exit(1);`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`const passed = await testing.runTests();`
`45`	`46`	`await testing.destroy();`
`46`	`47`
`47`	`48`	`if (!passed) {`
`48`		`- process.exit(1);`
	`49`	`+ exit(1);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`} catch (e) {`
`52`	`53`	`config.logger.error(e);`
`53`		`- process.exit(1);`
	`54`	`+ exit(1);`
`54`	`55`	`}`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import * as d from '../declarations';`
`2`	`2`	`import { printUpdateMessage, requestLatestCompilerVersion } from '../sys/node/check-version';`
`3`	`3`	`import { lt } from 'semver';`
	`4`	`+import exit from 'exit';`
`4`	`5`
`5`	`6`
`6`	`7`	`export function taskVersion(config: d.Config) {`
`@@ -22,6 +23,6 @@ export async function taskCheckVersion(config: d.Config) {`
`22`	`23`
`23`	`24`	`} catch (e) {`
`24`	`25`	config.logger.error(`unable to load latest compiler version: ${e}`);
`25`		`- process.exit(1);`
	`26`	`+ exit(1);`
`26`	`27`	`}`
`27`	`28`	`}`