Make config run async

.gitignore

@@ -16,3 +16,4 @@ api-docs/
 _site/
 
 package-lock.json
+yarn.lock

cmd.js

@@ -2,11 +2,11 @@
 const pkg = require("./package.json");
 const chalk = require("chalk"); // node 8+
 require("please-upgrade-node")(pkg, {
-  message: function(requiredVersion) {
+  message: function (requiredVersion) {
     return chalk.red(
       `Eleventy requires Node ${requiredVersion}. You’ll need to upgrade to use it!`
     );
-  }
+  },
 });
 
 if (process.env.DEBUG) {
@@ -19,8 +19,8 @@ try {
   const argv = require("minimist")(process.argv.slice(2), {
     boolean: ["quiet"],
     default: {
-      quiet: null
-    }
+      quiet: null,
+    },
   });
   const Eleventy = require("./src/Eleventy");
   const EleventyCommandCheck = require("./src/EleventyCommandCheck");
@@ -31,10 +31,10 @@ try {
       `Unhandled rejection in promise (${promise})`
     );
   });
-  process.on("uncaughtException", error => {
+  process.on("uncaughtException", (error) => {
     EleventyErrorHandler.fatal(error, "Uncaught exception");
   });
-  process.on("rejectionHandled", promise => {
+  process.on("rejectionHandled", (promise) => {
     EleventyErrorHandler.warn(
       promise,
       "A promise rejection was handled asynchronously"
@@ -46,12 +46,15 @@ try {
   cmdCheck.hasUnknownArguments();
 
   let elev = new Eleventy(argv.input, argv.output);
-  elev.setConfigPathOverride(argv.config);
+
   elev.setPathPrefix(argv.pathprefix);
   elev.setDryRun(argv.dryrun);
   elev.setIncrementalBuild(argv.incremental);
   elev.setPassthroughAll(argv.passthroughall);
   elev.setFormats(argv.formats);
+  if (argv.config) {
+    await elev.setConfigPathOverride(argv.config);
+  }
 
   // --quiet and --quiet=true resolves to true
   if (argv.quiet === true || argv.quiet === false) {
@@ -62,13 +65,15 @@ try {
   // with old node versions in `please-upgrade-node` above.
   elev
     .init()
-    .then(function() {
+    .then(async function () {
+      // Async config is going to require everything inside init()
+
       if (argv.version) {
         console.log(elev.getVersion());
       } else if (argv.help) {
         console.log(elev.getHelp());
       } else if (argv.serve) {
-        elev.watch().then(function() {
+        elev.watch().then(function () {
           elev.serve(argv.port);
         });
       } else if (argv.watch) {

src/Eleventy.js

@@ -31,21 +31,12 @@ const debug = require("debug")("Eleventy");
  */
 class Eleventy {
   constructor(input, output) {
-    /** @member {Object} - tbd. */
-    this.config = config.getConfig();
-
     /**
      * @member {String} - The path to Eleventy's config file.
      * @default null
      */
     this.configPath = null;
 
-    /**
-     * @member {Boolean} - Is Eleventy running in verbose mode?
-     * @default true
-     */
-    this.isVerbose = process.env.DEBUG ? false : !this.config.quietMode;
-
     /**
      * @member {Boolean} - Was verbose mode overridden manually?
      * @default false
@@ -64,6 +55,7 @@ class Eleventy {
      */
     this.isDryRun = false;
 
+    //TODO:  does this belong here still? Move into init?
     if (performance) {
       debug("Eleventy warm up time (in ms) %o", performance.now());
     }
@@ -77,9 +69,6 @@ class Eleventy {
      */
     this.formatsOverride = null;
 
-    /** @member {Object} - tbd. */
-    this.eleventyServe = new EleventyServe();
-
     /** @member {String} - Holds the path to the input directory. */
     this.rawInput = input;
 
@@ -91,8 +80,9 @@ class Eleventy {
 
     /** @member {Object} - tbd. */
     this.watchTargets = new EleventyWatchTargets();
-    this.watchTargets.addAndMakeGlob(this.config.additionalWatchTargets);
-    this.watchTargets.watchJavaScriptDependencies = this.config.watchJavaScriptDependencies;
+
+    /** @member {Object} - tbd. */
+    this.eleventyServe = new EleventyServe();
   }
 
   getNewTimestamp() {
@@ -183,11 +173,11 @@ class Eleventy {
    * @method
    * @param {String} configPath - The new config path.
    */
-  setConfigPathOverride(configPath) {
+  async setConfigPathOverride(configPath) {
     if (configPath) {
       this.configPath = configPath;
 
-      config.setProjectConfigPath(configPath);
+      await config.setProjectConfigPath(configPath);
       this.config = config.getConfig();
     }
   }
@@ -289,30 +279,49 @@ class Eleventy {
    * @returns {} - tbd.
    */
   async init() {
+    if (!this.config) {
+      await config.init();
+    }
+    /** @member {Object} - tbd. */
+    this.config = config.getConfig();
+    /**
+     * @member {Boolean} - Is Eleventy running in verbose mode?
+     * @default true
+     */
+    this.isVerbose = process.env.DEBUG ? false : !this.config.quietMode;
+
+    this.watchTargets.addAndMakeGlob(this.config.additionalWatchTargets);
+    this.watchTargets.watchJavaScriptDependencies = this.config.watchJavaScriptDependencies;
+
+    /** @member {Object} - tbd. */
+    this.eleventyServe.config = config;
+
     this.config.inputDir = this.inputDir;
 
     let formats = this.formatsOverride || this.config.templateFormats;
-    this.extensionMap = new EleventyExtensionMap(formats);
+    this.extensionMap = new EleventyExtensionMap(formats, config);
 
     this.eleventyFiles = new EleventyFiles(
       this.input,
       this.outputDir,
       formats,
-      this.isPassthroughAll
+      this.isPassthroughAll,
+      config
     );
     this.eleventyFiles.extensionMap = this.extensionMap;
-    this.eleventyFiles.init();
 
-    this.templateData = new TemplateData(this.inputDir);
+    this.templateData = new TemplateData(this.inputDir, config);
     this.templateData.extensionMap = this.extensionMap;
     this.eleventyFiles.setTemplateData(this.templateData);
+    this.eleventyFiles.init();
 
     this.writer = new TemplateWriter(
       this.input,
       this.outputDir,
       formats,
       this.templateData,
-      this.isPassthroughAll
+      this.isPassthroughAll,
+      config
     );
 
     this.writer.extensionMap = this.extensionMap;
@@ -425,8 +434,8 @@ Arguments:
    *
    * @method
    */
-  resetConfig() {
-    config.reset();
+  async resetConfig() {
+    await config.reset();
 
     this.config = config.getConfig();
     this.eleventyServe.config = this.config;
@@ -465,7 +474,7 @@ Arguments:
 
     // reset and reload global configuration :O
     if (this.watchManager.hasQueuedFile(config.getLocalProjectConfigFile())) {
-      this.resetConfig();
+      await this.resetConfig();
     }
 
     await this.restart();

src/EleventyExtensionMap.js

@@ -2,9 +2,10 @@ const TemplateEngineManager = require("./TemplateEngineManager");
 const TemplatePath = require("./TemplatePath");
 
 class EleventyExtensionMap {
-  constructor(formatKeys) {
+  constructor(formatKeys, templateConfig) {
     this.formatKeys = formatKeys;
-
+    this.config = templateConfig.getConfig();
+    this.templateConfig = templateConfig;
     this.setFormats(formatKeys);
   }
 
@@ -23,15 +24,15 @@ class EleventyExtensionMap {
   }
 
   get config() {
-    return this.configOverride || require("./Config").getConfig();
+    return this.configOverride || this.config;
   }
   set config(cfg) {
     this.configOverride = cfg;
   }
 
   get engineManager() {
     if (!this._engineManager) {
-      this._engineManager = new TemplateEngineManager();
+      this._engineManager = new TemplateEngineManager(this.templateConfig);
       this._engineManager.config = this.config;
     }
 

src/EleventyFiles.js

@@ -6,15 +6,14 @@ const TemplateData = require("./TemplateData");
 const TemplateGlob = require("./TemplateGlob");
 const TemplatePath = require("./TemplatePath");
 const TemplatePassthroughManager = require("./TemplatePassthroughManager");
-
-const config = require("./Config");
 const debug = require("debug")("Eleventy:EleventyFiles");
 // const debugDev = require("debug")("Dev:Eleventy:EleventyFiles");
 const aggregateBench = require("./BenchmarkManager").get("Aggregate");
 
 class EleventyFiles {
-  constructor(input, outputDir, formats, passthroughAll) {
-    this.config = config.getConfig();
+  constructor(input, outputDir, formats, passthroughAll, templateConfig) {
+    this.config = templateConfig.getConfig();
+    this.templateConfig = templateConfig;
     this.input = input;
     this.inputDir = TemplatePath.getDir(this.input);
     this.outputDir = outputDir;
@@ -100,7 +99,10 @@ class EleventyFiles {
   get extensionMap() {
     // for tests
     if (!this._extensionMap) {
-      this._extensionMap = new EleventyExtensionMap(this.formats);
+      this._extensionMap = new EleventyExtensionMap(
+        this.formats,
+        this.templateConfig
+      );
       this._extensionMap.config = this.config;
     }
     return this._extensionMap;
@@ -111,7 +113,7 @@ class EleventyFiles {
   }
 
   initPassthroughManager() {
-    let mgr = new TemplatePassthroughManager();
+    let mgr = new TemplatePassthroughManager(this.templateConfig);
     mgr.setInputDir(this.inputDir);
     mgr.setOutputDir(this.outputDir);
     mgr.extensionMap = this.extensionMap;
@@ -134,7 +136,7 @@ class EleventyFiles {
   // TODO make this a getter
   getTemplateData() {
     if (!this.templateData) {
-      this.templateData = new TemplateData(this.inputDir);
+      this.templateData = new TemplateData(this.inputDir, this.templateConfig);
     }
     return this.templateData;
   }

src/EleventyServe.js

@@ -1,15 +1,15 @@
 const fs = require("fs-extra");
 
 const TemplatePath = require("./TemplatePath");
-const config = require("./Config");
 const debug = require("debug")("EleventyServe");
 
 class EleventyServe {
   constructor() {}
 
   get config() {
-    return this.configOverride || config.getConfig();
+    return this.configOverride || this.config;
   }
+
   set config(config) {
     this.configOverride = config;
   }
@@ -41,7 +41,7 @@ class EleventyServe {
 
     // TODO customize this in Configuration API?
     let serverConfig = {
-      baseDir: this.outputDir
+      baseDir: this.outputDir,
     };
 
     let redirectDirName = this.getRedirectDirOverride();
@@ -68,7 +68,7 @@ class EleventyServe {
         watch: false,
         open: false,
         notify: false,
-        index: "index.html"
+        index: "index.html",
       },
       this.config.browserSyncConfig
     );
@@ -78,7 +78,7 @@ class EleventyServe {
     if (dirName && dirName !== "/") {
       let savedPathFilename = this.getRedirectFilename(dirName);
 
-      setTimeout(function() {
+      setTimeout(function () {
         if (!fs.existsSync(savedPathFilename)) {
           debug(`Cleanup redirect: Could not find ${savedPathFilename}`);
           return;
@@ -94,7 +94,7 @@ class EleventyServe {
           return;
         }
 
-        fs.unlink(savedPathFilename, err => {
+        fs.unlink(savedPathFilename, (err) => {
           if (!err) {
             debug(`Cleanup redirect: Deleted ${savedPathFilename}`);
           }

src/Engines/Custom.js

@@ -2,8 +2,8 @@ const TemplateEngine = require("./TemplateEngine");
 const getJavaScriptData = require("../Util/GetJavaScriptData");
 
 class CustomEngine extends TemplateEngine {
-  constructor(name, includesDir) {
-    super(name, includesDir);
+  constructor(name, includesDir, eleventyConfig) {
+    super(name, includesDir, eleventyConfig);
 
     this.entry = this.getExtensionMapEntry();
     this.needsInit =

src/Engines/Ejs.js

@@ -2,8 +2,8 @@ const ejsLib = require("ejs");
 const TemplateEngine = require("./TemplateEngine");
 
 class Ejs extends TemplateEngine {
-  constructor(name, includesDir) {
-    super(name, includesDir);
+  constructor(name, includesDir, templateConfig) {
+    super(name, includesDir, templateConfig);
 
     this.ejsOptions = {};
 
@@ -31,7 +31,7 @@ class Ejs extends TemplateEngine {
       {
         root: "./" + includesDir,
         compileDebug: true,
-        filename: "./" + includesDir
+        filename: "./" + includesDir,
       },
       this.ejsOptions || {}
     );
@@ -46,7 +46,7 @@ class Ejs extends TemplateEngine {
 
     let fn = this.ejsLib.compile(str, options);
 
-    return function(data) {
+    return function (data) {
       return fn(data);
     };
   }