Skip to content

Commit

Permalink
Merge branch 'hotfix/1.4.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Igloczek committed May 6, 2017
2 parents 7d8b7f5 + 3cb50ca commit 44afa1a
Show file tree
Hide file tree
Showing 3 changed files with 336 additions and 256 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "snowdog/frontools",
"description": "Set of front-end tools for Magento 2, based on Gulp.js",
"version": "1.4.4",
"version": "1.4.5",
"license": "MIT",
"type": "magento2-component"
}
6 changes: 3 additions & 3 deletions helper/config-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ module.exports = function(file, plugins, config, failOnError) { // eslint-disabl
return JSON.parse(plugins.fs.readFileSync(externalPath));
}
}
else if (plugins.globby.sync('./config/' + file).length) {
else if (plugins.globby.sync('config/' + file).length) {
if (file.includes('yml')) {
return plugins.yaml.safeLoad(plugins.fs.readFileSync('./config/' + file));
return plugins.yaml.safeLoad(plugins.fs.readFileSync('config/' + file));
}
else {
return JSON.parse(plugins.fs.readFileSync('../config/' + file));
return JSON.parse(plugins.fs.readFileSync('config/' + file));
}
}
else {
Expand Down
Loading

0 comments on commit 44afa1a

Please sign in to comment.