Merge branch 'master' of https://github.com/traccar/traccar-web

3 files changed, 6 insertions, 22 deletions

diff --git a/tools/minify.bat b/tools/minify.bat
deleted file mode 100644
index bb350bf5..00000000
--- a/tools/minify.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-cd C:\[traccar path]\traccar\web
-set SDK=C:\[sencha path]\ext-6.2.0
-
-sencha -sdk %SDK% compile -classpath=app.js,app,%SDK%\packages\core\src,%SDK%\packages\core\overrides,%SDK%\classic\classic\src,%SDK%\classic\classic\overrides exclude -all and include -recursive -file app.js and exclude -namespace=Ext and concatenate -closure app.min.js
diff --git a/tools/minify.sh b/tools/minify.sh
deleted file mode 100755
index 0579d8ca..00000000
--- a/tools/minify.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-cd $(dirname $0)/../web
-
-# Use the value of $EXTJS_PATH if it is defined, '../../../ext-6.2.0' otherwise
-EXT=${EXTJS_PATH:-'../../../ext-6.2.0'}
-
-sencha compile --classpath=app.js,app,$EXT/packages/core/src,$EXT/packages/core/overrides,$EXT/classic/classic/src,$EXT/classic/classic/overrides \
-       exclude -all \
-       and \
-       include -recursive -file app.js \
-       and \
-       exclude -namespace=Ext \
-       and \
-       concatenate -closure app.min.js
diff --git a/tools/package.sh b/tools/package.sh
index 14be2a20..858d2405 100755
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -2,9 +2,13 @@
 
 cd $(dirname $0)
 
-./minify.sh
+cd ..
 
-cd ../modern
+rm -r web/lib
+npm install --unsafe-perm
+npm run build
+
+cd modern
 
 rm -r ../web/modern
 npm install