Merge pull request ceph#59334 from ivoalmeida/angular-upgrade

mgr/dashboard: upgrade angular

Reviewed-by: Nizamudeen A <[email protected]>

Author: ivoalmeida

package-lock.json

@@ -204,58 +204,58 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "ceph-dashboard:build",
-            "proxyConfig": "proxy.conf.json"
+            "proxyConfig": "proxy.conf.json",
+            "buildTarget": "ceph-dashboard:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "ceph-dashboard:build:production"
+              "buildTarget": "ceph-dashboard:build:production"
             },
             "cs": {
-              "browserTarget": "ceph-dashboard:build:cs"
+              "buildTarget": "ceph-dashboard:build:cs"
             },
             "de": {
-              "browserTarget": "ceph-dashboard:build:de"
+              "buildTarget": "ceph-dashboard:build:de"
             },
             "en-US": {
-              "browserTarget": "ceph-dashboard:build:en-US"
+              "buildTarget": "ceph-dashboard:build:en-US"
             },
             "es": {
-              "browserTarget": "ceph-dashboard:build:es"
+              "buildTarget": "ceph-dashboard:build:es"
             },
             "fr": {
-              "browserTarget": "ceph-dashboard:build:fr"
+              "buildTarget": "ceph-dashboard:build:fr"
             },
             "id": {
-              "browserTarget": "ceph-dashboard:build:id"
+              "buildTarget": "ceph-dashboard:build:id"
             },
             "it": {
-              "browserTarget": "ceph-dashboard:build:it"
+              "buildTarget": "ceph-dashboard:build:it"
             },
             "ja": {
-              "browserTarget": "ceph-dashboard:build:ja"
+              "buildTarget": "ceph-dashboard:build:ja"
             },
             "ko": {
-              "browserTarget": "ceph-dashboard:build:ko"
+              "buildTarget": "ceph-dashboard:build:ko"
             },
             "pl": {
-              "browserTarget": "ceph-dashboard:build:pl"
+              "buildTarget": "ceph-dashboard:build:pl"
             },
             "pt": {
-              "browserTarget": "ceph-dashboard:build:pt"
+              "buildTarget": "ceph-dashboard:build:pt"
             },
             "zh-Hans": {
-              "browserTarget": "ceph-dashboard:build:zh-Hans"
+              "buildTarget": "ceph-dashboard:build:zh-Hans"
             },
             "zh-Hant": {
-              "browserTarget": "ceph-dashboard:build:zh-Hant"
+              "buildTarget": "ceph-dashboard:build:zh-Hant"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "ceph-dashboard:build"
+            "buildTarget": "ceph-dashboard:build"
           }
         },
         "lint": {

src/pybind/mgr/dashboard/frontend/angular.json

@@ -6,6 +6,10 @@
     "plugins/index.js"
   ],
   "compilerOptions": {
+    "typeRoots": [
+      "../node_modules",
+      "../node_modules/@types"
+    ],
     "sourceMap": false,
     "types": [
       "cypress",
@@ -14,4 +18,4 @@
     ],
     "target": "es6"
   }
-}
+}

src/pybind/mgr/dashboard/frontend/cypress/tsconfig.json

@@ -9,32 +9,38 @@ const esModules = [
   '@ng-bootstrap'
 ];
 const jestConfig = {
-  globals: {
-    'ts-jest': {
-      useESM: true,
-      stringifyContentPathRegex: '\\.(html|svg)$',
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      isolatedModules: true
-    }
-  },
-  globalSetup: 'jest-preset-angular/global-setup',
   moduleNameMapper: {
     '\\.scss$': 'identity-obj-proxy',
     '~/(.*)$': '<rootDir>/src/$1',
-    '^@carbon/icons/es/(.*)$': '@carbon/icons/lib/$1.js',
+    '^@carbon/icons/es/(.*)$': '@carbon/icons/lib/$1.js'
   },
   moduleFileExtensions: ['ts', 'html', 'js', 'json', 'mjs', 'cjs'],
   preset: 'jest-preset-angular',
   setupFilesAfterEnv: ['<rootDir>/src/setupJest.ts'],
   transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$|'.concat(esModules.join('|'), ')')],
   transform: {
-    '^.+\\.(ts|html|mjs)$': 'jest-preset-angular',
+    '^.+\\.(ts|html|mjs)$': [
+      'jest-preset-angular',
+      {
+        useESM: true,
+        stringifyContentPathRegex: '\\.(html|svg)$',
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        isolatedModules: true
+      }
+    ],
     '^.+\\.(js)$': 'babel-jest'
   },
   setupFiles: ['jest-canvas-mock'],
   coverageReporters: ['cobertura', 'html'],
-  modulePathIgnorePatterns: ['<rootDir>/coverage/', '<rootDir>/node_modules/simplebar-angular', '<rootDir>/cypress'],
+  modulePathIgnorePatterns: [
+    '<rootDir>/coverage/',
+    '<rootDir>/node_modules/simplebar-angular',
+    '<rootDir>/cypress'
+  ],
   testMatch: ['**/*.spec.ts'],
-  testRunner: 'jest-jasmine2'
+  testRunner: 'jest-jasmine2',
+  testEnvironmentOptions: {
+    detectOpenHandles: true
+  }
 };
 module.exports = jestConfig;