Merge branch 'master' into greenkeeper/rollup-plugin-buble-0.19.4

package.json

@@ -39,7 +39,7 @@
     "chai": "^4.1.1",
     "codecov": "^3.0.0",
     "cross-env": "^5.0.5",
-    "css-loader": "^0.28.4",
+    "css-loader": "^1.0.1",
     "doctoc": "^1.3.0",
     "es6-promise": "^4.1.1",
     "express": "^4.15.4",
@@ -57,7 +57,7 @@
     "mocha": "^5.0.0",
     "phantomjs-prebuilt": "^2.1.15",
     "rimraf": "^2.6.1",
-    "rollup": "^0.66.0",
+    "rollup": "^0.67.0",
     "rollup-plugin-buble": "^0.19.4",
     "rollup-plugin-commonjs": "^9.1.4",
     "rollup-plugin-json": "^2.3.0",
@@ -77,7 +77,6 @@
   },
   "files": [
     "lib",
-    "yarn.lock",
     "types/index.d.ts",
     "types/vue.d.ts"
   ],

src/server/generators/tagGenerator.js

@@ -13,6 +13,7 @@ export default function _tagGenerator (options = {}) {
       text ({ body = false } = {}) {
         // build a string containing all tags of this type
         return tags.reduce((tagsStr, tag) => {
+          if (Object.keys(tag).length === 0) return tagsStr // Bail on empty tag object
           if (!!tag.body !== body) return tagsStr
           // build a string containing all attributes of this tag
           const attrs = Object.keys(tag).reduce((attrsStr, attr) => {