Skip to content

Commit

Permalink
fix namespace when calling subgenerator
Browse files Browse the repository at this point in the history
  • Loading branch information
kristw committed Jul 28, 2016
1 parent f180752 commit 4ef9f85
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 12 deletions.
21 changes: 15 additions & 6 deletions generators/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,33 @@ module.exports = BaseWithEasily.extend({
var options = {
skipGreeting: true
};
options['use-' + tool] = true;
generator.easily.composeWithLocal(tool, options);
options['use-summon:' + tool] = true;
generator.easily.composeWithLocal(
'summon:' + tool,
options
);
});

if (props.linter !== 'none') {
var lintOptions = {
skipGreeting: true
};
lintOptions['use-' + props.linter] = true;
generator.easily.composeWithLocal(props.linter, lintOptions);
lintOptions['use-summon:' + props.linter] = true;
generator.easily.composeWithLocal(
'summon:' + props.linter,
lintOptions
);
}

props.extra.forEach(function (tool) {
var options = {
skipGreeting: true
};
options['use-' + tool] = true;
generator.easily.composeWithLocal(tool, options);
options['use-summon:' + tool] = true;
generator.easily.composeWithLocal(
'summon:' + tool,
options
);
});
}
});
Expand Down
12 changes: 6 additions & 6 deletions generators/webpack/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ module.exports = BaseWithEasily.extend({

writing: function () {
if (this.easily.checkForConfirmation()) {
this.easily.extendJSONWithTemplate(
'__package.json',
'package.json'
);

this.easily.copy('webpack.config.js');
this.easily
.extendJSONWithTemplate(
'__package.json',
'package.json'
)
.copy('webpack.config.js');
}
},

Expand Down

0 comments on commit 4ef9f85

Please sign in to comment.