Update njk-loader options

alsolovyev · Apr 23, 2021 · e26b808 · e26b808
1 parent 0ba9b41
commit e26b808
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config/loaders/nunjucks.loader.js b/config/loaders/nunjucks.loader.js
@@ -29,7 +29,8 @@ const htmlLoader = {
 const nunjucksLoader = {
   loader: path.resolve('./config/modules/njk-loader'),
   options: {
-    context: require(path.resolve(SOURCE_DIR, 'data', 'nunjucks.data.js')),
+    autoescape: false,
+    context: path.resolve(SOURCE_DIR, 'data/nunjucks.data.js'),
     templates: 'njk'
   }
 }

diff --git a/config/modules/njk-loader/index.js b/config/modules/njk-loader/index.js
@@ -21,9 +21,9 @@ module.exports = function(source) {
   const { context, templates } = this.getOptions(schema)
 
   const env = new Environment(
-    new FileSystemLoader(path.resolve(this.rootContext, templates)),
+    new FileSystemLoader(path.resolve(this.rootContext, templates || '')),
     {
-      autoescape: true
+      autoescape: autoescape || true
     }
   )
   env.on('load', (name, source, loader) => {