From b56bd71be923f6568dbfe664d7737ba922898215 Mon Sep 17 00:00:00 2001 From: harimkims Date: Thu, 9 Dec 2021 20:48:22 +0900 Subject: [PATCH] apply feedback Signed-off-by: harimkims --- .../strapi/lib/core/loaders/plugins/index.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/core/strapi/lib/core/loaders/plugins/index.js b/packages/core/strapi/lib/core/loaders/plugins/index.js index 5a06962c01..a324f2bfbf 100644 --- a/packages/core/strapi/lib/core/loaders/plugins/index.js +++ b/packages/core/strapi/lib/core/loaders/plugins/index.js @@ -3,6 +3,7 @@ const { join } = require('path'); const fse = require('fs-extra'); const { defaultsDeep, getOr, get } = require('lodash/fp'); +const { merge } = require('lodash'); const { env } = require('@strapi/utils'); const loadConfigFile = require('../../app-configuration/load-config-file'); const loadFiles = require('../../../load/load-files'); @@ -71,14 +72,19 @@ const getUserPluginsConfig = async () => { strapi.dirs.config, `env/${process.env.NODE_ENV}/plugins.js` ); + let config = {}; - if (await fse.pathExists(currentEnvUserConfigPath)) { - return loadConfigFile(currentEnvUserConfigPath); - } else if (await fse.pathExists(globalUserConfigPath)) { - return loadConfigFile(globalUserConfigPath); - } else { - return {}; + // assign global user config if exists + if (await fse.pathExists(globalUserConfigPath)) { + config = loadConfigFile(globalUserConfigPath); } + + // and merge user config by environment if exists + if (await fse.pathExists(currentEnvUserConfigPath)) { + config = merge(config, loadConfigFile(currentEnvUserConfigPath)); + } + + return config; }; const applyUserConfig = async plugins => {