From 24e927d6a51fd2bbbe1c307b169653d0ba041d70 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sun, 31 Jul 2022 07:27:14 -0700
Subject: [PATCH] Other modern cleanup

---
 .eslintignore       | 1 -
 modern/src/index.js | 4 +---
 tools/package.sh    | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index efc30224b2..934888f451 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,4 @@
 web/simple/app.js
 web/app.min.js
 web/load.js
-web/modern
 web/lib
diff --git a/modern/src/index.js b/modern/src/index.js
index 6af059cf10..2f5f509bcf 100644
--- a/modern/src/index.js
+++ b/modern/src/index.js
@@ -16,8 +16,6 @@ import ServerProvider from './ServerProvider';
 
 preloadImages();
 
-const base = window.location.href.indexOf('modern') >= 0 ? '/modern' : '/';
-
 ReactDOM.render(
   (
     <Provider store={store}>
@@ -26,7 +24,7 @@ ReactDOM.render(
           <ThemeProvider theme={theme}>
             <CssBaseline />
             <ServerProvider>
-              <BrowserRouter basename={base}>
+              <BrowserRouter>
                 <Navigation />
               </BrowserRouter>
             </ServerProvider>
diff --git a/tools/package.sh b/tools/package.sh
index 3e893c9782..1d43ff39df 100755
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -9,6 +9,6 @@ npm run build
 
 cd modern
 
-rm -rf ../web/modern
+rm -rf build
 npm ci
 npm run build