From 5afbf37292cfe9dfbd3b06dbde9913c61d0f6a6e Mon Sep 17 00:00:00 2001
From: Diman0 <diman@huisman.xyz>
Date: Fri, 13 Aug 2021 15:12:33 +0200
Subject: [PATCH] Resolve build issues

---
 core/admin/Dockerfile        |  2 +-
 core/admin/package.json      | 26 +++++++++++++-------------
 core/admin/webpack.config.js |  7 +++----
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/admin/Dockerfile b/core/admin/Dockerfile
index 86796978..fa75e8dc 100644
--- a/core/admin/Dockerfile
+++ b/core/admin/Dockerfile
@@ -2,7 +2,7 @@
 ARG DISTRO=alpine:3.14
 ARG ARCH=""
 
-FROM ${ARCH}node:8 as assets
+FROM ${ARCH}node:16 as assets
 COPY --from=balenalib/rpi-alpine:3.14 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
 
 COPY package.json ./
diff --git a/core/admin/package.json b/core/admin/package.json
index b11672c7..a7448265 100644
--- a/core/admin/package.json
+++ b/core/admin/package.json
@@ -12,21 +12,21 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@babel/core": "^7.14.6",
-    "@babel/preset-env": "^7.14.7",
+    "@babel/core": "^7.15.0",
+    "@babel/preset-env": "^7.15.0",
     "admin-lte": "^3.1.0",
-    "babel-loader": "^8.0.6",
-    "css-loader": "^2.1.1",
-    "expose-loader": "^0.7.5",
+    "babel-loader": "^8.2.2",
+    "css-loader": "^6.2.0",
+    "expose-loader": "^3.0.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",
+    "less": "^4.1.1",
+    "less-loader": "^10.0.1",
+    "mini-css-extract-plugin": "^2.2.0",
+    "node-sass": "^6.0.1",
+    "sass-loader": "^12.1.0",
     "select2": "^4.0.13",
-    "url-loader": "^2.3.0",
-    "webpack": "^4.33.0",
-    "webpack-cli": "^3.3.12"
+    "url-loader": "^4.1.1",
+    "webpack": "^5.50.0",
+    "webpack-cli": "^4.7.2"
   }
 }
diff --git a/core/admin/webpack.config.js b/core/admin/webpack.config.js
index 73630439..e9d268ea 100644
--- a/core/admin/webpack.config.js
+++ b/core/admin/webpack.config.js
@@ -39,10 +39,9 @@ module.exports = {
                 test: require.resolve('jquery'),
                 use: [{
                     loader: 'expose-loader',
-                    options: 'jQuery'
-                }, {
-                    loader: 'expose-loader',
-                    options: '$'
+                    options: {
+                      exposes: ['$','jQuery'] 
+                    },               
                 }]
             }
         ]