Merge branch 'dev'

Author: sghoweri

packages/core/src/lib/compose.js

@@ -164,6 +164,7 @@ module.exports = function(pattern, patternlab) {
             logger.info(err);
           }
           allFooterData = _.merge(allFooterData, pattern.jsonFileData);
+          allFooterData.cacheBuster = patternlab.cacheBuster;
           allFooterData.patternLabFoot = footerPartial;
 
           return render(patternlab.userFoot, allFooterData).then(footerHTML => {

packages/live-server/index.js

@@ -48,10 +48,11 @@ function staticServer(root) {
     var hasNoOrigin = !req.headers.origin;
     var injectCandidates = [
       new RegExp('</body>', 'i'),
-      new RegExp('</svg>'),
+      new RegExp('</svg>', 'g'),
       new RegExp('</head>', 'i'),
     ];
     var injectTag = null;
+    var injectCount = 0;
 
     function directory() {
       var pathname = url.parse(req.originalUrl).pathname;
@@ -62,15 +63,16 @@ function staticServer(root) {
 
     function file(filepath /*, stat*/) {
       var x = path.extname(filepath).toLocaleLowerCase(),
-        match,
+        matches,
         possibleExtensions = ['', '.html', '.htm', '.xhtml', '.php', '.svg'];
       if (hasNoOrigin && possibleExtensions.indexOf(x) > -1) {
         // TODO: Sync file read here is not nice, but we need to determine if the html should be injected or not
         var contents = fs.readFileSync(filepath, 'utf8');
         for (var i = 0; i < injectCandidates.length; ++i) {
-          match = injectCandidates[i].exec(contents);
-          if (match) {
-            injectTag = match[0];
+          matches = contents.match(injectCandidates[i]);
+          injectCount = matches && matches.length || 0;
+          if (injectCount) {
+            injectTag = matches[0];
             break;
           }
         }
@@ -94,7 +96,7 @@ function staticServer(root) {
     function inject(stream) {
       if (injectTag) {
         // We need to modify the length given to browser
-        var len = INJECTED_CODE.length + res.getHeader('Content-Length');
+        var len = INJECTED_CODE.length * injectCount + res.getHeader('Content-Length');
         res.setHeader('Content-Length', len);
         var originalPipe = stream.pipe;
         stream.pipe = function(resp) {

packages/live-server/package.json

@@ -24,7 +24,7 @@
     "opn": "5.3.0",
     "proxy-middleware": "0.15.0",
     "send": "0.16.2",
-    "serve-index": "1.7.2"
+    "serve-index": "1.9.1"
   },
   "devDependencies": {
     "eslint": "4.18.2",