Made node-notifier dependency optional

lib/utils/debug.js

@@ -13,6 +13,17 @@ class Debugger {
     this.enabled = true;
   }
 
+  capture () {
+    this.enabled = true;
+    this.capturing = true;
+  }
+
+  endCapture () {
+    this.enabled = false;
+    this.capturing = false;
+    this.capturedMessages = [];
+  }
+
   log (...args) {
     if (this.enabled) {
       this.captureConsole(args, console.log);
@@ -36,13 +47,8 @@ class Debugger {
     }
   }
 
-  capture () {
-    this.enabled = true;
-    this.capturing = true;
-  }
-
   clearConsole () {
-    if (!this.capturing) {
+    if (!this.capturing && this.enabled) {
       process.stdout.write('\x1bc');
     }
   }
@@ -66,12 +72,6 @@ class Debugger {
       return e;
     })
   }
-
-  endCapture () {
-    this.enabled = false;
-    this.capturing = false;
-    this.capturedMessages = [];
-  }
 }
 
 module.exports = new Debugger();

lib/webpack/plugins/notifier.js

@@ -1,31 +1,32 @@
 const path = require('path');
 const chalk = require('chalk');
 const os = require('os');
-const notifier = require('node-notifier');
 const formatMessage = require('./formatMessage');
 const debug = require('../../utils/debug');
 
+function safeRequire (moduleName) {
+  try {
+    return require(moduleName);
+  } catch (ignored) {}
+}
+
 const LOGO = path.join(__dirname, 'tarec_logo_ico.png');
 
 class NotifierPlugin {
 
   constructor ({notificationTitle, compilationSuccessMessage, showNotifications}) {
     this.notificationTitle = notificationTitle;
     this.compilationSuccessMessage = compilationSuccessMessage;
-    this.showNotifications = showNotifications;
+    this.notifier = showNotifications && safeRequire('node-notifier');
   }
 
   notify (serverity, error) {
-    notifier.notify({
+    this.notifier.notify({
       title: this.notificationTitle,
       message: serverity + ': ' + error.name,
       subtitle: error.file || '',
       icon: LOGO
-      // wait: true
     });
-    // .on('click', () => {
-    //   console.log(error.file);
-    // });
   }
 
   apply (compiler) {
@@ -49,7 +50,7 @@ class NotifierPlugin {
         const nbErrors = formattedErrors.length;
         displayCompilationMessage(`Failed to compile with ${nbErrors} errors`, 'red');
 
-        if (this.showNotifications) {
+        if (this.notifier) {
           this.notify('Error', formattedErrors[0]);
         }
         formattedErrors.forEach((error, index) => displayError(index, 'Error', error));

test/Command.spec.js

@@ -7,7 +7,7 @@ const addBuiltInCommands = require('../lib/commands/addBuiltInCommands');
 const test = require('ava');
 const debug = require('../lib/utils/debug');
 
-test('should add built-in commands', t => {
+test('commands: should add built-in commands', t => {
   const commands = new Commands();
   addBuiltInCommands(commands);
 

test/loadUserConfig.spec.js

@@ -6,8 +6,7 @@ const os = require('os');
 
 test('config : should parse config', () => {
   process.env['ENV_VAR'] = 'http://localhost:8181';
-  const projectDir = path.resolve('fixtures/config/fullConfig.yml');
-  const userConfig = loadUserConfig(projectDir);
+  const userConfig = loadUserConfig(path.resolve('fixtures/config/fullConfig.yml'));
 
   expect(userConfig.happypack).toEqual({
     enabled: true,
@@ -32,8 +31,7 @@ test('config : should parse config', () => {
 });
 
 test('config : should parse empty config', () => {
-  const projectDir = path.resolve('fixtures/config/emptyConfig.yml');
-  const userConfig = loadUserConfig(projectDir);
+  const userConfig = loadUserConfig(path.resolve('fixtures/config/emptyConfig.yml'));
 
   expect(userConfig.happypack).toEqual({
     enabled: false,

test/webpackConfigs.spec.js

@@ -62,7 +62,7 @@ test('webpack : dev config should handle dlls', t => {
   expect(devConfig).toHavePlugin('AddAssetHtmlPlugin', expectedAssetPluginOptions);
 });
 
-test('webpack : happyPack', () => {
+test('webpack : dev config should configure happyPack', () => {
 
   const context = createMinimalContext();
   context.dlls = [];