Use correct routers based on environment we're in.
parent
1dc19611fb
commit
6054cde920
|
|
@ -2,8 +2,9 @@ import domready from 'domready';
|
||||||
import React, { Suspense } from 'react';
|
import React, { Suspense } from 'react';
|
||||||
import { render } from 'react-dom';
|
import { render } from 'react-dom';
|
||||||
import { Provider } from 'react-redux';
|
import { Provider } from 'react-redux';
|
||||||
|
import isElectron from 'is-electron';
|
||||||
import { createIntl, createIntlCache, RawIntlProvider } from 'react-intl';
|
import { createIntl, createIntlCache, RawIntlProvider } from 'react-intl';
|
||||||
import { Route, HashRouter as Router } from 'react-router-dom';
|
import { Route, HashRouter, BrowserRouter } from 'react-router-dom';
|
||||||
import randomString from 'random-string';
|
import randomString from 'random-string';
|
||||||
import Logger from './Logger';
|
import Logger from './Logger';
|
||||||
import debug from 'debug';
|
import debug from 'debug';
|
||||||
|
|
@ -61,6 +62,13 @@ RoomClient.init({ store, intl });
|
||||||
|
|
||||||
const theme = createMuiTheme(window.config.theme);
|
const theme = createMuiTheme(window.config.theme);
|
||||||
|
|
||||||
|
let Router;
|
||||||
|
|
||||||
|
if (isElectron())
|
||||||
|
Router = HashRouter;
|
||||||
|
else
|
||||||
|
Router = BrowserRouter;
|
||||||
|
|
||||||
domready(() =>
|
domready(() =>
|
||||||
{
|
{
|
||||||
logger.debug('DOM ready');
|
logger.debug('DOM ready');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue