@midwayjs/view-nunjucks 3.0.13 → 3.1.2

package/dist/config/config.default.d.ts

@@ -20,6 +20,17 @@ declare const _default: {
          * use a cache and recompile templates each time. false in local env.
          */
         cache: boolean;
+        /**
+         * defines the syntax for nunjucks tags.
+         */
+        tags?: {
+            blockStart?: string;
+            blockEnd?: string;
+            variableStart?: string;
+            variableEnd?: string;
+            commentStart?: string;
+            commentEnd?: string;
+        };
     };
 };
 export default _default;

package/dist/engine.js

@@ -14,9 +14,7 @@ const decorator_1 = require("@midwayjs/decorator");
 const nunjucks_1 = require("nunjucks");
 class MidwayNunjucksEnvironment extends nunjucks_1.Environment {
     constructor(fileLoader, config) {
-        super(fileLoader, {
-            noCache: config.noCache,
-        });
+        super(fileLoader, config);
         // http://disse.cting.org/2016/08/02/2016-08-02-sandbox-break-out-nunjucks-template-engine
         const originMemberLookup = nunjucks_1.runtime.memberLookup;
         nunjucks_1.runtime.memberLookup = function (...args) {
@@ -31,12 +29,21 @@ let NunjucksEnvironment = class NunjucksEnvironment {
     async init() {
         const coreLogger = this.app.getCoreLogger();
         const viewPaths = this.globalConfig.view.root;
-        coreLogger.info('[@midwayjs/view-nunjucks] loading templates from %j', viewPaths);
+        coreLogger.info('[midway:view-nunjucks] loading templates from %j', viewPaths);
         const config = this.globalConfig['nunjucks'];
         config.noCache = !config.cache;
         delete config.cache;
-        const fileLoader = new nunjucks_1.FileSystemLoader(this.globalConfig.view.root);
-        this.nunjucksEnvironment = new MidwayNunjucksEnvironment(fileLoader, config);
+        const nunjucksConfig = {
+            noCache: config.noCache,
+            throwOnUndefined: config.throwOnUndefined,
+            trimBlocks: config.trimBlocks,
+            lstripBlocks: config.lstripBlocks,
+            tags: config.tags,
+        };
+        const fileLoader = new nunjucks_1.FileSystemLoader(this.globalConfig.view.root, {
+            noCache: nunjucksConfig.noCache,
+        });
+        this.nunjucksEnvironment = new MidwayNunjucksEnvironment(fileLoader, nunjucksConfig);
     }
     render(name, locals, cb) {
         return this.nunjucksEnvironment.render(name, locals, cb);

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/view-nunjucks",
-  "version": "3.0.13",
+  "version": "3.1.2",
   "description": "Midway Component for nunjucks render",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -28,14 +28,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/view": "^3.0.13",
+    "@midwayjs/view": "^3.1.2",
     "nunjucks": "^3.2.2"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.0.13",
+    "@midwayjs/core": "^3.1.2",
     "@midwayjs/decorator": "^3.0.10",
-    "@midwayjs/koa": "^3.0.13",
-    "@midwayjs/mock": "^3.0.13"
+    "@midwayjs/koa": "^3.1.2",
+    "@midwayjs/mock": "^3.1.2"
   },
-  "gitHead": "8c8338f4488ec65765c342dd5238ed3e61872b37"
+  "gitHead": "4ff3aa892b76d016f0ea123c7f9520d054d5c96b"
 }