Merge branch 'master' into fix/issues-10306-a19-mock-render-issue

help-me-mom · Nov 29, 2024 · 91de634 · 91de634
2 parents 40ee673 + cad1d0e
commit 91de634
Show file tree

Hide file tree

Showing 16 changed files with 486 additions and 236 deletions.
diff --git a/e2e/a17/package-lock.json b/e2e/a17/package-lock.json
diff --git a/e2e/a17/package.json b/e2e/a17/package.json
@@ -32,7 +32,7 @@
     "@angular-devkit/build-angular": "17.3.11",
     "@angular/cli": "17.3.11",
     "@angular/compiler-cli": "17.3.12",
-    "@types/jasmine": "5.1.4",
+    "@types/jasmine": "5.1.5",
     "@types/jest": "29.5.14",
     "jasmine-core": "5.1.2",
     "jest": "29.7.0",

diff --git a/e2e/a18/package-lock.json b/e2e/a18/package-lock.json
diff --git a/e2e/a18/package.json b/e2e/a18/package.json
@@ -32,11 +32,11 @@
     "@angular-devkit/build-angular": "18.2.12",
     "@angular/cli": "18.2.12",
     "@angular/compiler-cli": "18.2.13",
-    "@types/jasmine": "5.1.4",
+    "@types/jasmine": "5.1.5",
     "@types/jest": "29.5.14",
     "jasmine-core": "5.1.2",
     "jest": "29.7.0",
-    "jest-preset-angular": "14.4.0",
+    "jest-preset-angular": "14.4.1",
     "karma": "6.4.4",
     "karma-chrome-launcher": "3.2.0",
     "karma-coverage": "2.2.1",

diff --git a/e2e/jasmine/package-lock.json b/e2e/jasmine/package-lock.json
diff --git a/e2e/jasmine/package.json b/e2e/jasmine/package.json
@@ -29,7 +29,7 @@
     "@angular-devkit/build-angular": "18.2.12",
     "@angular/cli": "18.2.12",
     "@angular/compiler-cli": "18.2.13",
-    "@types/jasmine": "5.1.4",
+    "@types/jasmine": "5.1.5",
     "@types/node": "22.10.1",
     "jasmine-core": "5.4.0",
     "karma": "6.4.4",

diff --git a/e2e/jest/package-lock.json b/e2e/jest/package-lock.json
diff --git a/e2e/jest/package.json b/e2e/jest/package.json
@@ -32,7 +32,7 @@
     "@types/jest": "29.5.14",
     "@types/node": "22.10.1",
     "jest": "29.7.0",
-    "jest-preset-angular": "14.4.0",
+    "jest-preset-angular": "14.4.1",
     "ng-packagr": "18.2.1",
     "npm": "10.9.1",
     "ts-node": "10.9.2",

diff --git a/e2e/min/package-lock.json b/e2e/min/package-lock.json
diff --git a/e2e/min/package.json b/e2e/min/package.json
@@ -31,13 +31,13 @@
     "@angular-devkit/build-angular": "18.2.12",
     "@angular/cli": "18.2.12",
     "@angular/compiler-cli": "18.2.13",
-    "@types/jasmine": "5.1.4",
+    "@types/jasmine": "5.1.5",
     "@types/jest": "29.5.14",
     "@types/node": "22.10.1",
     "jasmine-core": "5.4.0",
     "jasmine-spec-reporter": "7.0.0",
     "jest": "29.7.0",
-    "jest-preset-angular": "14.4.0",
+    "jest-preset-angular": "14.4.1",
     "karma": "6.4.4",
     "karma-chrome-launcher": "3.2.0",
     "karma-jasmine": "5.1.0",