From 6054cde920e5de8d6bb0d7a9378cc2fb3700b5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Mon, 11 Nov 2019 09:57:10 +0100 Subject: [PATCH] Use correct routers based on environment we're in. --- app/src/index.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/index.js b/app/src/index.js index 4da86bb..dcfa4e6 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -2,8 +2,9 @@ import domready from 'domready'; import React, { Suspense } from 'react'; import { render } from 'react-dom'; import { Provider } from 'react-redux'; +import isElectron from 'is-electron'; 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 Logger from './Logger'; import debug from 'debug'; @@ -61,6 +62,13 @@ RoomClient.init({ store, intl }); const theme = createMuiTheme(window.config.theme); +let Router; + +if (isElectron()) + Router = HashRouter; +else + Router = BrowserRouter; + domready(() => { logger.debug('DOM ready');