Merge branch 'dev' into update-serve-index

sghoweri · web-flow · commit 453f5e9b639a · 2019-05-16T16:01:54.000-04:00
diff --git a/packages/core/src/lib/compose.js b/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 => {

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ module.exports = function(pattern, patternlab) {`
`164`	`164`	`logger.info(err);`
`165`	`165`	`}`
`166`	`166`	`allFooterData = _.merge(allFooterData, pattern.jsonFileData);`
	`167`	`+ allFooterData.cacheBuster = patternlab.cacheBuster;`
`167`	`168`	`allFooterData.patternLabFoot = footerPartial;`
`168`	`169`
`169`	`170`	`return render(patternlab.userFoot, allFooterData).then(footerHTML => {`