chore: prepare 1.0.2 release

Author: evilebottnawi

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org).
 
+## 1.0.2 - 2018-01-11
+
+* Chore: simplify error handling.
+* Tests: improve code coverage.
+
 ## 1.0.1 - 2017-12-22
 
 * Fixed: remove unnecessary output `stdout:` and `stderr:`.

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 itgalaxy inc.
+Copyright (c) 2017-2018 itgalaxy inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -141,7 +141,7 @@ module.exports = {
 
 ## Thanks
 
-* [execa](https://github.com/sindresorhus/execa) - api.
+* [execa](https://github.com/sindresorhus/execa) - API.
 
 ## [Changelog](CHANGELOG.md)
 

__tests__/index.test.js

@@ -80,6 +80,28 @@ describe("execa-webpack-plugin", () => {
     });
   });
 
+  it("should works with `onBuildStart` and `dev` is `false` option", () => {
+    mkdirSyncSafe(dir);
+
+    expect(fs.statSync(dir).isDirectory()).toBe(true);
+
+    return run({
+      dev: false,
+      onBuildStart: [
+        {
+          args: [dir],
+          cmd: "del"
+        }
+      ]
+    }).then(() => {
+      expect(() => fs.statSync(dir)).toThrow();
+
+      unlinkSyncSafe(dir);
+
+      return Promise.resolve();
+    });
+  });
+
   it("should works with `onBuildEnd` option", () => {
     mkdirSyncSafe(dir);
 
@@ -101,6 +123,28 @@ describe("execa-webpack-plugin", () => {
     });
   });
 
+  it("should works with `onBuildEnd` and `dev` is `false` options", () => {
+    mkdirSyncSafe(dir);
+
+    expect(fs.statSync(dir).isDirectory()).toBe(true);
+
+    return run({
+      dev: false,
+      onBuildEnd: [
+        {
+          args: [dir],
+          cmd: "del"
+        }
+      ]
+    }).then(() => {
+      expect(() => fs.statSync(dir)).toThrow();
+
+      unlinkSyncSafe(dir);
+
+      return Promise.resolve();
+    });
+  });
+
   it("should works with `onBuildExit` option", () => {
     mkdirSyncSafe(dir);
 
@@ -122,6 +166,28 @@ describe("execa-webpack-plugin", () => {
     });
   });
 
+  it("should works with `onBuildExit` and `dev` is `false` options", () => {
+    mkdirSyncSafe(dir);
+
+    expect(fs.statSync(dir).isDirectory()).toBe(true);
+
+    return run({
+      dev: false,
+      onBuildExit: [
+        {
+          args: [dir],
+          cmd: "del"
+        }
+      ]
+    }).then(() => {
+      expect(() => fs.statSync(dir)).toThrow();
+
+      unlinkSyncSafe(dir);
+
+      return Promise.resolve();
+    });
+  });
+
   it("should throw error with `bail: true` option", () => {
     let catchError = null;
 
@@ -185,37 +251,6 @@ describe("execa-webpack-plugin", () => {
     });
   });
 
-  it("should throw error when nested commands return nothing", () => {
-    let catchError = null;
-
-    return run({
-      bail: true,
-      logLevel: "silent",
-      onBuildStart: [
-        {
-          args: [
-            {
-              args: [path.join(resourcesDir, "nothing.js")],
-              cmd: "node"
-            }
-          ],
-          cmd: "del"
-        }
-      ]
-    })
-      .catch(error => {
-        catchError = error;
-
-        return Promise.resolve();
-      })
-      .then(() => {
-        expect(catchError).toBeInstanceOf(Error);
-        expect(catchError).not.toBeNull();
-
-        return Promise.resolve();
-      });
-  });
-
   it("should works when nested commands return nothing and 'bail: false'", () => {
     let catchError = null;
 

index.js

@@ -49,20 +49,8 @@ class ChildProcessWebpackPlugin {
           const nestedResults = this.execute([arg]);
           const [result] = nestedResults;
 
-          if (!result.stdout) {
+          if (!result || !result.stdout) {
             hasFailedNestedChildProcess = true;
-
-            const error = new Error(
-              `Nested process "${arg.cmd} ${arg.args.join(
-                " "
-              )}" did not return anything`
-            );
-
-            this.log.error(error);
-
-            if (this.options.bail) {
-              throw error;
-            }
           } else {
             args[index] = result.stdout;
           }
@@ -90,21 +78,29 @@ class ChildProcessWebpackPlugin {
       try {
         result = execa.sync(cmd, args, opts);
       } catch (error) {
-        this.log.error(error);
+        this.log.error(
+          new Error(
+            `Process "${cmd}${
+              args.length > 0 ? ` ${args.join(" ")}` : ""
+            }" return ${error.message}`
+          )
+        );
 
         if (this.options.bail) {
           throw error;
         }
       }
 
-      const { stdout, stderr } = result;
+      if (result) {
+        const { stdout, stderr } = result;
 
-      if (stdout) {
-        this.log.info(result.stdout);
-      }
+        if (stdout) {
+          this.log.info(result.stdout);
+        }
 
-      if (stderr) {
-        this.log.warn(result.stderr);
+        if (stderr) {
+          this.log.warn(result.stderr);
+        }
       }
 
       results.push(result);