Эх сурвалжийг харах

Merge branch 'master' into feature/admin-panel

Christian Kahlau 3 жил өмнө
parent
commit
363a506ee1

+ 2 - 2
ng/package.json

@@ -11,7 +11,7 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "^15.0.1",
-    "@angular/cdk": "^14.2.0",
+    "@angular/cdk": "^15.0.3",
     "@angular/common": "^15.0.1",
     "@angular/compiler": "^15.0.1",
     "@angular/core": "^15.0.1",
@@ -19,7 +19,7 @@
     "@angular/platform-browser": "^15.0.1",
     "@angular/platform-browser-dynamic": "^15.0.1",
     "@angular/router": "^15.0.1",
-    "@fortawesome/angular-fontawesome": "^0.11.1",
+    "@fortawesome/angular-fontawesome": "^0.12.0",
     "@fortawesome/fontawesome-svg-core": "^6.1.1",
     "@fortawesome/free-brands-svg-icons": "^6.1.1",
     "@fortawesome/free-regular-svg-icons": "^6.1.1",

+ 1 - 1
server/install/install.sh

@@ -59,7 +59,7 @@ $EXC_NPM install
 
 cd "$TMPFOLDER/ng"
 echo "[INSTALL] Installing npm build dependencies for Angular project"
-$EXC_NPM install --legacy-peer-deps
+$EXC_NPM install
 
 echo "[INSTALL] Building Angular project"
 $EXC_NPM run build