diff --git a/config.loader.js b/config.loader.js index 261372d7d..e7bf4c1a4 100644 --- a/config.loader.js +++ b/config.loader.js @@ -1,4 +1,5 @@ +import iframelyConfig from './config.js'; // Load global config from exec dir, because `iframely` can be used as library. var globalConfig = await import(process.cwd() + '/config.js'); globalConfig = globalConfig && globalConfig.default; -export default globalConfig; \ No newline at end of file +export default {...iframelyConfig, ...globalConfig}; \ No newline at end of file