Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix loading of configuration files #377

Merged
merged 1 commit into from Jun 21, 2017
Merged

Fix loading of configuration files #377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions packages/cssnano/src/index.js
View file
Open in desktop
Expand Up @@ -41,15 +41,14 @@ function fromFile (css, result) {
}

/*
* config.preset can be one of four possibilities:
* config.preset = 'default'
* config.preset = ['default', {}]
* config.preset = function <- to be invoked
* config.preset = {plugins: []} <- already invoked function
* preset can be one of four possibilities:
* preset = 'default'
* preset = ['default', {}]
* preset = function <- to be invoked
* preset = {plugins: []} <- already invoked function
*/

function resolvePreset (config) {
const {preset} = config;
function resolvePreset (preset) {
let fn, options;
if (Array.isArray(preset)) {
fn = preset[0];
Expand Down Expand Up @@ -91,13 +90,13 @@ function resolvePreset (config) {

function resolveConfig (css, result, options) {
if (options.preset) {
return resolvePreset(options);
return resolvePreset(options.preset);
}
return explorer.load(fromFile(css, result)).then(config => {
if (config === null) {
return resolvePreset({preset: 'default'});
return resolvePreset('default');
}
return resolvePreset(config);
return resolvePreset(config.config);
});
}

Expand Down