hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1040 from atmire/wZp-77237-overwriteMerge-config

Browse Source 
Environment files merging with overwriteMerge
This commit is contained in:
Tim Donohue
2021-03-18 09:32:35 -05:00
committed by GitHub
parent 1115c58537 4f08ad453f
commit e43955903f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/set-env.ts
View File

@@ -10,7 +10,7 @@ const targetPath = './src/environments/environment.ts';
const colors = require('colors'); const colors = require('colors');
require('dotenv').config(); require('dotenv').config();
const merge = require('deepmerge'); const merge = require('deepmerge');
const mergeOptions = { arrayMerge: (destinationArray, sourceArray, options) => sourceArray };
const environment = process.argv[2]; const environment = process.argv[2];
let environmentFilePath; let environmentFilePath;
let production = false; let production = false;
@@ -45,10 +45,10 @@ const processEnv = {
} as GlobalConfig; } as GlobalConfig;
import(environmentFilePath) import(environmentFilePath)
.then((file) => generateEnvironmentFile(merge.all([commonEnv, file.environment, processEnv]))) .then((file) => generateEnvironmentFile(merge.all([commonEnv, file.environment, processEnv], mergeOptions)))
.catch(() => { .catch(() => {
console.log(colors.yellow.bold(`No specific environment file found for ` + environment)); console.log(colors.yellow.bold(`No specific environment file found for ` + environment));
generateEnvironmentFile(merge(commonEnv, processEnv)) generateEnvironmentFile(merge(commonEnv, processEnv, mergeOptions))
}); });
function generateEnvironmentFile(file: GlobalConfig): void { function generateEnvironmentFile(file: GlobalConfig): void {
@@ -65,7 +65,7 @@ function generateEnvironmentFile(file: GlobalConfig): void {
} }
// allow to override a few important options by environment variables // allow to override a few important options by environment variables
function createServerConfig(host?: string, port?: string, nameSpace?: string, ssl?: string): ServerConfig { function createServerConfig(host?: string, port?: string, nameSpace?: string, ssl?: string): ServerConfig {
const result = {} as any; const result = {} as any;
if (hasValue(host)) { if (hasValue(host)) {
result.host = host; result.host = host;