A little refactor for #182

cmd.js

@@ -10,28 +10,29 @@ require("please-upgrade-node")(pkg, {
 });
 
 if (process.env.DEBUG) {
-  require("time-require");
+  let timeRequire = require("time-require");
 }
 
-const argv = require("minimist")(process.argv.slice(2));
-const Eleventy = require("./src/Eleventy");
-const EleventyCommandCheck = require("./src/EleventyCommandCheck");
 const EleventyErrorHandler = require("./src/EleventyErrorHandler");
 
-process.on("unhandledRejection", (error, promise) => {
-  EleventyErrorHandler.error(promise, "Unhandled rejection in promise");
-});
-process.on("uncaughtException", e => {
-  EleventyErrorHandler.fatal(e, "Uncaught exception");
-});
-process.on("rejectionHandled", promise => {
-  EleventyErrorHandler.warn(
-    promise,
-    "A promise rejection was handled asynchronously"
-  );
-});
-
 try {
+  const argv = require("minimist")(process.argv.slice(2));
+  const Eleventy = require("./src/Eleventy");
+  const EleventyCommandCheck = require("./src/EleventyCommandCheck");
+
+  process.on("unhandledRejection", (error, promise) => {
+    EleventyErrorHandler.error(promise, "Unhandled rejection in promise");
+  });
+  process.on("uncaughtException", e => {
+    EleventyErrorHandler.fatal(e, "Uncaught exception");
+  });
+  process.on("rejectionHandled", promise => {
+    EleventyErrorHandler.warn(
+      promise,
+      "A promise rejection was handled asynchronously"
+    );
+  });
+
   let cmdCheck = new EleventyCommandCheck(argv);
   cmdCheck.hasUnknownArguments();
 
@@ -66,5 +67,5 @@ try {
     })
     .catch(EleventyErrorHandler.fatal);
 } catch (e) {
-  EleventyErrorHandler.fatal(e);
+  EleventyErrorHandler.fatal(e, "Eleventy fatal error");
 }

src/Config.js

@@ -1,16 +1,7 @@
-const chalk = require("chalk");
 const TemplateConfig = require("./TemplateConfig");
-const EleventyErrorHandler = require("./EleventyErrorHandler");
 const debug = require("debug")("Eleventy:Config");
 
 debug("Setting up global TemplateConfig.");
-let config;
-try {
-  config = new TemplateConfig();
-} catch (e) {
-  console.log("\n" + chalk.red("Problem with Eleventy configuration: "));
-
-  EleventyErrorHandler.log(e);
-}
+let config = new TemplateConfig();
 
 module.exports = config;

src/EleventyErrorHandler.js

@@ -3,7 +3,7 @@ const debug = require("debug")("Eleventy:EleventyErrorHandler");
 
 class EleventyErrorHandler {
   static warn(e, msg) {
-    EleventyErrorHandler.message(msg, "warn", "yellow");
+    EleventyErrorHandler.initialMessage(msg, "warn", "yellow");
     EleventyErrorHandler.log(e, "warn");
   }
 
@@ -13,24 +13,42 @@ class EleventyErrorHandler {
   }
 
   static error(e, msg) {
-    EleventyErrorHandler.message(msg, "error", "red");
+    EleventyErrorHandler.initialMessage(msg, "error", "red");
     EleventyErrorHandler.log(e, "error");
   }
 
-  static message(message, type = "log", chalkColor = "blue") {
+  static log(e, type = "log", prefix = ">") {
+    let ref = e;
+    while (ref) {
+      EleventyErrorHandler.message(
+        (process.env.DEBUG ? "" : `${prefix} `) +
+          `${ref.message} (${ref.name})`,
+        type
+      );
+      debug(`(${type} stack): %O`, ref.stack);
+      ref = ref.originalError;
+    }
+  }
+
+  static initialMessage(message, type = "log", chalkColor = "blue") {
     if (message) {
-      console[type](
-        chalk[chalkColor](message + ": (full stack in DEBUG output)")
+      EleventyErrorHandler.message(
+        message + ": (full stack in DEBUG output)",
+        type,
+        chalkColor
       );
     }
   }
 
-  static log(e, type = "log", prefix = ">") {
-    let ref = e;
-    while (ref) {
-      console[type](`${prefix} ${ref.message} (${ref.name})`);
-      debug(`(${type}): %O`, ref.stack);
-      ref = ref.originalError;
+  static message(message, type = "log", chalkColor) {
+    if (process.env.DEBUG) {
+      debug(`(${type}): ${message}`);
+    } else {
+      if (chalkColor) {
+        console[type](chalk[chalkColor](message));
+      } else {
+        console[type](message);
+      }
     }
   }
 }

src/TemplateConfig.js

@@ -1,9 +1,7 @@
-const chalk = require("chalk");
 const fs = require("fs-extra");
 const lodashMerge = require("lodash.merge");
 const TemplatePath = require("./TemplatePath");
 const EleventyBaseError = require("./EleventyBaseError");
-const EleventyErrorHandler = require("./EleventyErrorHandler");
 const eleventyConfig = require("./EleventyConfig");
 const debug = require("debug")("Eleventy:TemplateConfig");