Move config refs into TemplateEngine

11ty · Nov 30, 2018 · 987159c · 987159c
1 parent cdffa8c
commit 987159c
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/src/Engines/Ejs.js b/src/Engines/Ejs.js
@@ -9,7 +9,6 @@ class Ejs extends TemplateEngine {
 
     this.ejsOptions = {};
 
-    this.config = config.getConfig();
     this.setLibrary(this.config.libraryOverrides.ejs);
     this.setEjsOptions(this.config.ejsOptions);
   }

diff --git a/src/Engines/Haml.js b/src/Engines/Haml.js
@@ -6,7 +6,6 @@ class Haml extends TemplateEngine {
   constructor(name, inputDir) {
     super(name, inputDir);
 
-    this.config = config.getConfig();
     this.setLibrary(this.config.libraryOverrides.haml);
   }
 

diff --git a/src/Engines/Handlebars.js b/src/Engines/Handlebars.js
@@ -6,7 +6,6 @@ class Handlebars extends TemplateEngine {
   constructor(name, inputDir) {
     super(name, inputDir);
 
-    this.config = config.getConfig();
     this.setLibrary(this.config.libraryOverrides.hbs);
   }
 

diff --git a/src/Engines/Liquid.js b/src/Engines/Liquid.js
@@ -7,7 +7,6 @@ class Liquid extends TemplateEngine {
   constructor(name, inputDir) {
     super(name, inputDir);
 
-    this.config = config.getConfig();
     this.liquidOptions = {};
 
     this.setLibrary(this.config.libraryOverrides.liquid);

diff --git a/src/Engines/Markdown.js b/src/Engines/Markdown.js
@@ -9,7 +9,6 @@ class Markdown extends TemplateEngine {
 
     this.markdownOptions = {};
 
-    this.config = config.getConfig();
     this.setLibrary(this.config.libraryOverrides.md);
   }
 

diff --git a/src/Engines/Mustache.js b/src/Engines/Mustache.js
@@ -6,7 +6,6 @@ class Mustache extends TemplateEngine {
   constructor(name, inputDir) {
     super(name, inputDir);
 
-    this.config = config.getConfig();
     this.setLibrary(this.config.libraryOverrides.mustache);
   }
 

diff --git a/src/Engines/Nunjucks.js b/src/Engines/Nunjucks.js
@@ -6,7 +6,6 @@ class Nunjucks extends TemplateEngine {
   constructor(name, inputDir) {
     super(name, inputDir);
 
-    this.config = config.getConfig();
     this.setLibrary(this.config.libraryOverrides.njk);
   }
 

diff --git a/src/Engines/Pug.js b/src/Engines/Pug.js
@@ -6,7 +6,6 @@ class Pug extends TemplateEngine {
   constructor(name, inputDir) {
     super(name, inputDir);
 
-    this.config = config.getConfig();
     this.pugOptions = {};
 
     this.setLibrary(this.config.libraryOverrides.pug);

diff --git a/src/Engines/TemplateEngine.js b/src/Engines/TemplateEngine.js
@@ -2,6 +2,7 @@ const fastglob = require("fast-glob");
 const fs = require("fs-extra");
 const TemplatePath = require("../TemplatePath");
 const EleventyExtensionMap = require("../EleventyExtensionMap");
+const config = require("../Config");
 const debug = require("debug")("Eleventy:TemplateEngine");
 
 class TemplateEngine {
@@ -16,6 +17,13 @@ class TemplateEngine {
     this.engineLib = null;
   }
 
+  get config() {
+    if (!this._config) {
+      this._config = config.getConfig();
+    }
+    return this._config;
+  }
+
   getName() {
     return this.name;
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ class Markdown extends TemplateEngine { @@
         this.markdownOptions = {};
-        this.config = config.getConfig();
         this.setLibrary(this.config.libraryOverrides.md);
       }
@@ Expand Down @@