WIP

package.json

@@ -79,7 +79,7 @@
         "@types/react": "^18.0.0",
         "@types/react-dom": "^18.0.0",
         "@types/react-router-dom": "^5.3.3",
-        "@types/redux-mock-store": "^1.0.3",
+        "@types/redux-mock-store": "^1.0.6",
         "@types/sanitize-html": "^2.6.2",
         "@typescript-eslint/eslint-plugin": "^5.38.1",
         "@typescript-eslint/parser": "^5.38.1",

packages/config-utils/package.json

@@ -18,22 +18,25 @@
     },
     "homepage": "https://github.com/RedHatInsights/frontend-components#readme",
     "scripts": {
-        "build": "tsc"
+        "build": "tsc",
+        "start": "tsc --watch"
     },
     "peerDependencies": {
         "webpack": "^5.0.0"
     },
     "dependencies": {
         "@openshift/dynamic-plugin-sdk-webpack": "^4.0.1",
         "chalk": "^4.1.2",
-        "node-fetch": "2.6.7"
+        "node-fetch": "^2.6.7",
+        "pac-proxy-agent": "^7.0.2"
     },
     "devDependencies": {
         "@types/express": "^4.17.17",
         "@types/http-server": "^0.12.1",
         "@types/js-yaml": "^4.0.5",
-        "@types/jws": "^3.2.5",
+        "@types/jws": "^3.2.10",
         "@types/node-fetch": "^2.6.4",
-        "glob": "10.3.3"
+        "glob": "10.3.3",
+        "jws": "^4.0.0"
     }
 }

packages/config-utils/src/cookieTransform.ts

@@ -38,7 +38,7 @@ function cookieTransform(
 
   if (match) {
     const cs_jwt = match[1];
-    const { payload } = jws.decode(cs_jwt);
+    const { payload } = jws.decode(cs_jwt) || {};
 
     const identity = {
       entitlements,

packages/config-utils/src/fec-logger.ts

@@ -1,10 +1,10 @@
 import chalk from 'chalk';
 
 const PREFIX = '[fec]';
-const ERROR_LEVEL = `${PREFIX} Error`;
-const WARN_LEVEL = `${PREFIX} Warn`;
-const INFO_LEVEL = `${PREFIX} Info`;
-const DEBUG_LEVEL = `${PREFIX} Debug`;
+const ERROR_LEVEL = 'Error';
+const WARN_LEVEL = 'Warn';
+const INFO_LEVEL = 'Info';
+const DEBUG_LEVEL = 'Debug';
 
 export enum LogType {
   error = ERROR_LEVEL,
@@ -28,9 +28,35 @@ const logFunctions = {
 };
 
 function getFecMessage(level: LogType, ...data: any[]) {
-  logFunctions[level](`${colors[level](level)}: `, ...data);
+  logFunctions[level](`${colors[level](PREFIX + ' ' + level)}: `, ...data);
 }
 
+export const fecWebpackLogger = () => {
+  function cleanUpLog(args: any) {
+    return args.map((log: any) => {
+      if (typeof log === 'string') {
+        return log.replace('[webpack-dev-server]', '').trim();
+      } else {
+        return log;
+      }
+    });
+  }
+
+  function log(level: LogType, ...data: any[]) {
+    logFunctions[level](`${colors[level]('[wds] ' + level)}: `, ...data);
+  }
+
+  return {
+    ...console,
+    error: (...args: any[]) => log(LogType.error, chalk.bold.red(...cleanUpLog(args))),
+    warn: (...args: any[]) => log(LogType.warn, ...cleanUpLog(args)),
+    info: (...args: any[]) => log(LogType.info, ...cleanUpLog(args)),
+    debug: (...args: any[]) => log(LogType.debug, ...cleanUpLog(args)),
+    log: (...args: any[]) => log(LogType.debug, ...cleanUpLog(args)),
+  };
+};
+
 export default getFecMessage;
 module.exports = getFecMessage;
 module.exports.LogType = LogType;
+module.exports.fecWebpackLogger = fecWebpackLogger;

packages/config-utils/src/federated-modules.ts

@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
 import { relative, resolve } from 'path';
 import { DynamicRemotePlugin, EncodedExtension, PluginBuildMetadata, WebpackSharedConfig } from '@openshift/dynamic-plugin-sdk-webpack';
-import jsVarName from './jsVarName';
 import fecLogger, { LogType } from './fec-logger';
+import jsVarName from './jsVarName';
 
 const defaultPluginMetaDataJSON = {
   version: '1.0.0',
@@ -108,13 +108,13 @@ const federatedModules = ({
   }
 
   if (debug) {
-    console.log('Using package at path: ', resolve(root, './package.json'));
-    console.log('Using appName: ', appName);
-    console.log(`Using ${exposes ? 'custom' : 'default'} exposes`);
-    console.log('Number of custom shared modules is: ', shared.length);
-    console.log('Number of default shared modules is: ', sharedDeps.length);
+    fecLogger(LogType.info, 'Using package at path: ', resolve(root, './package.json'));
+    fecLogger(LogType.info, 'Using appName: ', appName);
+    fecLogger(LogType.info, `Using ${exposes ? 'custom' : 'default'} exposes`);
+    fecLogger(LogType.info, 'Number of custom shared modules is: ', shared.length);
+    fecLogger(LogType.info, 'Number of default shared modules is: ', sharedDeps.length);
     if (exclude.length > 0) {
-      console.log('Excluding default packages', exclude);
+      fecLogger(LogType.info, 'Excluding default packages', exclude);
     }
   }