@redhat-cloud-services/frontend-components-config 4.6.40 → 4.7.1

package/bin/fec.js

@@ -56,6 +56,15 @@ const argv = yargs
         describe: 'Path to webpack config',
     })
 })
+.option('clouddotEnv', {
+    describe: "Set platform environment ['stage', 'prod', 'qa', 'ci']",
+    type: 'string',
+})
+.option('uiEnv', {
+    describe: "Set Chrome environment ['beta', 'stable']",
+    type: 'string',
+})
+.example('$0 dev --clouddotEnv=stage --uiEnv=stable', 'Example of usage in non-interactive environments')
 .help()
 .argv;
 
@@ -66,7 +75,10 @@ const scripts = {
         static(argv, cwd)
     },
     'patch-etc-hosts': patchHosts,
-    dev: devScript,
+    dev: (argv, cwd) => {
+        validateFECConfig(cwd)
+        devScript(argv, cwd)
+    },
     build: buildScript
 };
 
@@ -74,7 +86,7 @@ const args = [ argv, cwd ];
 
 function run() {
     if (!argv._.length || argv._.length === 0) {
-        console.error('Script name name must be specified. Run fec --help for more information.');
+        console.error('Script name must be specified. Run fec --help for more information.');
         process.exit(1);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-config",
-    "version": "4.6.40",
+    "version": "4.7.1",
     "description": "Config plugins and settings for RedHat Cloud Services project.",
     "main": "index.js",
     "bin": {
@@ -21,7 +21,7 @@
     "homepage": "https://github.com/RedHatInsights/frontend-components/tree/master/packages/config#readme",
     "dependencies": {
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
-        "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.28",
+        "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.30",
         "assert": "^2.0.0",
         "axios": "^0.27.2",
         "babel-loader": "^8.2.5",

package/src/config.js

@@ -43,6 +43,8 @@ module.exports = ({
   cacheConfig = {},
   _unstableHotReload = false,
   resolve = {},
+  // additional node_modules dirs for searchIgnoredStyles, usefull in monorepo scenario
+  nodeModulesDirectories = [],
 } = {}) => {
   const filenameMask = `js/[name].${!_unstableHotReload && useFileHash ? `[fullhash].` : ''}js`;
   if (betaEnv) {
@@ -176,7 +178,9 @@ module.exports = ({
       ...resolve,
       extensions: ['.ts', '.tsx', '.mjs', '.js', '.scss', ...(resolve.extensions, [])],
       alias: {
-        ...(bundlePfModules ? {} : searchIgnoredStyles(rootFolder)),
+        ...(bundlePfModules
+          ? {}
+          : searchIgnoredStyles(rootFolder, ...(Array.isArray(nodeModulesDirectories) ? nodeModulesDirectories : [nodeModulesDirectories]))),
         ...resolve.alias,
       },
       fallback: {

package/src/scripts/dev-script.js

@@ -39,7 +39,28 @@ async function devScript(argv, cwd) {
     } else {
       configPath = resolve(__dirname, './dev.webpack.config.js');
     }
-    await setEnv(cwd);
+
+    const clouddotEnvOptions = ['stage', 'prod', 'qa', 'ci'];
+    const uiEnvOptions = ['beta', 'stable'];
+    if (argv?.clouddotEnv && argv?.uiEnv) {
+      if (clouddotEnvOptions.includes(argv.clouddotEnv) && uiEnvOptions.includes(argv.uiEnv)) {
+        process.env.BETA = argv.uiEnv;
+        process.env.CLOUDOT_ENV = argv.clouddotEnv;
+        process.env.FEC_ROOT_DIR = cwd;
+      } else {
+        console.error(
+          'Incorrect argument value:\n--clouddotEnv must be one of: [',
+          clouddotEnvOptions.toString(),
+          ']\n--uiEnv must be one of: [',
+          uiEnvOptions.toString(),
+          ']\nRun fec --help for more information.'
+        );
+        process.exit(1);
+      }
+    } else {
+      await setEnv(cwd);
+    }
+
     spawn(`npm exec -- webpack serve -c ${configPath}`, [], {
       stdio: [process.stdout, process.stdout, process.stdout],
       cwd,