From 21eac28fbf6c35a8da9aac2e7a6650157dc93738 Mon Sep 17 00:00:00 2001 From: cha0s Date: Mon, 4 Dec 2023 04:28:49 -0600 Subject: [PATCH] fix: always include bespoke web config --- packages/web/src/server/config.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/web/src/server/config.js b/packages/web/src/server/config.js index 98889ba..7ea1306 100644 --- a/packages/web/src/server/config.js +++ b/packages/web/src/server/config.js @@ -3,7 +3,7 @@ import {Transform} from 'stream'; const config = async (flecks, req) => { const httpConfig = await flecks.invokeMergeAsync('@flecks/web.config', req); const {config} = flecks.get('$flecks/web.flecks'); - return Object.keys(config) + const reducedConfig = Object.keys(config) .filter((path) => !path.startsWith('$')) .filter((path) => !path.endsWith('/server')) .reduce( @@ -16,6 +16,14 @@ const config = async (flecks, req) => { }), {}, ); + // Fold in any bespoke configuration. + Object.keys(httpConfig) + .forEach((key) => { + if (!(key in reducedConfig)) { + reducedConfig[key] = httpConfig[key]; + } + }); + return reducedConfig; }; export const configSource = async (flecks, req) => {