Merge branch 'feat/angular-ionic-update' into 'develop'

Feat/angular ionic update See merge request papers/airgap/airgap-vault!496
airgap-it · May 13, 2024 · dbbcdf6 · dbbcdf6
2 parents 5a58ad6 + 358b364
commit dbbcdf6
Show file tree

Hide file tree

Showing 5 changed files with 3,813 additions and 3,003 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -89,7 +89,7 @@ build_ios:
     - echo "$IOS_BUILD_JSON" > build.json
   script:
     - export DEVELOPER_DIR=$XCODE_PATH
-    - nvm use 16.19.1
+    - nvm use 20
     - yarn install --frozen-lockfile
     - yarn prepare-prod-build
     - yarn apply-diagnostic-modules # manually remove unused cordova-diagnostic-plugin modules

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.19.1
+FROM node:20
 
 # See https://crbug.com/795759
 RUN apt-get update && apt-get install -yq libgconf-2-4 bzip2 build-essential libxtst6
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y wget --no-install-recommends \
   && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
   && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
   && apt-get update \
-  && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst  libglu1 ttf-freefont libxss1 libglib2.0-0 \
+  && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst  libglu1 ttf-freefont libxss1 libglib2.0-0 libxshmfence1 libglu1 \
   --no-install-recommends \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get purge --auto-remove -y curl \

diff --git a/angular.json b/angular.json
@@ -96,11 +96,11 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "app:build"
+            "buildTarget": "app:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "app:build:production"
+              "buildTarget": "app:build:production"
             },
             "ci": {
             }
@@ -109,7 +109,7 @@
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "app:build"
+            "buildTarget": "app:build"
           }
         },
         "test": {

diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "@airgap/tezos": "0.13.26-beta.0"
   },
   "dependencies": {
+    "@airgap-community/iso-rootstock": "1.0.0",
     "@airgap/acurast": "0.13.26-beta.0",
     "@airgap/aeternity": "0.13.26-beta.0",
     "@airgap/angular-core": "0.0.43",
@@ -79,14 +80,13 @@
     "@airgap/serializer": "0.13.26-beta.0",
     "@airgap/substrate": "0.13.26-beta.0",
     "@airgap/tezos": "0.13.26-beta.0",
-    "@airgap-community/iso-rootstock": "1.0.0",
     "@angular/cdk": "^14.2.7",
-    "@angular/common": "16.1.1",
-    "@angular/core": "16.1.1",
-    "@angular/forms": "16.1.1",
-    "@angular/platform-browser": "16.1.1",
-    "@angular/platform-browser-dynamic": "16.1.1",
-    "@angular/router": "16.1.1",
+    "@angular/common": "17.3.7",
+    "@angular/core": "17.3.7",
+    "@angular/forms": "17.3.7",
+    "@angular/platform-browser": "17.3.7",
+    "@angular/platform-browser-dynamic": "17.3.7",
+    "@angular/router": "17.3.7",
     "@capacitor/android": "^5.0.0",
     "@capacitor/app": "^5.0.0",
     "@capacitor/app-launcher": "^5.0.0",
@@ -104,17 +104,17 @@
     "@ionic-native/core": "5.36.0",
     "@ionic-native/device-motion": "5.36.0",
     "@ionic-native/diagnostic": "5.36.0",
-    "@ionic/angular": "^7.0.12",
-    "@ionic/core": "^7.0.12",
+    "@ionic/angular": "^7.8.6",
+    "@ionic/core": "^7.8.6",
     "@ionic/storage": "^4.0.0",
     "@ionic/storage-angular": "^4.0.0",
     "@keystonehq/bc-ur-registry": "0.6.3",
     "@keystonehq/bc-ur-registry-eth": "0.19.1",
     "@ngraveio/bc-ur": "1.1.6",
-    "@ngrx/component": "^16.0.1",
-    "@ngrx/component-store": "^16.0.1",
-    "@ngrx/effects": "^16.0.1",
-    "@ngrx/store": "^16.0.1",
+    "@ngrx/component": "^17.2.0",
+    "@ngrx/component-store": "^17.2.0",
+    "@ngrx/effects": "^17.2.0",
+    "@ngrx/store": "^17.2.0",
     "@ngx-translate/core": "^15.0.0",
     "@zxing/browser": "0.1.4",
     "@zxing/library": "^0.20.0",
@@ -148,17 +148,17 @@
     "tslib": "^1.10.0",
     "uuid": "^8.3.2",
     "wif": "^2.0.6",
-    "zone.js": "~0.13.1"
+    "zone.js": "~0.14.5"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "0.1601.0",
-    "@angular-devkit/build-angular": "16.1.0",
-    "@angular-devkit/core": "16.1.0",
-    "@angular-devkit/schematics": "16.1.0",
-    "@angular/cli": "16.1.0",
-    "@angular/compiler": "16.1.1",
-    "@angular/compiler-cli": "16.1.1",
-    "@angular/language-service": "16.1.1",
+    "@angular-devkit/architect": "0.1703.6",
+    "@angular-devkit/build-angular": "17.3.6",
+    "@angular-devkit/core": "17.3.6",
+    "@angular-devkit/schematics": "17.3.6",
+    "@angular/cli": "17.3.6",
+    "@angular/compiler": "17.3.7",
+    "@angular/compiler-cli": "17.3.7",
+    "@angular/language-service": "17.3.7",
     "@capacitor/cli": "^5.0.0",
     "@ionic/angular-toolkit": "^9.0.0",
     "@ionic/cli": "^7.1.1",
@@ -171,17 +171,17 @@
     "replace": "1.2.1",
     "sonarqube-scanner": "2.8.1",
     "stream-browserify": "3.0.0",
-    "typescript": "4.9.5"
+    "typescript": "5.4.5"
   },
   "buildDependencies": {
-    "@angular-devkit/architect": "0.1601.0",
-    "@angular-devkit/build-angular": "16.1.0",
-    "@angular-devkit/core": "16.1.0",
-    "@angular-devkit/schematics": "16.1.0",
-    "@angular/cli": "16.1.0",
-    "@angular/compiler": "16.1.1",
-    "@angular/compiler-cli": "16.1.1",
-    "@angular/language-service": "16.1.1",
+    "@angular-devkit/architect": "0.1703.6",
+    "@angular-devkit/build-angular": "17.3.6",
+    "@angular-devkit/core": "17.3.6",
+    "@angular-devkit/schematics": "17.3.6",
+    "@angular/cli": "17.3.6",
+    "@angular/compiler": "17.3.7",
+    "@angular/compiler-cli": "17.3.7",
+    "@angular/language-service": "17.3.7",
     "@capacitor/cli": "^5.0.0",
     "@ionic/angular-toolkit": "^9.0.0",
     "@ionic/cli": "^7.1.1",
@@ -194,7 +194,7 @@
     "replace": "1.2.1",
     "sonarqube-scanner": "2.8.1",
     "stream-browserify": "3.0.0",
-    "typescript": "4.9.5"
+    "typescript": "5.4.5"
   },
   "testDependencies": {
     "@types/core-js": "^2.5.0",