Merge pull request #116 from UCI-IN4MATX-191-Token-ATM/upgrade-angula…

…r-17 Upgrade: Angular 17
UCI-IN4MATX-191-Token-ATM · Jul 10, 2024 · cb1c1d7 · cb1c1d7
2 parents 1651f75 + 813981d
commit cb1c1d7
Show file tree

Hide file tree

Showing 79 changed files with 6,201 additions and 4,784 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -11,4 +11,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
 
 # [Optional] Uncomment if you want to install more global node modules
-RUN su node -c "npm install -g typescript @angular/cli@15 @angular-devkit/schematics-cli@15"
+RUN su node -c "npm install -g typescript @angular/cli@17 @angular-devkit/schematics-cli@17"
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -27,6 +27,13 @@
                         "prefix": "app",
                         "style": "kebab-case"
                     }
+                ],
+                "@typescript-eslint/consistent-type-imports": [
+                    "error",
+                    {
+                        "fixStyle": "inline-type-imports",
+                        "prefer": "type-imports"
+                    }
                 ]
             }
         },
@@ -76,7 +83,14 @@
         {
             "files": ["*.json"],
             "extends": ["plugin:json/recommended", "plugin:prettier/recommended"],
-            "rules": { "json/*": ["error", { "allowComments": true }] }
+            "rules": {
+                "json/*": [
+                    "error",
+                    {
+                        "allowComments": true
+                    }
+                ]
+            }
         }
     ]
 }
diff --git a/angular.json b/angular.json
@@ -64,18 +64,18 @@
                     "builder": "@angular-devkit/build-angular:dev-server",
                     "configurations": {
                         "production": {
-                            "browserTarget": "token-atm-spa:build:production"
+                            "buildTarget": "token-atm-spa:build:production"
                         },
                         "development": {
-                            "browserTarget": "token-atm-spa:build:development"
+                            "buildTarget": "token-atm-spa:build:development"
                         }
                     },
                     "defaultConfiguration": "development"
                 },
                 "extract-i18n": {
                     "builder": "@angular-devkit/build-angular:extract-i18n",
                     "options": {
-                        "browserTarget": "token-atm-spa:build"
+                        "buildTarget": "token-atm-spa:build"
                     }
                 },
                 "test": {

diff --git a/custom-schematics/package-lock.json b/custom-schematics/package-lock.json
diff --git a/custom-schematics/package.json b/custom-schematics/package.json
@@ -13,13 +13,13 @@
     "license": "MIT",
     "schematics": "./src/collection.json",
     "dependencies": {
-        "@angular-devkit/core": "^15.2.11",
-        "@angular-devkit/schematics": "^15.2.11",
-        "typescript": "~4.9.3"
+        "@angular-devkit/core": "^17.3.8",
+        "@angular-devkit/schematics": "^17.3.8",
+        "typescript": "~5.4.5"
     },
     "devDependencies": {
-        "@types/node": "^14.15.0",
         "@types/jasmine": "~4.3.0",
-        "jasmine": "^4.0.0"
+        "@types/node": "^14.15.0",
+        "jasmine": "^4.5.0"
     }
 }
diff --git a/custom-schematics/src/token-option/index.ts b/custom-schematics/src/token-option/index.ts
@@ -1,5 +1,15 @@
 import { normalize } from '@angular-devkit/core';
-import { apply, chain, MergeStrategy, mergeWith, move, Rule, url, strings, template } from '@angular-devkit/schematics';
+import {
+    apply,
+    chain,
+    MergeStrategy,
+    mergeWith,
+    move,
+    type Rule,
+    url,
+    strings,
+    template
+} from '@angular-devkit/schematics';
 
 interface GenerateTokenOptionOptions {
     name: string;