diff --git a/react/features/app/components/AbstractApp.js b/react/features/app/components/AbstractApp.js index bd330a311..5162ac232 100644 --- a/react/features/app/components/AbstractApp.js +++ b/react/features/app/components/AbstractApp.js @@ -3,11 +3,11 @@ import { Provider } from 'react-redux'; import { compose, createStore } from 'redux'; import Thunk from 'redux-thunk'; -import { RouteRegistry } from '../../base/navigator'; import { localParticipantJoined, localParticipantLeft } from '../../base/participants'; +import { RouteRegistry } from '../../base/react'; import { MiddlewareRegistry, ReducerRegistry } from '../../base/redux'; import { diff --git a/react/features/app/functions.native.js b/react/features/app/functions.native.js index 5f6db5c96..86cf04d42 100644 --- a/react/features/app/functions.native.js +++ b/react/features/app/functions.native.js @@ -1,5 +1,5 @@ import { isRoomValid } from '../base/conference'; -import { RouteRegistry } from '../base/navigator'; +import { RouteRegistry } from '../base/react'; import { Conference } from '../conference'; import { WelcomePage } from '../welcome'; diff --git a/react/features/app/functions.web.js b/react/features/app/functions.web.js index 42ba9dfb0..a312d48f5 100644 --- a/react/features/app/functions.web.js +++ b/react/features/app/functions.web.js @@ -1,10 +1,10 @@ /* global APP, JitsiMeetJS, loggingConfig */ import { isRoomValid } from '../base/conference'; -import { RouteRegistry } from '../base/navigator'; +import { RouteRegistry } from '../base/react'; +import { interceptComponent } from '../base/util'; import { Conference } from '../conference'; import { WelcomePage } from '../welcome'; -import { interceptComponent } from '../base/util'; import URLProcessor from '../../../modules/config/URLProcessor'; import KeyboardShortcut diff --git a/react/features/base/navigator/index.js b/react/features/base/navigator/index.js deleted file mode 100644 index 9c40ca232..000000000 --- a/react/features/base/navigator/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default as RouteRegistry } from './RouteRegistry'; diff --git a/react/features/base/navigator/RouteRegistry.js b/react/features/base/react/RouteRegistry.js similarity index 100% rename from react/features/base/navigator/RouteRegistry.js rename to react/features/base/react/RouteRegistry.js diff --git a/react/features/base/react/index.js b/react/features/base/react/index.js index 398bb49d7..d24d9a776 100644 --- a/react/features/base/react/index.js +++ b/react/features/base/react/index.js @@ -1,4 +1,5 @@ export * from './components'; export * from './functions'; export { default as Platform } from './Platform'; +export { default as RouteRegistry } from './RouteRegistry'; export { default as Symbol } from './Symbol'; diff --git a/react/features/conference/route.js b/react/features/conference/route.js index 5cfed1311..8c7309acd 100644 --- a/react/features/conference/route.js +++ b/react/features/conference/route.js @@ -4,7 +4,7 @@ import BoshAddressChoice from '../../../modules/config/BoshAddressChoice'; import HttpConfigFetch from '../../../modules/config/HttpConfigFetch'; import ConferenceUrl from '../../../modules/URL/ConferenceUrl'; -import { RouteRegistry } from '../base/navigator'; +import { RouteRegistry } from '../base/react'; import { Conference } from './components'; diff --git a/react/features/welcome/route.js b/react/features/welcome/route.js index 3e0922448..15b4ef601 100644 --- a/react/features/welcome/route.js +++ b/react/features/welcome/route.js @@ -1,6 +1,6 @@ /* global APP */ -import { RouteRegistry } from '../base/navigator'; +import { RouteRegistry } from '../base/react'; import { generateRoomWithoutSeparator } from '../base/util'; import { WelcomePage } from './components';