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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-config",
-    "version": "5.0.0-beta.1",
+    "version": "5.0.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": "^2.0.0-beta.1",
+        "@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,

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/scripts/csc-interceptor-server.js

@@ -27,7 +27,7 @@ const bundles = Array.from(
 const app = express();
 const port = 9999;
 
-const BASE_URL = 'https://raw.githubusercontent.com/RedHatInsights/cloud-services-config/ci-beta/';
+const BASE_URL = 'https://raw.githubusercontent.com/RedHatInsights/chrome-service-backend/main';
 
 function getRequestBundle(requestUrl) {
   const bundle = requestUrl.split('/').pop().split('-').shift();
@@ -35,14 +35,11 @@ function getRequestBundle(requestUrl) {
 }
 
 app.get('*', async (req, res, next) => {
-  let requestUrl = `${BASE_URL}${req.url.replace(/(\/beta)?\/config/gm, '')}`;
-  if (requestUrl.includes('insights-navigation.json')) {
-    requestUrl = requestUrl.replace('insights-navigation.json', 'rhel-navigation.json');
-  }
   try {
-    const schema = await axios.get(requestUrl);
+    const reqUrl = BASE_URL + req.url.replace('/api/chrome-service/v1', '');
+    const schema = await axios.get(reqUrl);
     if (req.url.includes('-navigation.json') && bundles.some((bundle) => req.url.includes(bundle))) {
-      const requestBundle = getRequestBundle(requestUrl);
+      const requestBundle = getRequestBundle(req.url);
       /** handle nav json */
       const payload = schema.data;
       payload.navItems = [...payload.navItems, ...navItems.filter(({ href }) => href.includes(requestBundle))];

package/src/scripts/dev-script.js

@@ -69,7 +69,8 @@ async function devScript(argv, cwd) {
     if (fecConfig.interceptChromeConfig === true) {
       const interceptorServerPath = resolve(__dirname, './csc-interceptor-server.js');
       const interceptorServerArgs = [interceptorServerPath];
-      spawn('node', interceptorServerArgs, {
+      // Ensure ipv4 DNS is hit first. Currently there are issues with IPV4
+      spawn('NODE_OPTIONS=--dns-result-order=ipv4first node', interceptorServerArgs, {
         stdio: [process.stdout, process.stdout, process.stdout],
         cwd,
         shell: true,

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') {
@@ -36,10 +38,7 @@ const internalProxyRoutes = {
   ...routes,
   ...(interceptChromeConfig === true
     ? {
-        '/beta/config': {
-          host: 'http://localhost:9999',
-        },
-        '/config': {
+        '/api/chrome-service/v1/static': {
           host: 'http://localhost:9999',
         },
       }