config: always use iframely config; use spread to merge objects

itteco · Nov 12, 2021 · 0aff940 · 0aff940
1 parent 0b0b8a0
commit 0aff940
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;
+export default {...iframelyConfig, ...globalConfig};