Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[deploy] refactoring

Browse source
This commit is contained in:
Maxim Kadushkin 2019-10-14 18:58:17 +03:00
parent b28919275f
commit fa5c7bbb30
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
build/Gruntfile.js
View file

@ -102,10 +102,29 @@ module.exports = function(grunt) {
} }
function doRegisterInitializeAppTask(name, appName, configFile) { function doRegisterInitializeAppTask(name, appName, configFile) {
if ( !!process.env['EXTRA_CONFIG_PATH'] && if (!!process.env['BRANDING_PATH'] &&
grunt.file.exists(process.env['EXTRA_CONFIG_PATH'] + '/' + configFile) ) grunt.file.exists(process.env['BRANDING_PATH'] + '/' + configFile))
{ {
var _extConfig = require(process.env['EXTRA_CONFIG_PATH'] + '/' + configFile); var _extConfig = require(process.env['BRANDING_PATH'] + '/' + configFile);
}
function _merge(target, ...sources) {
if (!sources.length) return target;
const source = sources.shift();
if (_.isObject(target) && _.isObject(source)) {
for (const key in source) {
if (_.isObject(source[key])) {
if (!target[key]) Object.assign(target, { [key]: {} });
else if (_.isArray(source[key])) target[key].push(...source[key]);
else _merge(target[key], source[key]);
} else {
Object.assign(target, { [key]: source[key] });
}
}
}
return _merge(target, ...sources);
} }
return grunt.registerTask('init-build-' + name, 'Initialize build ' + appName, function(){ return grunt.registerTask('init-build-' + name, 'Initialize build ' + appName, function(){
@ -116,25 +135,6 @@ module.exports = function(grunt) {
grunt.log.ok(appName + ' config loaded successfully'.green); grunt.log.ok(appName + ' config loaded successfully'.green);
if ( !!_extConfig && _extConfig.name == packageFile.name ) { if ( !!_extConfig && _extConfig.name == packageFile.name ) {
function _merge(target, ...sources) {
if (!sources.length) return target;
const source = sources.shift();
if (_.isObject(target) && _.isObject(source)) {
for (const key in source) {
if (_.isObject(source[key])) {
if (!target[key]) Object.assign(target, { [key]: {} });
else if (_.isArray(source[key])) target[key].push(...source[key]);
else _merge(target[key], source[key]);
} else {
Object.assign(target, { [key]: source[key] });
}
}
}
return _merge(target, ...sources);
}
_merge(packageFile, _extConfig); _merge(packageFile, _extConfig);
} }
} else grunt.log.error().writeln('Could not load config file'.red); } else grunt.log.error().writeln('Could not load config file'.red);