cha0s/flecks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: always include bespoke web config

Browse Source
This commit is contained in:
cha0s 2023-12-04 04:28:49 -06:00
parent 3e073d2660
commit 21eac28fbf
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/web/src/server/config.js
View File

@ -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) => {