Merge pull request #55 from danmademe/develop

fixes null check on mixins
express-vue · Mar 15, 2017 · 3fa8c19 · 3fa8c19
2 parents 72c2035 + 086a6a4
commit 3fa8c19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/utils/render.js b/lib/utils/render.js
@@ -11,10 +11,10 @@ const scriptRegex = /{{{script}}}/igm;
 const headRegex   = /<\/head>/igm;
 const types       = new Types();
 
-function createApp(script, mixins) {
-    if (mixins) {
-        if (mixins.length > 0) {
-            for (let mixin of mixins) {
+function createApp(script, defaults) {
+    if (defaults.options.vue && defaults.options.vue.mixins) {
+        if (defaults.options.vue.mixins.length > 0) {
+            for (let mixin of defaults.options.vue.mixins) {
                 Vue.mixin(mixin);
             }
         }
@@ -50,7 +50,7 @@ function layoutUtil(components: Object) {
 
 function renderUtil(layout: Object, renderedScriptString: string, defaults: Object) {
     return new Promise(function(resolve, reject) {
-        renderer.renderToString(createApp(layout.script, defaults.options.vue.mixins), function (error, renderedHtml) {
+        renderer.renderToString(createApp(layout.script, defaults), function (error, renderedHtml) {
             if (error) {
                 reject(error);
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "express-vue",
-  "version": "3.9.5",
+  "version": "3.9.6",
   "description": "Vue rendering engine for Express.js",
   "homepage": "https://github.com/danmademe/express-vue",
   "author": {