Fixes #91

Author: zachleat

src/Eleventy.js

@@ -177,21 +177,27 @@ Eleventy.prototype.getHelp = function() {
   return out.join("\n");
 };
 
-Eleventy.prototype._watch = async function() {
+Eleventy.prototype._watch = async function(path) {
   if (this.active) {
-    this.queuedToRun = true;
+    this.queuedToRun = path;
     return;
   }
 
   this.active = true;
+
+  // reset and reload global configuration :O
+  if (path === config.getLocalProjectConfigFile()) {
+    config.reset();
+  }
+
   this.restart();
   await this.write();
   this.active = false;
 
   if (this.queuedToRun) {
     console.log("You saved while Eleventy was running, let’s run again.");
     this.queuedToRun = false;
-    await this._watch();
+    await this._watch(this.queuedToRun);
   } else {
     console.log("Watching…");
   }
@@ -205,24 +211,29 @@ Eleventy.prototype.watch = async function() {
 
   const watch = require("glob-watcher");
 
+  let rawFiles = this.writer.getRawFiles();
+  // Watch the local project config file
+  rawFiles.push(config.getLocalProjectConfigFile());
+  debug("Eleventy.watch rawFiles: %o", rawFiles);
+
   console.log("Watching…");
-  let watcher = watch(this.writer.getRawFiles(), {
+  let watcher = watch(rawFiles, {
     ignored: this.writer.getWatchedIgnores()
   });
 
   watcher.on(
     "change",
     async function(path, stat) {
       console.log("File changed:", path);
-      this._watch();
+      this._watch(path);
     }.bind(this)
   );
 
   watcher.on(
     "add",
     async function(path, stat) {
       console.log("File added:", path);
-      this._watch();
+      this._watch(path);
     }.bind(this)
   );
 };

src/EleventyConfig.js

@@ -8,6 +8,11 @@ const pkg = require("../package.json");
 // API to expose configuration options in config file
 class EleventyConfig {
   constructor() {
+    this.reset();
+  }
+
+  reset() {
+    debug("Resetting EleventyConfig to initial values.");
     this.events = new EventEmitter();
     this.collections = {};
 

src/TemplateConfig.js

@@ -2,34 +2,40 @@ const chalk = require("chalk");
 const fs = require("fs-extra");
 const lodashMerge = require("lodash.merge");
 const TemplatePath = require("./TemplatePath");
-const mainRootConfig = require("../config.js");
 const eleventyConfig = require("./EleventyConfig");
 const debug = require("debug")("Eleventy:TemplateConfig");
 
 class TemplateConfig {
-  constructor(rootConfig, projectConfigPath) {
+  constructor(customRootConfig, localProjectConfigPath) {
     this.overrides = {};
-    this.projectConfigPath = projectConfigPath || ".eleventy.js";
-    this.rootConfig = rootConfig || mainRootConfig;
-    if (rootConfig) {
+    this.localProjectConfigPath = localProjectConfigPath || ".eleventy.js";
+
+    if (customRootConfig) {
+      this.customRootConfig = customRootConfig;
       debug("Warning: Using custom root config!");
+    } else {
+      this.customRootConfig = null;
     }
+    this.initializeRootConfig();
+    this.config = this.mergeConfig(this.localProjectConfigPath);
+  }
 
-    if (typeof this.rootConfig === "function") {
-      this.rootConfig = this.rootConfig(eleventyConfig);
-      // debug( "rootConfig is a function, after calling, eleventyConfig is %o", eleventyConfig );
-    }
-    debug("rootConfig %o", this.rootConfig);
+  getLocalProjectConfigFile() {
+    return this.localProjectConfigPath;
+  }
 
-    this.config = this.mergeConfig(this.projectConfigPath);
+  reset() {
+    eleventyConfig.reset();
+    this.initializeRootConfig();
+    this.config = this.mergeConfig(this.localProjectConfigPath);
   }
 
   getConfig() {
     return this.config;
   }
 
   setProjectConfigPath(path) {
-    this.projectConfigPath = path;
+    this.localProjectConfigPath = path;
 
     this.config = this.mergeConfig(path);
   }
@@ -40,16 +46,31 @@ class TemplateConfig {
     this.config.pathPrefix = pathPrefix;
   }
 
-  mergeConfig(projectConfigPath) {
+  initializeRootConfig() {
+    this.rootConfig = this.customRootConfig || require("../config.js");
+
+    if (typeof this.rootConfig === "function") {
+      this.rootConfig = this.rootConfig(eleventyConfig);
+      // debug( "rootConfig is a function, after calling, eleventyConfig is %o", eleventyConfig );
+    }
+    debug("rootConfig %o", this.rootConfig);
+  }
+
+  mergeConfig(localProjectConfigPath) {
     let overrides = ["templateFormats"];
     let localConfig = {};
     let path = TemplatePath.normalize(
-      TemplatePath.getWorkingDir() + "/" + projectConfigPath
+      TemplatePath.getWorkingDir() + "/" + localProjectConfigPath
     );
     debug(`Merging config with ${path}`);
 
     if (fs.existsSync(path)) {
       try {
+        // remove from require cache so it will grab a fresh copy
+        if (path in require.cache) {
+          delete require.cache[path];
+        }
+
         localConfig = require(path);
         // debug( "localConfig require return value: %o", localConfig );
       } catch (err) {