Skip to content

Commit faca61c

Browse files
committed
feat: Look for passed clm data file, and if it exists, pass the key messages through the workflow.
1 parent 6493098 commit faca61c

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

lib/gulp/assemble.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module.exports = function(gulp, options) {
2222

2323
var app = assemble(),
2424
appDest = options.paths.dist,
25+
clmData = false,
2526
deferred = Q.defer();
2627

2728
// handle yml files
@@ -37,6 +38,15 @@ module.exports = function(gulp, options) {
3738
// pass paths through assemble
3839
app.data('paths', options.paths);
3940

41+
// look for passed clm data file
42+
if(app.data('clm')){
43+
clmData = app.data('clm');
44+
45+
if(clmData.key_messages){
46+
options.keyMessages = clmData.key_messages;
47+
}
48+
}
49+
4050
app.partials(path.join(options.paths.src, 'templates', 'includes', '*.hbs'));
4151
app.layouts(path.join(options.paths.src, options.paths.layouts, '*.hbs'));
4252

@@ -47,7 +57,6 @@ module.exports = function(gulp, options) {
4757
app.pages(path.join(options.paths.src, options.paths.pages, '**', '*.hbs'));
4858
}
4959

50-
5160
app.preLayout(/\.hbs$/, function(view, next) {
5261
// only set the layout if it's not already defined
5362
if (view.data.layout === undefined) {
@@ -161,14 +170,7 @@ module.exports = function(gulp, options) {
161170
var deferred = Q.defer(),
162171
filerKeyMessages;
163172

164-
// Filter array for:
165-
// 'global' key Message
166-
// All Key Messages stored in hiddenKeyMessages presentation
167-
filerKeyMessages = options.keyMessages.filter(function(item) {
168-
return (item.key_message !== 'global' && options.hiddenKeyMessages.indexOf(item) === -1);
169-
});
170-
171-
fs.writeFile(path.join(options.paths.dist, options.paths.sharedAssets) + '/app.json', JSON.stringify(filerKeyMessages), function(err, data) {
173+
fs.writeFile(path.join(options.paths.dist, options.paths.sharedAssets) + '/app.json', JSON.stringify(options.keyMessages), function(err, data) {
172174
if (err) {
173175
utils.log.error(err);
174176
deferred.reject(err);
@@ -275,7 +277,7 @@ module.exports = function(gulp, options) {
275277
return utils.executeWhen(!options.modeSingleKeyMessage, copyTemplateAssets, ' ✔︎ Copying Key Message Assets');
276278
})
277279
.then(function() {
278-
return utils.executeWhen(true, generateGlobalAppConfig, ' ✔︎ Generating Global app.json file');
280+
return utils.executeWhen(options.keyMessages, generateGlobalAppConfig, ' ✔︎ Generating Global app.json file');
279281
})
280282
.then(function() {
281283
return utils.executeWhen(!options.modeSingleKeyMessage, generateSitemapFile, ' ✔︎ Generating sitemap.json file');

0 commit comments

Comments
 (0)