From 858312a5cb35fa97fe4108c816b61ead9972f50a Mon Sep 17 00:00:00 2001
From: Alexander Graf <ghostwheel42@users.noreply.github.com>
Date: Tue, 6 Jul 2021 18:01:38 +0200
Subject: [PATCH 1/5] remove explicit jQuery dependency

---
 core/admin/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/admin/package.json b/core/admin/package.json
index a1107c69..931087e7 100644
--- a/core/admin/package.json
+++ b/core/admin/package.json
@@ -19,7 +19,6 @@
     "file-loader": "^3.0.1",
     "font-awesome": "^4.7.0",
     "font-awesome-loader": "^1.0.2",
-    "jQuery": "^1.7.4",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^0.6.0",

From 1bb059f4c103fb34000ca47d2eab4ffdb35c0226 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ghostwheel42@users.noreply.github.com>
Date: Tue, 6 Jul 2021 19:36:28 +0200
Subject: [PATCH 2/5] switched to newest possible versions for nodejs v8

---
 core/admin/package.json | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/core/admin/package.json b/core/admin/package.json
index 931087e7..384b4466 100644
--- a/core/admin/package.json
+++ b/core/admin/package.json
@@ -2,33 +2,28 @@
   "name": "mailu",
   "version": "1.0.0",
   "description": "Mailu admin assets",
-  "main": "assest/index.js",
+  "main": "assets/index.js",
+  "directories": {
+    "lib": "lib"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@babel/core": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
-    "admin-lte": "^2.4.10",
-    "babel-loader": "^8.0.5",
-    "bootstrap": "^3.4.1",
+    "@babel/core": "^7.14.6",
+    "admin-lte": "^2.4.18",
+    "babel-loader": "^8.0.6",
     "css-loader": "^2.1.1",
     "expose-loader": "^0.7.5",
-    "file-loader": "^3.0.1",
-    "font-awesome": "^4.7.0",
-    "font-awesome-loader": "^1.0.2",
-    "less": "^3.9.0",
+    "less": "^4.1.1",
     "less-loader": "^5.0.0",
-    "mini-css-extract-plugin": "^0.6.0",
-    "node-sass": "^4.12.0",
-    "popper.js": "^1.15.0",
-    "sass-loader": "^7.1.0",
-    "select2": "^4.0.7-rc.0",
-    "style-loader": "^0.23.1",
-    "url-loader": "^1.1.2",
-    "webpack": "^4.30.0",
-    "webpack-cli": "^3.3.2"
+    "mini-css-extract-plugin": "^1.2.1",
+    "node-sass": "^4.13.1",
+    "sass-loader": "^7.3.1",
+    "url-loader": "^2.3.0",
+    "webpack": "^4.33.0",
+    "webpack-cli": "^3.3.12"
   }
 }

From 3c8a8aa8f0f0b0f2518afa83ff7efa2e8e1af5d4 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ghostwheel42@users.noreply.github.com>
Date: Tue, 6 Jul 2021 19:47:13 +0200
Subject: [PATCH 3/5] use less v3 to make less-loader happy

---
 core/admin/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/admin/package.json b/core/admin/package.json
index 384b4466..a6eae07c 100644
--- a/core/admin/package.json
+++ b/core/admin/package.json
@@ -17,7 +17,7 @@
     "babel-loader": "^8.0.6",
     "css-loader": "^2.1.1",
     "expose-loader": "^0.7.5",
-    "less": "^4.1.1",
+    "less": "^3.13.1",
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^1.2.1",
     "node-sass": "^4.13.1",

From 6377ccb2cb7d764b54447bb806db094797b935f5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ghostwheel42@users.noreply.github.com>
Date: Wed, 7 Jul 2021 10:30:07 +0200
Subject: [PATCH 4/5] re-add jquery and select2 used in app.js

---
 core/admin/package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/admin/package.json b/core/admin/package.json
index a6eae07c..3435d881 100644
--- a/core/admin/package.json
+++ b/core/admin/package.json
@@ -17,11 +17,13 @@
     "babel-loader": "^8.0.6",
     "css-loader": "^2.1.1",
     "expose-loader": "^0.7.5",
+	"jquery": "^3.6.0",
     "less": "^3.13.1",
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^1.2.1",
     "node-sass": "^4.13.1",
     "sass-loader": "^7.3.1",
+	"select2": "^4.0.13",
     "url-loader": "^2.3.0",
     "webpack": "^4.33.0",
     "webpack-cli": "^3.3.12"

From 56cfcf8b64850cf5cc415af3f982449287d880d3 Mon Sep 17 00:00:00 2001
From: Alexander Graf <ghostwheel42@users.noreply.github.com>
Date: Wed, 7 Jul 2021 10:32:59 +0200
Subject: [PATCH 5/5] converted tabs to spaces

---
 core/admin/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/admin/package.json b/core/admin/package.json
index 3435d881..77f39986 100644
--- a/core/admin/package.json
+++ b/core/admin/package.json
@@ -17,13 +17,13 @@
     "babel-loader": "^8.0.6",
     "css-loader": "^2.1.1",
     "expose-loader": "^0.7.5",
-	"jquery": "^3.6.0",
+    "jquery": "^3.6.0",
     "less": "^3.13.1",
     "less-loader": "^5.0.0",
     "mini-css-extract-plugin": "^1.2.1",
     "node-sass": "^4.13.1",
     "sass-loader": "^7.3.1",
-	"select2": "^4.0.13",
+    "select2": "^4.0.13",
     "url-loader": "^2.3.0",
     "webpack": "^4.33.0",
     "webpack-cli": "^3.3.12"