@redhat-cloud-services/frontend-components-config 5.0.0 → 5.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-config",
-    "version": "5.0.0",
+    "version": "5.0.2",
     "description": "Config plugins and settings for RedHat Cloud Services project.",
     "main": "index.js",
     "bin": {

package/src/config.js

@@ -47,7 +47,7 @@ module.exports = ({
   // additional node_modules dirs for searchIgnoredStyles, usefull in monorepo scenario
   nodeModulesDirectories = [],
 } = {}) => {
-  const filenameMask = `js/[name].${!_unstableHotReload && useFileHash ? `[fullhash].` : ''}js`;
+  const filenameMask = `js/[name].${!_unstableHotReload && useFileHash ? `[contenthash].` : ''}js`;
   if (betaEnv) {
     env = `${betaEnv}-beta`;
     console.warn('betaEnv is deprecated in favor of env');
@@ -165,7 +165,7 @@ module.exports = ({
           test: /\.(woff(2)?|ttf|jpg|png|eot|gif|svg)(\?v=\d+\.\d+\.\d+)?$/,
           type: 'asset/resource',
           generator: {
-            filename: 'fonts/[name][ext]',
+            filename: 'assets/[name][ext]',
           },
         },
         {

package/src/config.test.js

@@ -30,10 +30,10 @@ describe('should create dummy config with no options', () => {
 
   test('output', () => {
     expect(output).toEqual({
-      filename: expect.stringMatching(/js\/\[name\]\.\[fullhash\]\.js/),
+      filename: expect.stringMatching(/js\/\[name\]\.\[contenthash\]\.js/),
       path: '/dist',
       publicPath: undefined,
-      chunkFilename: expect.stringMatching(/js\/\[name\]\.\[fullhash\]\.js/),
+      chunkFilename: expect.stringMatching(/js\/\[name\]\.\[contenthash\]\.js/),
     });
   });
 

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

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