Merge branch 'main' into feature/perf-suite

americanexpress · Apr 19, 2024 · c1d1700 · c1d1700
2 parents e9c8c81 + 15b7c02
commit c1d1700
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION=lts
 # builds as we do not have to run apk installs for alpine.
 FROM node:$VERSION as builder
 WORKDIR /opt/build
-RUN npm install -g npm@9.6.7 --registry=https://registry.npmjs.org
+RUN npm install -g npm@9.9.3 --registry=https://registry.npmjs.org
 COPY --chown=node:node ./ /opt/build
 # npm ci does not run postinstall with root account
 RUN NODE_ENV=development npm ci --build-from-source

diff --git a/__tests__/server/utils/watchLocalModules.spec.js b/__tests__/server/utils/watchLocalModules.spec.js
@@ -25,6 +25,7 @@ import {
 } from 'holocron/moduleRegistry';
 import watchLocalModules from '../../../src/server/utils/watchLocalModules';
 import { getIp } from '../../../src/server/utils/getIP';
+import addBaseUrlToModuleMap from '../../../src/server/utils/addBaseUrlToModuleMap';
 
 const ip = getIp();
 
@@ -112,7 +113,7 @@ describe('watchLocalModules', () => {
     await changeListener(modulePath);
     expect(loadModule).toHaveBeenCalledWith(
       moduleName,
-      moduleMapSample.modules[moduleName],
+      addBaseUrlToModuleMap(moduleMapSample).modules[moduleName],
       require('../../../src/server/utils/onModuleLoad').default
     );
     expect(getModules().get(moduleName)).toBe(updatedModule);
@@ -153,7 +154,7 @@ describe('watchLocalModules', () => {
     await changeListener(modulePath);
     expect(loadModule).toHaveBeenCalledWith(
       moduleName,
-      moduleMapSample.modules[moduleName],
+      addBaseUrlToModuleMap(moduleMapSample).modules[moduleName],
       require('../../../src/server/utils/onModuleLoad').default
     );
     expect(getModules().get(moduleName)).toBe(originalModule);
@@ -234,7 +235,7 @@ describe('watchLocalModules', () => {
     await changeListener(modulePath);
     expect(loadModule).toHaveBeenCalledWith(
       moduleName,
-      updatedModuleMapSample.modules[moduleName],
+      addBaseUrlToModuleMap(updatedModuleMapSample).modules[moduleName],
       require('../../../src/server/utils/onModuleLoad').default
     );
     expect(getModules().get(moduleName)).toBe(updatedModule);

diff --git a/src/server/utils/watchLocalModules.js b/src/server/utils/watchLocalModules.js
@@ -26,6 +26,7 @@ import {
 } from 'holocron/moduleRegistry';
 import { getIp } from './getIP';
 import onModuleLoad from './onModuleLoad';
+import addBaseUrlToModuleMap from './addBaseUrlToModuleMap';
 
 export default function watchLocalModules() {
   const staticsDirectoryPath = path.resolve(__dirname, '../../../static');
@@ -43,12 +44,13 @@ export default function watchLocalModules() {
 
       const moduleMap = JSON.parse(fs.readFileSync(moduleMapPath, 'utf8'));
 
-      const moduleData = moduleMap.modules[moduleNameChangeDetectedIn];
+      const moduleData = addBaseUrlToModuleMap(moduleMap).modules[moduleNameChangeDetectedIn];
       const oneAppDevCdnAddress = `http://${getIp()}:${process.env.HTTP_ONE_APP_DEV_CDN_PORT || 3001}`;
 
       moduleData.browser.url = moduleData.browser.url.replace('[one-app-dev-cdn-url]', oneAppDevCdnAddress);
       moduleData.legacyBrowser.url = moduleData.legacyBrowser.url.replace('[one-app-dev-cdn-url]', oneAppDevCdnAddress);
       moduleData.node.url = moduleData.node.url.replace('[one-app-dev-cdn-url]', oneAppDevCdnAddress);
+      moduleData.baseUrl = moduleData.baseUrl.replace('[one-app-dev-cdn-url]', oneAppDevCdnAddress);
 
       const module = addHigherOrderComponent(await loadModule(
         moduleNameChangeDetectedIn,