Do not validate FEC config for build with custom webpack config.

RedHatInsights · Jan 3, 2024 · a619948 · a619948
1 parent 6663eb6
commit a619948
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/config/src/bin/build-script.ts b/packages/config/src/bin/build-script.ts
@@ -5,11 +5,12 @@ const { resolve } = require('path');
 import { spawn } from 'child_process';
 
 export function buildScript(argv: { [name: string]: string }, cwd: string) {
-  validateFECConfig(cwd);
   let configPath;
   if (typeof argv.webpackConfig !== 'undefined') {
     configPath = getWebpackConfigPath(argv.webpackConfig, cwd);
   } else {
+    // validate the FEC config only if a custom webpack config is not provided
+    validateFECConfig(cwd);
     configPath = resolve(__dirname, './prod.webpack.config.js');
   }
   process.env.NODE_ENV = 'production';

diff --git a/packages/config/src/bin/dev-script.ts b/packages/config/src/bin/dev-script.ts
@@ -37,13 +37,14 @@ async function devScript(
   cwd: string
 ) {
   try {
-    validateFECConfig(cwd);
-
-    const fecConfig = require(process.env.FEC_CONFIG_PATH!);
+    let fecConfig: any = {};
     let configPath;
     if (typeof argv.webpackConfig !== 'undefined') {
       configPath = getWebpackConfigPath(argv.webpackConfig, cwd);
     } else {
+      // validate the FEC config only if a custom webpack config is not provided
+      validateFECConfig(cwd);
+      fecConfig = require(process.env.FEC_CONFIG_PATH!);
       configPath = resolve(__dirname, './dev.webpack.config.js');
     }
 

diff --git a/packages/config/src/bin/fec.ts b/packages/config/src/bin/fec.ts
@@ -9,7 +9,6 @@ import './tsconfig.template.json';
 
 const devScript = require('./dev-script');
 const buildScript = require('./build-script');
-const { validateFECConfig } = require('./common');
 const { fecLogger, LogType } = require('@redhat-cloud-services/frontend-components-config-utilities');
 
 function patchHosts() {
@@ -121,13 +120,10 @@ const argv = yargs
 
 const scripts: { [name: string]: (...args: any[]) => void } = {
   static: (argv: any, cwd: string) => {
-    // set fec config
-    validateFECConfig(cwd);
     serveStatic(argv, cwd);
   },
   'patch-etc-hosts': patchHosts,
   dev: (argv: any, cwd: string) => {
-    validateFECConfig(cwd);
     devScript(argv, cwd);
   },
   build: buildScript,