chore(): sync feature-6.1 with main

angular/test/test-app/e2e/src/modal.spec.ts

@@ -10,6 +10,7 @@ describe('Modals', () => {
 
     cy.get('app-modal-example h2').should('have.text', '123');
     cy.get('app-modal-example h3').should('have.text', '321');
+    cy.get('#modalInstance').should('have.text', 'true');
 
     cy.get('#onWillDismiss').should('have.text', 'false');
     cy.get('#onDidDismiss').should('have.text', 'false');

angular/test/test-app/e2e/src/nested-outlet.spec.ts

@@ -20,6 +20,12 @@ describe('Nested Outlet', () => {
     cy.ionPageVisible('app-nested-outlet-page2');
 
     cy.get('ion-router-outlet ion-router-outlet app-nested-outlet-page2 h1').should('have.text', 'Nested page 2');
+
+    cy.get('#goto-nested-page1').click();
+    cy.ionPageVisible('app-nested-outlet-page');
+
+    cy.get('#goto-nested-page2').click();
   });
+
 });
 

angular/test/test-app/package-lock.json

@@ -18,8 +18,8 @@
         "@angular/platform-browser-dynamic": "^13.1.3",
         "@angular/platform-server": "^13.1.3",
         "@angular/router": "^13.1.3",
-        "@ionic/angular": "^5.3.1",
-        "@ionic/angular-server": "^5.3.1",
+        "@ionic/angular": "^6.0.12",
+        "@ionic/angular-server": "^6.0.12",
         "@nguniversal/express-engine": "^12.1.1",
         "angular-in-memory-web-api": "^0.11.0",
         "core-js": "^2.6.11",
@@ -3242,53 +3242,44 @@
       "dev": true
     },
     "node_modules/@ionic/angular": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.8.2.tgz",
-      "integrity": "sha512-m2dE8QcWyCkv4yB+6+9j9Qu6hI28+chWT7A6nmbD7A360bm26LjdvKiJaCEQUxIXH7CpFuYcURZvRrn9gMscNg==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.0.12.tgz",
+      "integrity": "sha512-gWY92k6tPefj2OG1ogOALfqEQah78l1OGUwjs3rOg3pliWH4aV0dq3CzgmJJwIBSnvAdW+iSSOfEoMbEVV0b7A==",
       "dependencies": {
-        "@ionic/core": "5.8.2",
-        "tslib": "^1.9.3"
+        "@ionic/core": "^6.0.12",
+        "jsonc-parser": "^3.0.0",
+        "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=8.2.7",
-        "@angular/forms": ">=8.2.7",
-        "@angular/router": ">=8.2.7",
-        "rxjs": ">=6.2.0",
-        "zone.js": ">=0.8.26"
+        "@angular/core": ">=12.0.0",
+        "@angular/forms": ">=12.0.0",
+        "@angular/router": ">=12.0.0",
+        "rxjs": ">=6.6.0",
+        "zone.js": ">=0.11.0"
       }
     },
     "node_modules/@ionic/angular-server": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-server/-/angular-server-5.8.2.tgz",
-      "integrity": "sha512-N141OZOmJZ0N6ASQelBSZnEzxHG8zoaVjwIgT41Q7mlEDC19jD0TtzyTzk8Ac4X/dFulKF2u6H32JG75oSEdhg==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-server/-/angular-server-6.0.12.tgz",
+      "integrity": "sha512-A5vqoePVfo0bxyTKHEtagJpu8OEFMOzv/zWG4FastDsWu1K3Vx/EBnwdoq9WPQ0upbMOAWf1R4SUuNny5ZSdJA==",
       "dependencies": {
-        "tslib": "^1.9.0"
+        "tslib": "^2.2.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=8.2.7",
-        "@angular/platform-server": ">=8.2.7",
-        "@ionic/angular": "*",
-        "rxjs": ">=6.2.0",
-        "zone.js": ">=0.8.26"
+        "@angular/core": ">=12.0.0",
+        "@angular/platform-server": ">=12.0.0",
+        "@ionic/angular": "^6.0.2",
+        "rxjs": ">=6.6.0",
+        "zone.js": ">=0.11.0"
       }
     },
-    "node_modules/@ionic/angular-server/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@ionic/angular/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/@ionic/core": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.2.tgz",
-      "integrity": "sha512-BWIh6hyhq+tzVvebPMfRa+IhTV5/yXh4wO3a0U3Qo4PL4KDzWyBJfoiPi6bOEc+BAlFnCtOooTTXTumgXXOojg==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.0.12.tgz",
+      "integrity": "sha512-WpcVzSXBuvdHUZuNg1NTdnF4Ur7AGNCpgc4t4lyjPcEr0j//E855gd6GtUD7imNFERdtrvVC86JTpj5t0L+OMg==",
       "dependencies": {
-        "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.3",
+        "@stencil/core": "^2.14.1",
+        "ionicons": "^6.0.0",
         "tslib": "^2.1.0"
       }
     },
@@ -4320,9 +4311,9 @@
       "dev": true
     },
     "node_modules/@stencil/core": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz",
-      "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw==",
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.14.2.tgz",
+      "integrity": "sha512-NMC5Xi8sPFJxaO4rz6CbMHuD6PteE/RJWtjrbkusmpjKRtMXkfZJPIgOrleZ4xO+vXcNyL535Ru7vUADqEsTiQ==",
       "bin": {
         "stencil": "bin/stencil"
       },
@@ -11231,11 +11222,23 @@
       }
     },
     "node_modules/ionicons": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz",
-      "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.1.tgz",
+      "integrity": "sha512-xQekOJsxH82O7oB+3F60zeRggCdND9pJ/k0E6IJDVUGGlCj5mlyFqNgxUimytKgstPGv3S+3EmCxjefvtGgWUg==",
       "dependencies": {
-        "@stencil/core": "^2.5.0"
+        "@stencil/core": "~2.12.0"
+      }
+    },
+    "node_modules/ionicons/node_modules/@stencil/core": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.12.1.tgz",
+      "integrity": "sha512-u24TZ+FEvjnZt5ZgIkLjLpUNsO6Ml3mUZqwmqk81w6RWWz75hgB5p4RFI5rvuErFeh2xvMIGo+pNdG24XUBz1A==",
+      "bin": {
+        "stencil": "bin/stencil"
+      },
+      "engines": {
+        "node": ">=12.10.0",
+        "npm": ">=6.0.0"
       }
     },
     "node_modules/ip": {
@@ -11882,8 +11885,7 @@
     "node_modules/jsonc-parser": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-      "dev": true
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
     },
     "node_modules/jsonfile": {
       "version": "3.0.1",
@@ -20944,43 +20946,30 @@
       "dev": true
     },
     "@ionic/angular": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-5.8.2.tgz",
-      "integrity": "sha512-m2dE8QcWyCkv4yB+6+9j9Qu6hI28+chWT7A6nmbD7A360bm26LjdvKiJaCEQUxIXH7CpFuYcURZvRrn9gMscNg==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-6.0.12.tgz",
+      "integrity": "sha512-gWY92k6tPefj2OG1ogOALfqEQah78l1OGUwjs3rOg3pliWH4aV0dq3CzgmJJwIBSnvAdW+iSSOfEoMbEVV0b7A==",
       "requires": {
-        "@ionic/core": "5.8.2",
-        "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
+        "@ionic/core": "^6.0.12",
+        "jsonc-parser": "^3.0.0",
+        "tslib": "^2.0.0"
       }
     },
     "@ionic/angular-server": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/@ionic/angular-server/-/angular-server-5.8.2.tgz",
-      "integrity": "sha512-N141OZOmJZ0N6ASQelBSZnEzxHG8zoaVjwIgT41Q7mlEDC19jD0TtzyTzk8Ac4X/dFulKF2u6H32JG75oSEdhg==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@ionic/angular-server/-/angular-server-6.0.12.tgz",
+      "integrity": "sha512-A5vqoePVfo0bxyTKHEtagJpu8OEFMOzv/zWG4FastDsWu1K3Vx/EBnwdoq9WPQ0upbMOAWf1R4SUuNny5ZSdJA==",
       "requires": {
-        "tslib": "^1.9.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
+        "tslib": "^2.2.0"
       }
     },
     "@ionic/core": {
-      "version": "5.8.2",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.2.tgz",
-      "integrity": "sha512-BWIh6hyhq+tzVvebPMfRa+IhTV5/yXh4wO3a0U3Qo4PL4KDzWyBJfoiPi6bOEc+BAlFnCtOooTTXTumgXXOojg==",
+      "version": "6.0.12",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.0.12.tgz",
+      "integrity": "sha512-WpcVzSXBuvdHUZuNg1NTdnF4Ur7AGNCpgc4t4lyjPcEr0j//E855gd6GtUD7imNFERdtrvVC86JTpj5t0L+OMg==",
       "requires": {
-        "@stencil/core": "^2.4.0",
-        "ionicons": "^5.5.3",
+        "@stencil/core": "^2.14.1",
+        "ionicons": "^6.0.0",
         "tslib": "^2.1.0"
       }
     },
@@ -21745,9 +21734,9 @@
       "dev": true
     },
     "@stencil/core": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.8.1.tgz",
-      "integrity": "sha512-iv9J6oLO/lv7/aO45M05yw3pp1J7olY400vlOZgdMVs3s5zHfalY1ZPYM0KyqU4+7DZuadKYbd0aQZ/g2PInZw=="
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.14.2.tgz",
+      "integrity": "sha512-NMC5Xi8sPFJxaO4rz6CbMHuD6PteE/RJWtjrbkusmpjKRtMXkfZJPIgOrleZ4xO+vXcNyL535Ru7vUADqEsTiQ=="
     },
     "@tootallnate/once": {
       "version": "1.1.2",
@@ -27057,11 +27046,18 @@
       "dev": true
     },
     "ionicons": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-5.5.3.tgz",
-      "integrity": "sha512-L71djrMi8pAad66tpwdnO1vwcyluCFvehzxU1PpH1k/HpYBZhZ5IaYhqXipmqUvu5aEbd4cbRguYyI5Fd4bxTw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.1.tgz",
+      "integrity": "sha512-xQekOJsxH82O7oB+3F60zeRggCdND9pJ/k0E6IJDVUGGlCj5mlyFqNgxUimytKgstPGv3S+3EmCxjefvtGgWUg==",
       "requires": {
-        "@stencil/core": "^2.5.0"
+        "@stencil/core": "~2.12.0"
+      },
+      "dependencies": {
+        "@stencil/core": {
+          "version": "2.12.1",
+          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.12.1.tgz",
+          "integrity": "sha512-u24TZ+FEvjnZt5ZgIkLjLpUNsO6Ml3mUZqwmqk81w6RWWz75hgB5p4RFI5rvuErFeh2xvMIGo+pNdG24XUBz1A=="
+        }
       }
     },
     "ip": {
@@ -27555,8 +27551,7 @@
     "jsonc-parser": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
-      "dev": true
+      "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
     },
     "jsonfile": {
       "version": "3.0.1",

angular/test/test-app/package.json

@@ -29,8 +29,8 @@
     "@angular/platform-browser-dynamic": "^13.1.3",
     "@angular/platform-server": "^13.1.3",
     "@angular/router": "^13.1.3",
-    "@ionic/angular": "^5.3.1",
-    "@ionic/angular-server": "^5.3.1",
+    "@ionic/angular": "^6.0.12",
+    "@ionic/angular-server": "^6.0.12",
     "@nguniversal/express-engine": "^12.1.1",
     "angular-in-memory-web-api": "^0.11.0",
     "core-js": "^2.6.11",

angular/test/test-app/src/app/modal-example/modal-example.component.html

@@ -12,6 +12,7 @@
   <h1>Value</h1>
   <h2>{{value}}</h2>
   <h3>{{valueFromParams}}</h3>
+  <p>modal is defined: <span id="modalInstance">{{ !!modal }}</span></p>
   <p>ngOnInit: <span id="ngOnInit">{{onInit}}</span></p>
   <p>ionViewWillEnter: <span id="ionViewWillEnter">{{willEnter}}</span></p>
   <p>ionViewDidEnter: <span id="ionViewDidEnter">{{didEnter}}</span></p>

angular/test/test-app/src/app/modal-example/modal-example.component.ts

@@ -16,6 +16,8 @@ export class ModalExampleComponent implements OnInit, ViewWillLeave, ViewDidEnte
   willLeave = 0;
   didLeave = 0;
 
+  modal: HTMLElement;
+
   constructor(
     private modalCtrl: ModalController,
     @Optional() public nav: IonNav,

angular/test/test-app/src/app/nested-outlet-page/nested-outlet-page.component.ts

@@ -1,8 +1,16 @@
-import { Component } from '@angular/core';
+import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 
 @Component({
   selector: 'app-nested-outlet-page',
   templateUrl: './nested-outlet-page.component.html',
 })
-export class NestedOutletPageComponent {
+export class NestedOutletPageComponent implements OnDestroy, OnInit {
+
+  ngOnInit() {
+    NgZone.assertInAngularZone();
+  }
+
+  ngOnDestroy() {
+    NgZone.assertInAngularZone();
+  }
 }

angular/test/test-app/src/app/nested-outlet-page2/nested-outlet-page2.component.html

@@ -1,6 +1,6 @@
 <ion-content>
-    <h1>Nested page 2</h1>
-    <p>
-      <ion-button routerLink="/nested-outlet/page">Go To FIRST</ion-button>
-    </p>
-  </ion-content>
+  <h1>Nested page 2</h1>
+  <p>
+    <ion-button routerLink="/nested-outlet/page" id="goto-nested-page1">Go To FIRST</ion-button>
+  </p>
+</ion-content>

angular/test/test-app/src/app/nested-outlet-page2/nested-outlet-page2.component.ts

@@ -1,8 +1,16 @@
-import { Component } from '@angular/core';
+import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 
 @Component({
   selector: 'app-nested-outlet-page2',
   templateUrl: './nested-outlet-page2.component.html',
 })
-export class NestedOutletPage2Component {
+export class NestedOutletPage2Component implements OnDestroy, OnInit {
+
+  ngOnInit() {
+    NgZone.assertInAngularZone();
+  }
+
+  ngOnDestroy() {
+    NgZone.assertInAngularZone();
+  }
 }