Simplify: Remove react/features/base/navigator

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 {

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';
 

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

react/features/base/navigator/index.js

@@ -1 +0,0 @@
-export { default as RouteRegistry } from './RouteRegistry';

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';

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';
 

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';