docs(examples): upgrade Angular to v15

1. Upgraded from Angular v14 to v15 for both GUI packages that use it. 2. Upgraded the Typescript compiler project-wide to 4.8.4 3. Due to 2) There was a change needed in the file examples/cactus-example-discounted-asset-trade/transaction-fabric.ts which introduces a constraint on the T type parameter. 4. Disabled the staged files linting because right now ESLint is broken due to our Typescript version being >=4.8.0 (and upgrading it was not an option because then it is broken due to ESM issues...) 5. Cleaned out a lot of the unused dev dependencies of the front-end packages where angular was upgraded. These dependencies were related to end-to-end browser testing which we haven't set up yet to be executed because all the front-end packages are just example code that - while important to test - does not have the highest priority in this sense. Fixes hyperledger#2229 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
petermetz · Jul 6, 2023 · 078c229 · 078c229
1 parent 6d012c7
commit 078c229
Show file tree

Hide file tree

Showing 13 changed files with 851 additions and 2,126 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -39,7 +39,6 @@ jobs:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-  # lint clean codegen
   yarn_lint:
     continue-on-error: false
     env:

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-./node_modules/.bin/lint-staged
+# TODO: re-enable this once we were able to upgrade to the newer ESLint
+# ./node_modules/.bin/lint-staged
diff --git a/examples/cactus-example-carbon-accounting-frontend/.browserslistrc b/examples/cactus-example-carbon-accounting-frontend/.browserslistrc
diff --git a/examples/cactus-example-carbon-accounting-frontend/package.json b/examples/cactus-example-carbon-accounting-frontend/package.json
@@ -48,12 +48,12 @@
     "start": "ng serve"
   },
   "dependencies": {
-    "@angular/common": "14.3.0",
-    "@angular/core": "14.3.0",
-    "@angular/forms": "14.3.0",
-    "@angular/platform-browser": "14.3.0",
-    "@angular/platform-browser-dynamic": "14.3.0",
-    "@angular/router": "14.3.0",
+    "@angular/common": "15.2.9",
+    "@angular/core": "15.2.9",
+    "@angular/forms": "15.2.9",
+    "@angular/platform-browser": "15.2.9",
+    "@angular/platform-browser-dynamic": "15.2.9",
+    "@angular/router": "15.2.9",    
     "@hyperledger/cactus-api-client": "2.0.0-alpha.1",
     "@hyperledger/cactus-common": "2.0.0-alpha.1",
     "@hyperledger/cactus-core-api": "2.0.0-alpha.1",
@@ -70,29 +70,16 @@
     "zone.js": "0.11.4"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "14.1.0",
-    "@angular-devkit/build-angular": "14.2.12",
-    "@angular/cli": "14.2.12",
-    "@angular/compiler": "14.3.0",
-    "@angular/compiler-cli": "14.3.0",
-    "@angular/language-service": "14.3.0",
+    "@angular-builders/custom-webpack": "15.0.0",
+    "@angular-devkit/build-angular": "15.2.9",
+    "@angular/cli": "15.2.9",
+    "@angular/compiler": "15.2.9",
+    "@angular/compiler-cli": "15.2.9",
+    "@angular/language-service": "15.2.9",
     "@ionic/angular-toolkit": "9.0.0",
-    "@types/node": "16.4.13",
-    "codelyzer": "6.0.2",
     "https-browserify": "1.0.0",
-    "jasmine-core": "3.8.0",
-    "jasmine-spec-reporter": "7.0.0",
-    "karma": "6.3.16",
-    "karma-chrome-launcher": "3.1.0",
-    "karma-coverage-istanbul-reporter": "3.0.3",
-    "karma-jasmine": "4.0.1",
-    "karma-jasmine-html-reporter": "1.7.0",
     "os-browserify": "0.3.0",
-    "path-browserify": "1.0.1",
-    "protractor": "7.0.0",
-    "ts-node": "10.2.0",
-    "tslint": "6.1.3",
-    "typescript": "4.6.3"
+    "path-browserify": "1.0.1"
   },
   "engines": {
     "node": ">=10",

diff --git a/examples/cactus-example-carbon-accounting-frontend/src/app/app-routing.module.ts b/examples/cactus-example-carbon-accounting-frontend/src/app/app-routing.module.ts
@@ -13,7 +13,6 @@ const routes: Routes = [
   imports: [
     RouterModule.forRoot(routes, {
       preloadingStrategy: PreloadAllModules,
-      relativeLinkResolution: "legacy",
     }),
   ],
   exports: [RouterModule],

diff --git a/examples/cactus-example-carbon-accounting-frontend/tsconfig.json b/examples/cactus-example-carbon-accounting-frontend/tsconfig.json
@@ -12,15 +12,16 @@
     "moduleResolution": "node",
     "esModuleInterop": true,
     "importHelpers": true,
-    "target": "ES2020",
+    "target": "ES2022",
     "lib": [
       "es2018",
       "dom"
     ],
     "resolveJsonModule": true,
     "rootDir": "./src",
     "skipLibCheck": true,
-    "tsBuildInfoFile": "../../.build-cache/cactus-example-carbon-accounting-frontend.tsbuildinfo"
+    "tsBuildInfoFile": "../../.build-cache/cactus-example-carbon-accounting-frontend.tsbuildinfo",
+    "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,

diff --git a/examples/cactus-example-discounted-asset-trade/transaction-fabric.ts b/examples/cactus-example-discounted-asset-trade/transaction-fabric.ts
@@ -16,6 +16,7 @@
  */
 
 import { ConfigUtil } from "@hyperledger/cactus-cmd-socketio-server";
+import { ISocketApiClient } from "@hyperledger/cactus-core-api";
 import { Verifier } from "@hyperledger/cactus-verifier-client";
 import { signProposal } from "./sign-utils";
 
@@ -27,7 +28,7 @@ const moduleName = "TransactionFabric";
 const logger = getLogger(`${moduleName}`);
 logger.level = config.logLevel;
 
-export function makeSignedProposal<T>(
+export function makeSignedProposal<T extends ISocketApiClient<unknown>>(
   ccFncName: string,
   ccArgs: string[],
   verifierFabric: Verifier<T>,

diff --git a/examples/cactus-example-supply-chain-frontend/.browserslistrc b/examples/cactus-example-supply-chain-frontend/.browserslistrc
diff --git a/examples/cactus-example-supply-chain-frontend/package.json b/examples/cactus-example-supply-chain-frontend/package.json
@@ -48,12 +48,12 @@
     "start": "ng serve"
   },
   "dependencies": {
-    "@angular/common": "14.3.0",
-    "@angular/core": "14.3.0",
-    "@angular/forms": "14.3.0",
-    "@angular/platform-browser": "14.3.0",
-    "@angular/platform-browser-dynamic": "14.3.0",
-    "@angular/router": "14.3.0",
+    "@angular/common": "15.2.9",
+    "@angular/core": "15.2.9",
+    "@angular/forms": "15.2.9",
+    "@angular/platform-browser": "15.2.9",
+    "@angular/platform-browser-dynamic": "15.2.9",
+    "@angular/router": "15.2.9",
     "@hyperledger/cactus-api-client": "2.0.0-alpha.1",
     "@hyperledger/cactus-common": "2.0.0-alpha.1",
     "@hyperledger/cactus-core-api": "2.0.0-alpha.1",
@@ -71,27 +71,13 @@
     "zone.js": "0.11.5"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "14.1.0",
-    "@angular-devkit/build-angular": "14.2.12",
-    "@angular/cli": "14.2.12",
-    "@angular/compiler": "14.3.0",
-    "@angular/compiler-cli": "14.3.0",
-    "@angular/language-service": "14.3.0",
-    "@ionic/angular-toolkit": "9.0.0",
-    "@types/node": "17.0.32",
-    "codelyzer": "6.0.2",
-    "constants-browserify": "1.0.0",
-    "jasmine-core": "3.8.0",
-    "jasmine-spec-reporter": "7.0.0",
-    "karma": "6.3.19",
-    "karma-chrome-launcher": "3.1.1",
-    "karma-coverage-istanbul-reporter": "3.0.3",
-    "karma-jasmine": "5.0.0",
-    "karma-jasmine-html-reporter": "1.7.0",
-    "protractor": "7.0.0",
-    "ts-node": "10.7.0",
-    "tslint": "6.1.3",
-    "typescript": "4.6.4"
+    "@angular-builders/custom-webpack": "15.0.0",
+    "@angular-devkit/build-angular": "15.2.9",
+    "@angular/cli": "15.2.9",
+    "@angular/compiler": "15.2.9",
+    "@angular/compiler-cli": "15.2.9",
+    "@angular/language-service": "15.2.9",
+    "@ionic/angular-toolkit": "9.0.0"
   },
   "engines": {
     "node": ">=10",

diff --git a/examples/cactus-example-supply-chain-frontend/src/app/app-routing.module.ts b/examples/cactus-example-supply-chain-frontend/src/app/app-routing.module.ts
@@ -30,7 +30,6 @@ const routes: Routes = [
   imports: [
     RouterModule.forRoot(routes, {
       preloadingStrategy: PreloadAllModules,
-      relativeLinkResolution: "legacy",
     }),
   ],
   exports: [RouterModule],

diff --git a/examples/cactus-example-supply-chain-frontend/tsconfig.json b/examples/cactus-example-supply-chain-frontend/tsconfig.json
@@ -12,15 +12,16 @@
     "moduleResolution": "node",
     "esModuleInterop": true,
     "importHelpers": true,
-    "target": "es2020",
+    "target": "ES2022",
     "lib": [
       "es2018",
       "dom"
     ],
     "resolveJsonModule": true,
     "rootDir": "./src",
     "skipLibCheck": true,
-    "tsBuildInfoFile": "../../.build-cache/cactus-example-supply-chain-frontend.tsbuildinfo"
+    "tsBuildInfoFile": "../../.build-cache/cactus-example-supply-chain-frontend.tsbuildinfo",
+    "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,

diff --git a/package.json b/package.json
@@ -156,7 +156,7 @@
     "ts-jest": "28.0.2",
     "ts-loader": "9.2.5",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4",
+    "typescript": "4.8.4",
     "webpack": "5.76.0",
     "webpack-bundle-analyzer": "4.4.2",
     "webpack-cli": "4.7.2",