Merge pull request #2197 from Hyperkid123/mutate-module-name-interceptor

fix(feo): adjust module name in interceptor

Author: florkbr

packages/config-utils/src/feo/modify-response.ts

@@ -1,5 +1,5 @@
 import fecLogger, { LogType } from '../fec-logger';
-import { matchNavigationRequest, matchSearchIndexRequest, matchServiceTilesRequest, matchModulesRequest} from './check-outgoing-requests';
+import { matchModulesRequest, matchNavigationRequest, matchSearchIndexRequest, matchServiceTilesRequest } from './check-outgoing-requests';
 import { ChromeModuleRegistry, ChromeStaticSearchEntry, FrontendCRD, GeneratedBundles, ServicesTilesResponseEntry } from './feo-types';
 import moduleInterceptor from './module-interceptor';
 import navigationInterceptor from './navigation-interceptor';

packages/config-utils/src/feo/module-interceptor.test.ts

@@ -1,3 +1,4 @@
+import jsVarName from '../jsVarName';
 import { ChromeModule, ChromeModuleRegistry, FrontendCRD } from './feo-types';
 import moduleInterceptor from './module-interceptor';
 
@@ -24,12 +25,12 @@ describe('module-interceptor', () => {
       ],
     };
     const remoteModuleRegistry: ChromeModuleRegistry = {
-      [moduleName]: {
+      [jsVarName(moduleName)]: {
         manifestLocation: 'old-location',
       },
     };
     const expectedResult: ChromeModuleRegistry = {
-      [moduleName]: newEntry,
+      [jsVarName(moduleName)]: newEntry,
     };
 
     const result = moduleInterceptor(remoteModuleRegistry, frontendCRD);
@@ -60,7 +61,7 @@ describe('module-interceptor', () => {
     const remoteModuleRegistry: ChromeModuleRegistry = {};
 
     const expectedResult: ChromeModuleRegistry = {
-      [moduleName]: newEntry,
+      [jsVarName(moduleName)]: newEntry,
     };
 
     const result = moduleInterceptor(remoteModuleRegistry, frontendCRD);

packages/config-utils/src/feo/module-interceptor.ts

@@ -1,7 +1,8 @@
+import jsVarName from '../jsVarName';
 import { ChromeModuleRegistry, FrontendCRD } from './feo-types';
 
 function moduleInterceptor(moduleRegistry: ChromeModuleRegistry, frontendCRD: FrontendCRD): ChromeModuleRegistry {
-  const moduleName = frontendCRD.objects[0].metadata.name;
+  const moduleName = jsVarName(frontendCRD.objects[0].metadata.name);
   const cdnPath = frontendCRD.objects[0].spec.frontend.paths[0];
   return {
     ...moduleRegistry,