Browse Source

Extend debug

pull/1785/head
jlukic 9 years ago
parent
commit
d1c7b48583
2 changed files with 4 additions and 10 deletions
  1. 6
      tasks/config/project/config.js
  2. 8
      tasks/config/user.js

6
tasks/config/project/config.js

@ -52,6 +52,7 @@ module.exports = {
addDerivedValues: function(config) {
config = config || defaults;
/*--------------
File Paths
---------------*/
@ -60,6 +61,7 @@ module.exports = {
configPath = this.getPath(),
folder
;
console.log('start extend' , defaults.paths);
// resolve source paths
for(folder in config.paths.source) {
@ -76,9 +78,10 @@ module.exports = {
config.paths.output[folder] = path.resolve(path.join(configPath, config.base, config.paths.output[folder]));
}
}
console.log('end extend' , defaults.paths);
// resolve "clean" command path
config.paths.clean = path.join(configPath, config.base, config.paths.clean);
config.paths.clean = path.resolve( path.join(configPath, config.base, config.paths.clean) );
/*--------------
CSS URLs
@ -130,4 +133,3 @@ module.exports = {
};
console.log(defaults);

8
tasks/config/user.js

@ -17,7 +17,6 @@ var
userConfig
;
console.log('start config' , defaults);
/*******************************
User Config
@ -36,15 +35,11 @@ catch(error) {
if(!userConfig) {
// No semantic.json file use tasks/config/defaults.js
console.error('Using default values for gulp');
console.log('start defaults' , defaults);
userConfig = defaults;
console.log('end defaults' , defaults);
}
else {
// extend defaults using shallow copy
console.log('start extend' , defaults);
userConfig = extend(false, {}, defaults, userConfig);
console.log('end extend' , defaults);
}
@ -53,9 +48,7 @@ else {
*******************************/
// adds additional derived values to config
console.log('start derived' , defaults);
userConfig = config.addDerivedValues(userConfig);
console.log('end derived' , defaults);
/*******************************
@ -64,4 +57,3 @@ console.log('end derived' , defaults);
module.exports = userConfig;
console.log('end config' , defaults);
Loading…
Cancel
Save