@redhat-cloud-services/frontend-components-config 5.0.0-beta.0 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-config",
-    "version": "5.0.0-beta.0",
+    "version": "5.0.0",
     "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": "^2.0.0-beta.0",
+        "@redhat-cloud-services/frontend-components-config-utilities": "^2.0.1",
         "assert": "^2.0.0",
         "axios": "^0.27.2",
         "babel-loader": "^8.2.5",

package/src/config.js

@@ -33,7 +33,9 @@ module.exports = ({
   useCloud,
   target,
   registry,
-  client = {},
+  client = {
+    overlay: false,
+  },
   bundlePfModules = false,
   bounceProd,
   useAgent,
@@ -42,6 +44,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) {
@@ -175,7 +179,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/config.test.js

@@ -58,7 +58,9 @@ describe('should create dummy config with no options', () => {
         verbose: false,
         disableDotRule: true,
       },
-      client: {},
+      client: {
+        overlay: false,
+      },
       devMiddleware: {
         writeToDisk: true,
       },

package/src/plugins.test.js

@@ -7,19 +7,19 @@ describe('plugins generations, no option', () => {
   const enabledPlugins = plugins({ rootFolder: '/foo/bar' });
 
   it('should generate plugins', () => {
-    expect(enabledPlugins.length).toBe(5);
+    expect(enabledPlugins.length).toBe(4);
   });
 
   it('should generate plugins with sourceMaps', () => {
     const enabledPlugins = plugins({ generateSourceMaps: true, rootFolder: '/foo/bar' });
-    expect(enabledPlugins.length).toBe(6);
+    expect(enabledPlugins.length).toBe(5);
   });
 });
 
 describe('TS for plugins', () => {
   const pluginsWithTs = plugins({ generateSourceMaps: true, rootFolder: path.resolve(__dirname, '../../../') });
-  it('should have TSForkPlugin and 7 plugins in todal', () => {
-    expect(pluginsWithTs).toHaveLength(7);
+  it('should have TSForkPlugin and 6 plugins in todal', () => {
+    expect(pluginsWithTs).toHaveLength(6);
   });
 });
 

package/src/scripts/dev.webpack.config.js

@@ -5,20 +5,22 @@ const fecConfig = require(process.env.FEC_CONFIG_PATH);
 const isBeta = process.env.BETA === 'true';
 
 function parseRegexpURL(url) {
-  return new RegExp(`${isBeta ? '/beta' : ''}${url.toString()}`);
+  return isBeta ? [new RegExp(`/beta${url.toString()}`), new RegExp(`/preview${url.toString()}`)] : new RegExp(url.toString());
 }
 
 function createAppUrl(appUrl) {
   if (Array.isArray(appUrl)) {
-    return appUrl.map((url) => {
-      if (typeof url === 'object') {
-        return parseRegexpURL(url);
-      } else if (typeof url === 'string') {
-        return `${isBeta ? '/beta' : ''}${url}`;
-      } else {
-        throw `Invalid appURL format! Expected string or regexp, got ${typeof url}. Check your fec.config.js:appUrl.`;
-      }
-    });
+    return appUrl
+      .map((url) => {
+        if (typeof url === 'object') {
+          return parseRegexpURL(url);
+        } else if (typeof url === 'string') {
+          return isBeta ? [`/beta${url}`, `/preview${url}`] : url;
+        } else {
+          throw `Invalid appURL format! Expected string or regexp, got ${typeof url}. Check your fec.config.js:appUrl.`;
+        }
+      })
+      .flat();
   } else if (typeof appUrl === 'object') {
     return parseRegexpURL(appUrl);
   } else if (typeof appUrl === 'string') {