Skip to content
This repository has been archived by the owner on Apr 20, 2018. It is now read-only.

Add possibility to apply custom options to different flows #487

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ useminPrepare: {
}
}
```

* to customize the generated configuration via post-processors:

```js
Expand All @@ -253,6 +252,38 @@ useminPrepare: {
}
```

* to have multiple profiles with custom options:

```js
useminPrepare: {
dist: {
src: 'index.html',
options: {
dest: 'dist',
flow: {
steps: {
js: ['concat', 'uglify'],
css: ['cssmin']
},
post: {}
}
}
},
dev: {
src: 'index.html',
options: {
dest: 'app',
flow: {
steps: {
js: ['concat'],
},
post: {}
}
}
}
}
```

The given steps or post-processors may be specified as strings (for the default steps and post-processors), or as an object (for the user-defined ones).

#### User-defined steps and post-processors
Expand Down
16 changes: 8 additions & 8 deletions tasks/usemin.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var chalk = require('chalk');
// - a dedicated one for the furnished target
// - a general one
// - the default one
var getFlowFromConfig = function (config, target) {
var getFlowFromOptions = function (options, target) {
var Flow = require('../lib/flow');
var flow = new Flow({
steps: {
Expand All @@ -15,13 +15,13 @@ var getFlowFromConfig = function (config, target) {
},
post: {}
});
if (config.options && config.options.flow) {
if (config.options.flow[target]) {
flow.setSteps(config.options.flow[target].steps);
flow.setPost(config.options.flow[target].post);
if (options && options.flow) {
if (options.flow[target]) {
flow.setSteps(options.flow[target].steps);
flow.setPost(options.flow[target].post);
} else {
flow.setSteps(config.options.flow.steps);
flow.setPost(config.options.flow.post);
flow.setSteps(options.flow.steps);
flow.setPost(options.flow.post);
}
}
return flow;
Expand Down Expand Up @@ -164,7 +164,7 @@ module.exports = function (grunt) {
.writeln('Going through ' + grunt.verbose.wordlist(this.filesSrc) + ' to update the config')
.writeln('Looking for build script HTML comment blocks');

var flow = getFlowFromConfig(grunt.config('useminPrepare'), this.target);
var flow = getFlowFromOptions(options, this.target);

var c = new ConfigWriter(flow, {
root: root,
Expand Down
Loading