Skip to content

fecConfig: Fix a few issues in the config (HMS-11177) #4725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
regexowl wants to merge 5 commits into
base: main
Choose a base branch
from
+10 −36
Open

fecConfig: Fix a few issues in the config (HMS-11177) #4725

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5db292d
fecConfig: Fix rule for excluding cockpit pkg directory
regexowl Aug 7, 2026
9b94897
fecConfig: Remove deprecated /beta route
regexowl Aug 7, 2026
61d2437
fecConfig: Omit repetition
regexowl Aug 7, 2026
df1e356
fecConfig: Fix typo
regexowl Aug 7, 2026
2f886a6
fecConfig: Clean up add_define
regexowl Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 10 additions & 36 deletions fec.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,12 @@ class IstanbulCoveragePlugin {

const plugins = [new IstanbulCoveragePlugin()];

function add_define(key, value) {
const definePluginIndex = plugins.findIndex(
(plugin) => plugin instanceof webpack.DefinePlugin,
);
if (definePluginIndex !== -1) {
const definePlugin = plugins[definePluginIndex];

const newDefinePlugin = new webpack.DefinePlugin({
...definePlugin.definitions,
[key]: JSON.stringify(value),
});

plugins[definePluginIndex] = newDefinePlugin;
} else {
plugins.push(
new webpack.DefinePlugin({
[key]: JSON.stringify(value),
}),
);
}
}

if (process.env.NODE_ENV) {
add_define('process.env.NODE_ENV', process.env.NODE_ENV);
plugins.push(
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
}),
);
}

if (process.env.ENABLE_SENTRY) {
Expand Down Expand Up @@ -106,7 +88,7 @@ module.exports = {
resolve: {
alias: {
'@': path.resolve(__dirname, 'src'),
// we don't wan't these packages bundled with
// we don't want these packages bundled with
// the service frontend, so we can set the aliases
// to false
cockpit: false,
Expand All @@ -119,18 +101,13 @@ module.exports = {
{
// running `make` on cockpit plugin creates './pkg'
// directory, the generated files do not pass
// `npm run build` outputing failures
// this ensures the directory is exluded during build time
exclude: ',/pkg',
// `npm run build` outputting failures
// this ensures the directory is excluded during build time
exclude: path.resolve(__dirname, 'pkg'),
},
],
},
routes: {
...(process.env.CONFIG_PORT && {
[`${process.env.BETA ? '/beta' : ''}/config`]: {
host: `http://localhost:${process.env.CONFIG_PORT}`,
},
}),
...(process.env.LOCAL_IMAGE_BUILDER_API && {
'/api/image-builder': {
host: process.env.LOCAL_IMAGE_BUILDER_API,
Expand All @@ -144,14 +121,11 @@ module.exports = {
return {
...acc,
[`/apps/${appName}`]: { host: `${protocol}://${host}:${appPort}` },
[`/beta/apps/${appName}`]: {
host: `${protocol}://${host}:${appPort}`,
},
};
}, {}),
}),
},
plugins: plugins,
plugins,
moduleFederation: {
exposes: {
'./RootApp': path.resolve(__dirname, './src/AppEntry.tsx'),
Expand Down
Loading