fix: routerBasename declaration location (#5347)
Co-authored-by: Bill Wallace <wayfarer3130@gmail.com>
This commit is contained in:
parent
9f2835be2d
commit
0f6f2bb432
@ -25,6 +25,7 @@ import {
|
|||||||
} from '@ohif/core';
|
} from '@ohif/core';
|
||||||
|
|
||||||
import loadModules, { loadModule as peerImport } from './pluginImports';
|
import loadModules, { loadModule as peerImport } from './pluginImports';
|
||||||
|
import { publicUrl } from './utils/publicUrl';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {object|func} appConfigOrFunc - application configuration, or a function that returns application configuration
|
* @param {object|func} appConfigOrFunc - application configuration, or a function that returns application configuration
|
||||||
@ -48,6 +49,7 @@ async function appInit(appConfigOrFunc, defaultExtensions, defaultModes) {
|
|||||||
// Default the peer import function
|
// Default the peer import function
|
||||||
appConfig.peerImport ||= peerImport;
|
appConfig.peerImport ||= peerImport;
|
||||||
appConfig.measurementTrackingMode ||= 'standard';
|
appConfig.measurementTrackingMode ||= 'standard';
|
||||||
|
appConfig.routerBasename ||= publicUrl;
|
||||||
|
|
||||||
const extensionManager = new ExtensionManager({
|
const extensionManager = new ExtensionManager({
|
||||||
commandsManager,
|
commandsManager,
|
||||||
|
|||||||
@ -17,7 +17,6 @@ import React from 'react';
|
|||||||
*/
|
*/
|
||||||
import { modes as defaultModes, extensions as defaultExtensions } from './pluginImports';
|
import { modes as defaultModes, extensions as defaultExtensions } from './pluginImports';
|
||||||
import loadDynamicConfig from './loadDynamicConfig';
|
import loadDynamicConfig from './loadDynamicConfig';
|
||||||
import { publicUrl } from './utils/publicUrl';
|
|
||||||
export { history } from './utils/history';
|
export { history } from './utils/history';
|
||||||
export { preserveQueryParameters, preserveQueryStrings } from './utils/preserveQueryParameters';
|
export { preserveQueryParameters, preserveQueryStrings } from './utils/preserveQueryParameters';
|
||||||
|
|
||||||
@ -26,7 +25,6 @@ loadDynamicConfig(window.config).then(config_json => {
|
|||||||
if (config_json !== null) {
|
if (config_json !== null) {
|
||||||
window.config = config_json;
|
window.config = config_json;
|
||||||
}
|
}
|
||||||
window.config.routerBasename ||= publicUrl;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Combine our appConfiguration with installed extensions and modes.
|
* Combine our appConfiguration with installed extensions and modes.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user