fix: merge locals JSON.stringify enumerable when mergeLocals=true

easy-team · Jul 20, 2018 · d9fa7f8 · d9fa7f8
1 parent a243b2b
commit d9fa7f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/engine.js b/lib/engine.js
@@ -47,7 +47,7 @@ class Engine {
     // egg-view engine mode, the locals had merged
     if (engine) {
       if (this.config.mergeLocals) {
-        return this.setCSRFLocals(ctx, locals);
+        return this.setLocals(ctx, locals);
       }
     }
     // source locals, no merge locals
@@ -58,19 +58,19 @@ class Engine {
     } else {
       locals = Object.assign({}, { ctx, request: ctx.request, helper: ctx.helper }, sourceLocals);
     }
-    [ 'ctx', 'request', 'helper' ].forEach(key => {
-      Object.defineProperty(locals, key, { enumerable: false });
-    });
     // only data
-    return this.setCSRFLocals(ctx, locals);
+    return this.setLocals(ctx, locals);
   }
 
-  setCSRFLocals(ctx, locals) {
+  setLocals(ctx, locals) {
     // when csrf enable, set ctx csrf
     const security = this.app.config.security;
     if (security.csrf && security.csrf.enable) {
-      return Object.assign({}, { csrf: ctx.csrf }, locals);
+      locals = Object.assign({}, { csrf: ctx.csrf }, locals);
     }
+    [ 'ctx', 'request', 'helper' ].forEach(key => {
+      Object.defineProperty(locals, key, { enumerable: false });
+    });
     return locals;
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "egg-view-vue-ssr",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "vue server side render solution for egg",
   "eggPlugin": {
     "name": "vuessr"