Merge branch 'master' into feature/744-toasts-and-error-handling

liimaorg · Jul 8, 2024 · 0bb774d · 0bb774d
2 parents f6c27db + 7d4c34e
commit 0bb774d
Show file tree

Hide file tree

Showing 10 changed files with 278 additions and 329 deletions.
diff --git a/AMW_angular/io/angular.json b/AMW_angular/io/angular.json
@@ -22,7 +22,8 @@
             },
             "index": "src/index.html",
             "polyfills": [
-              "src/polyfills.ts"
+              "zone.js",
+              "@angular/localize/init"
             ],
             "tsConfig": "tsconfig.app.json",
             "assets": [
@@ -98,7 +99,11 @@
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "zone.js",
+              "zone.js/testing",
+              "@angular/localize/init"
+            ],
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": ["src/favicon.ico", "src/assets"],