Skip to content
This repository has been archived by the owner on May 3, 2024. It is now read-only.

fix(watchLocalModules): fix missing baseUrl #1391

Merged
merged 1 commit into from
Apr 19, 2024
+7 −4
Merged

fix(watchLocalModules): fix missing baseUrl #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions __tests__/server/utils/watchLocalModules.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion src/server/utils/watchLocalModules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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);
smackfu marked this conversation as resolved.
Show resolved Hide resolved

const module = addHigherOrderComponent(await loadModule(
moduleNameChangeDetectedIn,
Expand Down
Loading