Merge branch 'release/0.6.7'

Author: danielcherubini

example/app.js

@@ -58,7 +58,12 @@ app.get('/', (req, res) => {
     const vueOptions = {
         head: {
             title: 'Page Title',
-
+            meta: [
+                {
+                    property: 'og:title2',
+                    content: 'Page Title2'
+                }
+            ]
         }
     }
     res.renderVue('main/main.vue', data, vueOptions)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "express-vue-renderer",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "Rendering Engine for turning Vue files into Javascript Objects",
   "homepage": "https://github.com/express-vue/express-vue-renderer",
   "author": {
@@ -69,6 +69,7 @@
     "babel-preset-es2015": "^6.24.1",
     "camel-case": "^3.0.0",
     "clean-css": "^4.1.7",
+    "dedupe": "^2.1.0",
     "deepmerge": "^1.5.1",
     "html-minifier": "^3.5.3",
     "lru-cache": "^4.1.1",

package.json

@@ -2,13 +2,20 @@
 const LRU = require('lru-cache');
 const path = require('path');
 const deepmerge = require('deepmerge');
+const dedupe = require('dedupe');
 const Layout = require('./layout');
 const options = {
     max: 500,
     maxAge: 1000 * 60 * 60
 };
 const lruCache = LRU(options);
 
+function concatMerge(destinationArray, sourceArray) {
+    let finalArray = destinationArray.concat(sourceArray);
+    //Dedupes dupes... obviously... but theres a problem here
+    return dedupe(finalArray);
+}
+
 class Defaults {
     rootPath: string;
     component: string;
@@ -41,10 +48,10 @@ class Defaults {
         }
     }
     mergeVueObject(newVueObject: Object): void {
-        this.vue = deepmerge(this.vue, newVueObject);
+        this.vue = deepmerge(this.vue, newVueObject, { arrayMerge: concatMerge });
     }
     mergeDataObject(newDataObject: Object): void {
-        this.data = deepmerge(this.data, newDataObject);
+        this.data = deepmerge(this.data, newDataObject, { arrayMerge: concatMerge });
     }
 }
 

src/models/defaults.js

@@ -29,7 +29,13 @@ const options = {
         foo: true
     },
     vue: {
-        title: 'bar'
+        head: {
+            title: 'bar',
+            meta: [
+                {foo: true}
+            ]
+        }
+
     }
 };
 
@@ -70,5 +76,17 @@ test('Defaults data', t => {
 })
 
 test('Defaults vue', t => {
-    t.is(defaultObject.vue.title, 'bar');
+    t.is(defaultObject.vue.head.title, 'bar');
+})
+
+test('Merges VueObject', t => {
+    const testVueObject = {
+        head: {
+            meta: [
+                {bar: false}
+            ]
+        }
+    }
+    defaultObject.mergeVueObject(testVueObject);
+    t.deepEqual(defaultObject.vue.head.meta, [{foo: true}, {bar: false}]);
 })