Upgrade Angular to v17 (#641)

upgrade angular to v17
mitre-attack · Jul 22, 2024 · c0fc60e · c0fc60e
1 parent 570f471
commit c0fc60e
Show file tree

Hide file tree

Showing 48 changed files with 17,581 additions and 26,749 deletions.
diff --git a/.github/workflows/test.yml → .github/workflows/run-jasmine-tests.yml b/.github/workflows/test.yml → .github/workflows/run-jasmine-tests.yml
@@ -15,19 +15,23 @@ jobs:
          working-directory: ./nav-app/
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
     steps:
     - uses: actions/checkout@v4
+
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
         cache-dependency-path: nav-app/package-lock.json
+
     - name: Install
       run: npm ci
+
     - name: Run Jasmine tests
       run: npm run test -- --code-coverage --no-watch --browsers ChromeHeadlessCI
+
     - name: Archive code coverage results
       uses: actions/upload-artifact@v4
       if: always()

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,11 @@
     The creation of the tag can be disabled with the --no-git-tag-version if desired.
 -->
 
+# Changes Staged on Develop
+
+## Improvements
+- Updated Angular from v14 to v17.
+
 # 5.0.1 - 9 May 2024
 
 ## Fixes

diff --git a/README.md b/README.md
@@ -26,8 +26,8 @@ Use our [GitHub Issue Tracker](https://github.com/mitre-attack/attack-navigator/
 
 ## Requirements
 
-* [Node.js v16](https://nodejs.org)
-* [AngularCLI](https://cli.angular.io)
+* [Node.js v18](https://nodejs.org)
+* [AngularCLI v17](https://cli.angular.io)
 
 ## Supported Browsers
 

diff --git a/nav-app/angular.json b/nav-app/angular.json
@@ -14,17 +14,17 @@
                         "outputPath": "dist",
                         "index": "src/index.html",
                         "main": "src/main.ts",
-                        "tsConfig": "src/tsconfig.app.json",
-                        "polyfills": "src/polyfills.ts",
+                        "tsConfig": "tsconfig.app.json",
+                        "polyfills": ["src/polyfills.ts", "zone.js"],
                         "preserveSymlinks": true,
-                        "allowedCommonJsDependencies": ["lodash"],
+                        "allowedCommonJsDependencies": ["lodash", "is_js", "seedrandom", "typed_function", "tinygradient", "exceljs"],
                         "assets": [
                             { "glob": "*.md", "input": "../", "output": "/" },
                             { "glob": "*.md", "input": "../layers", "output": "/layers" },
                             "src/assets",
                             "src/favicon.ico"
                         ],
-                        "styles": ["src/styles.scss", "node_modules/ngx-smart-popover/scss/popover-content.component.scss"],
+                        "styles": ["src/styles.scss"],
                         "scripts": [
                             "node_modules/file-saver/dist/FileSaver.js",
                             "node_modules/mathjs/lib/browser/math.js",
@@ -75,28 +75,27 @@
                 "serve": {
                     "builder": "@angular-devkit/build-angular:dev-server",
                     "options": {
-                        "browserTarget": "nav-app:build"
+                      "buildTarget": "nav-app:build"
                     },
                     "configurations": {
                         "production": {
-                            "browserTarget": "nav-app:build:production"
+                          "buildTarget": "nav-app:build:production"
                         }
                     }
                 },
                 "extract-i18n": {
                     "builder": "@angular-devkit/build-angular:extract-i18n",
                     "options": {
-                        "browserTarget": "nav-app:build"
+                      "buildTarget": "nav-app:build"
                     }
                 },
                 "test": {
                     "builder": "@angular-devkit/build-angular:karma",
                     "options": {
-                        "main": "src/test.ts",
                         "karmaConfig": "./karma.conf.js",
                         "codeCoverageExclude": ["src/polyfills.ts", "src/app/utils/taxii2lib.ts"],
-                        "polyfills": "src/polyfills.ts",
-                        "tsConfig": "src/tsconfig.spec.json",
+                        "polyfills": ["src/polyfills.ts", "zone.js/testing", "zone.js"],
+                        "tsConfig": "tsconfig.spec.json",
                         "scripts": [
                             "node_modules/file-saver/dist/FileSaver.js",
                             "node_modules/mathjs/lib/browser/math.js",
@@ -112,7 +111,7 @@
                 "lint": {
                     "builder": "@angular-devkit/build-angular:tslint",
                     "options": {
-                        "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
+                        "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json"],
                         "exclude": ["**/node_modules/**"]
                     }
                 }

diff --git a/nav-app/karma.conf.js b/nav-app/karma.conf.js
@@ -27,7 +27,7 @@ module.exports = function (config) {
         colors: true,
         logLevel: config.LOG_INFO,
         autoWatch: true,
-        browsers: ['Chrome', 'ChromeHeadlessCI'],
+        browsers: ['Chrome', 'ChromeHeadless', 'ChromeHeadlessCI'],
         customLaunchers: {
             ChromeHeadlessCI: {
                 base: 'ChromeHeadless',