Merge remote-tracking branch 'origin/main' into sync-7-11-15-22

2026-03-13 10:22:08 +08:00 · 2022-11-15 15:40:21 -05:00
parent 44472aeb9f 7a990ff403
commit c149b42d0b
437 changed files with 1449 additions and 1499 deletions
--- a/angular/CHANGELOG.md
+++ b/angular/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [6.3.6](https://github.com/ionic-team/ionic/compare/v6.3.5...v6.3.6) (2022-11-10)
+
+**Note:** Version bump only for package @ionic/angular
+
+
+
+
+
+## [6.3.5](https://github.com/ionic-team/ionic/compare/v6.3.4...v6.3.5) (2022-11-09)
+
+**Note:** Version bump only for package @ionic/angular
+
+
+
+
+
 ## [6.3.4](https://github.com/ionic-team/ionic/compare/v6.3.3...v6.3.4) (2022-11-02)

 **Note:** Version bump only for package @ionic/angular
--- a/angular/package-lock.json
+++ b/angular/package-lock.json
@@ -1,15 +1,16 @@
 {
  "name": "@ionic/angular",
-  "version": "6.3.4",
+  "version": "6.3.6",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "@ionic/angular",
-      "version": "6.3.4",
+      "version": "6.3.6",
      "license": "MIT",
      "dependencies": {
-        "@ionic/core": "^6.3.4",
+        "@ionic/core": "^6.3.6",
+        "ionicons": "^6.0.4",
        "jsonc-parser": "^3.0.0",
        "tslib": "^2.0.0"
      },
@@ -1023,27 +1024,15 @@
      "dev": true
    },
    "node_modules/@ionic/core": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.4.tgz",
-      "integrity": "sha512-3EnKqFdon7Im8JNvuPoq/iGyYK7hskdb9u5hlQE0fHU/9Q0DvFVh17QTq1sQjXntoJovfRhaPJhG+kvZK3mVAQ==",
+      "version": "6.3.6",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.6.tgz",
+      "integrity": "sha512-QbLp9XNRfFHUVpSEEcFJYEyxek6Vi82EDIdJj0JvUPqMFdzF93dfzRoEIOos52jWxTG4LwGHLHlWem/3stF5Rg==",
      "dependencies": {
        "@stencil/core": "^2.18.0",
-        "ionicons": "^6.0.3",
+        "ionicons": "^6.0.4",
        "tslib": "^2.1.0"
      }
    },
-    "node_modules/@ionic/core/node_modules/@stencil/core": {
-      "version": "2.18.0",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.18.0.tgz",
-      "integrity": "sha512-NLEY8Jq59smyiivBAxHKipsp9YkkW/K/Vm90zAyXQqukb12i2SFucWHJ1Ik7ropVlhmMVvigyxXgRfQ9quIqtg==",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
-      }
-    },
    "node_modules/@ionic/eslint-config": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/@ionic/eslint-config/-/eslint-config-0.3.0.tgz",
@@ -1234,9 +1223,9 @@
      }
    },
    "node_modules/@stencil/core": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-      "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw==",
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA==",
      "bin": {
        "stencil": "bin/stencil"
      },
@@ -3569,11 +3558,11 @@
      }
    },
    "node_modules/ionicons": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.3.tgz",
-      "integrity": "sha512-kVOWER991EMqLiVShrCSWKMHkgHZP7XfVdyN6YPMuoO33W7pc5CPNVNfR8OMe/I8rYEbaunyBs6dXNYpR6gGZw==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "dependencies": {
-        "@stencil/core": "~2.16.0"
+        "@stencil/core": "^2.18.0"
      }
    },
    "node_modules/is-bigint": {
@@ -7951,20 +7940,13 @@
      "dev": true
    },
    "@ionic/core": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.4.tgz",
-      "integrity": "sha512-3EnKqFdon7Im8JNvuPoq/iGyYK7hskdb9u5hlQE0fHU/9Q0DvFVh17QTq1sQjXntoJovfRhaPJhG+kvZK3mVAQ==",
+      "version": "6.3.6",
+      "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.6.tgz",
+      "integrity": "sha512-QbLp9XNRfFHUVpSEEcFJYEyxek6Vi82EDIdJj0JvUPqMFdzF93dfzRoEIOos52jWxTG4LwGHLHlWem/3stF5Rg==",
      "requires": {
        "@stencil/core": "^2.18.0",
-        "ionicons": "^6.0.3",
+        "ionicons": "^6.0.4",
        "tslib": "^2.1.0"
-      },
-      "dependencies": {
-        "@stencil/core": {
-          "version": "2.18.0",
-          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.18.0.tgz",
-          "integrity": "sha512-NLEY8Jq59smyiivBAxHKipsp9YkkW/K/Vm90zAyXQqukb12i2SFucWHJ1Ik7ropVlhmMVvigyxXgRfQ9quIqtg=="
-        }
      }
    },
    "@ionic/eslint-config": {
@@ -8111,9 +8093,9 @@
      }
    },
    "@stencil/core": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-      "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw=="
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA=="
    },
    "@types/estree": {
      "version": "0.0.39",
@@ -9818,11 +9800,11 @@
      }
    },
    "ionicons": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.3.tgz",
-      "integrity": "sha512-kVOWER991EMqLiVShrCSWKMHkgHZP7XfVdyN6YPMuoO33W7pc5CPNVNfR8OMe/I8rYEbaunyBs6dXNYpR6gGZw==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "requires": {
-        "@stencil/core": "~2.16.0"
+        "@stencil/core": "^2.18.0"
      }
    },
    "is-bigint": {
--- a/angular/package.json
+++ b/angular/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@ionic/angular",
-  "version": "6.3.4",
+  "version": "6.3.6",
  "description": "Angular specific wrappers for @ionic/core",
  "keywords": [
    "ionic",
@@ -40,13 +40,14 @@
    "prettier": "prettier \"**/*.ts\"",
    "eslint": "eslint . --ext .ts",
    "prerelease": "npm run validate && np prerelease --yolo --any-branch --tag next",
-    "sync": "sh ./scripts/sync.sh",
+    "sync": "./scripts/sync.sh",
    "test": "echo 'angular no tests yet'",
    "tsc": "tsc -p .",
    "validate": "npm i && npm run lint && npm run test && npm run build"
  },
  "dependencies": {
-    "@ionic/core": "^6.3.4",
+    "@ionic/core": "^6.3.6",
+    "ionicons": "^6.0.4",
    "jsonc-parser": "^3.0.0",
    "tslib": "^2.0.0"
  },
@@ -93,6 +94,7 @@
    },
    "allowedNonPeerDependencies": [
      "@ionic/core",
+      "ionicons",
      "jsonc-parser"
    ]
  }
--- a/angular/scripts/build-core.js
+++ b/angular/scripts/build-core.js
@@ -2,17 +2,8 @@ const fs = require('fs-extra');
 const path = require('path');
 const spawn = require('child_process').spawn;

-const stencilPath = path.join(__dirname, '..', '..', 'core', 'node_modules', '.bin');
 const typescriptPath = path.join(__dirname, '..', 'node_modules', '.bin');

-function copyIonicons() {
-  const src = path.join(__dirname, '..', '..', 'core', 'node_modules', 'ionicons');
-  const dst = path.join(__dirname, '..', 'node_modules', 'ionicons');
-
-  fs.removeSync(dst);
-  fs.copySync(src, dst);
-}
-
 function copyCSS() {
  const src = path.join(__dirname, '..', '..', 'core', 'css');
  const dst = path.join(__dirname, '..','dist', 'css');
@@ -57,7 +48,6 @@ function copySchematicsJson(){

 }

-copyIonicons();
 copyCSS();
 buildSchematics();
 copySchematicsJson()
--- a/angular/scripts/sync.sh
+++ b/angular/scripts/sync.sh
@@ -1,7 +1,9 @@
-rm -rf node_modules/@ionic/core
-mkdir node_modules/@ionic/core
-cp -a ../core/css node_modules/@ionic/core/css
+#!/bin/bash
+
+set -e
+
+# Copy core dist
+rm -rf node_modules/@ionic/core/dist node_modules/@ionic/core/components
 cp -a ../core/dist node_modules/@ionic/core/dist
-cp -a ../core/hydrate node_modules/@ionic/core/hydrate
-cp -a ../core/loader node_modules/@ionic/core/loader
+cp -a ../core/components node_modules/@ionic/core/components
 cp -a ../core/package.json node_modules/@ionic/core/package.json
--- a/angular/src/directives/control-value-accessors/value-accessor.ts
+++ b/angular/src/directives/control-value-accessors/value-accessor.ts
@@ -96,14 +96,8 @@ export class ValueAccessor implements ControlValueAccessor, AfterViewInit, OnDes
    }

    /**
-     * TODO Remove this in favor of https://github.com/angular/angular/issues/10887
-     * whenever it is implemented. Currently, Ionic's form status classes
-     * do not react to changes when developers manually call
-     * Angular form control methods such as markAsTouched.
-     * This results in Ionic's form status classes being out
-     * of sync with the ng form status classes.
-     * This patches the methods to manually sync
-     * the classes until this feature is implemented in Angular.
+     * TODO FW-2787: Remove this in favor of https://github.com/angular/angular/issues/10887
+     * whenever it is implemented.
     */
    const formControl = ngControl.control as any;
    if (formControl) {
--- a/angular/src/directives/navigation/stack-utils.ts
+++ b/angular/src/directives/navigation/stack-utils.ts
@@ -74,7 +74,6 @@ export const toSegments = (path: string): string[] => {

 export const destroyView = (view: RouteView | undefined): void => {
  if (view) {
-    // TODO lifecycle event
    view.ref.destroy();
    view.unlistenEvents();
  }
--- a/angular/src/directives/overlays/popover.ts
+++ b/angular/src/directives/overlays/popover.ts
@@ -108,7 +108,7 @@ export class IonPopover {
  constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
    this.el = r.nativeElement;

-    this.el.addEventListener('willPresent', () => {
+    this.el.addEventListener('ionMount', () => {
      this.isCmpOpen = true;
      c.detectChanges();
    });
--- a/angular/src/util/overlay.ts
+++ b/angular/src/util/overlay.ts
@@ -11,7 +11,6 @@ export class OverlayBaseController<Opts, Overlay> implements ControllerShape<Opt
   * Creates a new overlay
   */
  create(opts?: Opts): Promise<Overlay> {
-    // TODO: next major release opts is not optional
    return this.ctrl.create((opts || {}) as any);
  }

--- a/angular/test/apps/ng12/package-lock.json
+++ b/angular/test/apps/ng12/package-lock.json
@@ -24,6 +24,7 @@
        "angular-in-memory-web-api": "^0.11.0",
        "core-js": "^2.6.11",
        "express": "^4.15.2",
+        "ionicons": "^6.0.4",
        "rxjs": "^6.5.5",
        "tslib": "^2.0.0",
        "typescript-eslint-language-service": "^4.1.5",
@@ -3536,9 +3537,9 @@
      "dev": true
    },
    "node_modules/@stencil/core": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.17.1.tgz",
-      "integrity": "sha512-ErjQsNALgZQ9SYeBHhqwL1UO+Zbptwl3kwrRJC2tGlc3G/T6UvPuaKr+PGsqI+CZGia+0+R5EELQvFu74mYeIg==",
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA==",
      "bin": {
        "stencil": "bin/stencil"
      },
@@ -10444,23 +10445,11 @@
      }
    },
    "node_modules/ionicons": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
-      "integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "dependencies": {
-        "@stencil/core": "~2.16.0"
-      }
-    },
-    "node_modules/ionicons/node_modules/@stencil/core": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-      "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw==",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
+        "@stencil/core": "^2.18.0"
      }
    },
    "node_modules/ip": {
@@ -22458,9 +22447,9 @@
      "dev": true
    },
    "@stencil/core": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.17.1.tgz",
-      "integrity": "sha512-ErjQsNALgZQ9SYeBHhqwL1UO+Zbptwl3kwrRJC2tGlc3G/T6UvPuaKr+PGsqI+CZGia+0+R5EELQvFu74mYeIg=="
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA=="
    },
    "@tootallnate/once": {
      "version": "1.1.2",
@@ -27652,18 +27641,11 @@
      "dev": true
    },
    "ionicons": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
-      "integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "requires": {
-        "@stencil/core": "~2.16.0"
-      },
-      "dependencies": {
-        "@stencil/core": {
-          "version": "2.16.1",
-          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-          "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw=="
-        }
+        "@stencil/core": "^2.18.0"
      }
    },
    "ip": {
--- a/angular/test/apps/ng12/package.json
+++ b/angular/test/apps/ng12/package.json
@@ -35,6 +35,7 @@
    "angular-in-memory-web-api": "^0.11.0",
    "core-js": "^2.6.11",
    "express": "^4.15.2",
+    "ionicons": "^6.0.4",
    "rxjs": "^6.5.5",
    "tslib": "^2.0.0",
    "typescript-eslint-language-service": "^4.1.5",
--- a/angular/test/apps/ng13/package-lock.json
+++ b/angular/test/apps/ng13/package-lock.json
@@ -24,6 +24,7 @@
        "angular-in-memory-web-api": "^0.11.0",
        "core-js": "^2.6.11",
        "express": "^4.15.2",
+        "ionicons": "^6.0.4",
        "rxjs": "^6.5.5",
        "tslib": "^2.0.0",
        "typescript-eslint-language-service": "^4.1.5",
@@ -3423,9 +3424,9 @@
      "dev": true
    },
    "node_modules/@stencil/core": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.17.1.tgz",
-      "integrity": "sha512-ErjQsNALgZQ9SYeBHhqwL1UO+Zbptwl3kwrRJC2tGlc3G/T6UvPuaKr+PGsqI+CZGia+0+R5EELQvFu74mYeIg==",
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA==",
      "bin": {
        "stencil": "bin/stencil"
      },
@@ -9844,23 +9845,11 @@
      }
    },
    "node_modules/ionicons": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
-      "integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "dependencies": {
-        "@stencil/core": "~2.16.0"
-      }
-    },
-    "node_modules/ionicons/node_modules/@stencil/core": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-      "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw==",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
+        "@stencil/core": "^2.18.0"
      }
    },
    "node_modules/ip": {
@@ -18772,9 +18761,9 @@
      "dev": true
    },
    "@stencil/core": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.17.1.tgz",
-      "integrity": "sha512-ErjQsNALgZQ9SYeBHhqwL1UO+Zbptwl3kwrRJC2tGlc3G/T6UvPuaKr+PGsqI+CZGia+0+R5EELQvFu74mYeIg=="
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA=="
    },
    "@tootallnate/once": {
      "version": "2.0.0",
@@ -23499,18 +23488,11 @@
      "dev": true
    },
    "ionicons": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
-      "integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "requires": {
-        "@stencil/core": "~2.16.0"
-      },
-      "dependencies": {
-        "@stencil/core": {
-          "version": "2.16.1",
-          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-          "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw=="
-        }
+        "@stencil/core": "^2.18.0"
      }
    },
    "ip": {
--- a/angular/test/apps/ng13/package.json
+++ b/angular/test/apps/ng13/package.json
@@ -35,6 +35,7 @@
    "angular-in-memory-web-api": "^0.11.0",
    "core-js": "^2.6.11",
    "express": "^4.15.2",
+    "ionicons": "^6.0.4",
    "rxjs": "^6.5.5",
    "tslib": "^2.0.0",
    "typescript-eslint-language-service": "^4.1.5",
--- a/angular/test/apps/ng14/package-lock.json
+++ b/angular/test/apps/ng14/package-lock.json
@@ -24,6 +24,7 @@
        "angular-in-memory-web-api": "^0.11.0",
        "core-js": "^2.6.11",
        "express": "^4.15.2",
+        "ionicons": "^6.0.4",
        "rxjs": "^6.5.5",
        "tslib": "^2.0.0",
        "typescript-eslint-language-service": "^4.1.5",
@@ -3329,9 +3330,9 @@
      "dev": true
    },
    "node_modules/@stencil/core": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.17.1.tgz",
-      "integrity": "sha512-ErjQsNALgZQ9SYeBHhqwL1UO+Zbptwl3kwrRJC2tGlc3G/T6UvPuaKr+PGsqI+CZGia+0+R5EELQvFu74mYeIg==",
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA==",
      "bin": {
        "stencil": "bin/stencil"
      },
@@ -9744,23 +9745,11 @@
      }
    },
    "node_modules/ionicons": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
-      "integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "dependencies": {
-        "@stencil/core": "~2.16.0"
-      }
-    },
-    "node_modules/ionicons/node_modules/@stencil/core": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-      "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw==",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
+        "@stencil/core": "^2.18.0"
      }
    },
    "node_modules/ip": {
@@ -18702,9 +18691,9 @@
      "dev": true
    },
    "@stencil/core": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.17.1.tgz",
-      "integrity": "sha512-ErjQsNALgZQ9SYeBHhqwL1UO+Zbptwl3kwrRJC2tGlc3G/T6UvPuaKr+PGsqI+CZGia+0+R5EELQvFu74mYeIg=="
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA=="
    },
    "@tootallnate/once": {
      "version": "2.0.0",
@@ -23422,18 +23411,11 @@
      "dev": true
    },
    "ionicons": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
-      "integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "requires": {
-        "@stencil/core": "~2.16.0"
-      },
-      "dependencies": {
-        "@stencil/core": {
-          "version": "2.16.1",
-          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-          "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw=="
-        }
+        "@stencil/core": "^2.18.0"
      }
    },
    "ip": {
--- a/angular/test/apps/ng14/package.json
+++ b/angular/test/apps/ng14/package.json
@@ -35,6 +35,7 @@
    "angular-in-memory-web-api": "^0.11.0",
    "core-js": "^2.6.11",
    "express": "^4.15.2",
+    "ionicons": "^6.0.4",
    "rxjs": "^6.5.5",
    "tslib": "^2.0.0",
    "typescript-eslint-language-service": "^4.1.5",
--- a/angular/test/apps/ng15/package-lock.json
+++ b/angular/test/apps/ng15/package-lock.json
@@ -24,6 +24,7 @@
        "angular-in-memory-web-api": "^0.11.0",
        "core-js": "^2.6.11",
        "express": "^4.15.2",
+        "ionicons": "^6.0.4",
        "rxjs": "~7.5.0",
        "tslib": "^2.3.0",
        "typescript-eslint-language-service": "^4.1.5",
@@ -3407,9 +3408,9 @@
      "dev": true
    },
    "node_modules/@stencil/core": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.17.1.tgz",
-      "integrity": "sha512-ErjQsNALgZQ9SYeBHhqwL1UO+Zbptwl3kwrRJC2tGlc3G/T6UvPuaKr+PGsqI+CZGia+0+R5EELQvFu74mYeIg==",
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA==",
      "bin": {
        "stencil": "bin/stencil"
      },
@@ -9680,23 +9681,11 @@
      }
    },
    "node_modules/ionicons": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
-      "integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "dependencies": {
-        "@stencil/core": "~2.16.0"
-      }
-    },
-    "node_modules/ionicons/node_modules/@stencil/core": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-      "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw==",
-      "bin": {
-        "stencil": "bin/stencil"
-      },
-      "engines": {
-        "node": ">=12.10.0",
-        "npm": ">=6.0.0"
+        "@stencil/core": "^2.18.0"
      }
    },
    "node_modules/ip": {
@@ -18515,9 +18504,9 @@
      "dev": true
    },
    "@stencil/core": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.17.1.tgz",
-      "integrity": "sha512-ErjQsNALgZQ9SYeBHhqwL1UO+Zbptwl3kwrRJC2tGlc3G/T6UvPuaKr+PGsqI+CZGia+0+R5EELQvFu74mYeIg=="
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.19.2.tgz",
+      "integrity": "sha512-TK3sHqyQAACwcac4fWntypFtN9c/y+y9ioZojeCnNDY3dxF33Ax70lL9ZLDyQnWWR+aTh1WFoqB5sYOnZIUKMA=="
    },
    "@tootallnate/once": {
      "version": "2.0.0",
@@ -23141,18 +23130,11 @@
      "dev": true
    },
    "ionicons": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.2.tgz",
-      "integrity": "sha512-AyKfFaUKVoBz4eB8XkU7H1R5HFnVsgq5ijqSdbXC0lES9PDK/J6LUQz6XUJq0mVVQF5k9kczSPOLMW3mszG0mQ==",
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
+      "integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
      "requires": {
-        "@stencil/core": "~2.16.0"
-      },
-      "dependencies": {
-        "@stencil/core": {
-          "version": "2.16.1",
-          "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
-          "integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw=="
-        }
+        "@stencil/core": "^2.18.0"
      }
    },
    "ip": {
--- a/angular/test/apps/ng15/package.json
+++ b/angular/test/apps/ng15/package.json
@@ -35,6 +35,7 @@
    "angular-in-memory-web-api": "^0.11.0",
    "core-js": "^2.6.11",
    "express": "^4.15.2",
+    "ionicons": "^6.0.4",
    "rxjs": "~7.5.0",
    "tslib": "^2.3.0",
    "typescript-eslint-language-service": "^4.1.5",
--- a/angular/test/base/cypress/support/commands.js
+++ b/angular/test/base/cypress/support/commands.js
@@ -73,7 +73,7 @@ Cypress.Commands.add('ionPageDoesNotExist', (selector) => {
 });

 Cypress.Commands.add('ionTabClick', (tabText) => {
-  // TODO: Figure out how to get rid of wait. It's a workaround for flakiness in CI.
+  // TODO FW-2790: Figure out how to get rid of wait. It's a workaround for flakiness in CI.
  cy.wait(250);
  cy.contains('ion-tab-button', tabText).click({ force: true });
 });
--- a/angular/test/base/scripts/sync.sh
+++ b/angular/test/base/scripts/sync.sh
@@ -1,3 +1,7 @@
+#!/bin/bash
+
+set -e
+
 # Copy angular dist
 rm -rf node_modules/@ionic/angular
 cp -a ../../../dist node_modules/@ionic/angular
@@ -14,7 +18,3 @@ cp -a ../../../../core/dist node_modules/@ionic/core/dist
 cp -a ../../../../core/hydrate node_modules/@ionic/core/hydrate
 cp -a ../../../../core/loader node_modules/@ionic/core/loader
 cp -a ../../../../core/package.json node_modules/@ionic/core/package.json
-
-# # Copy ionicons
-rm -rf node_modules/ionicons
-cp -a ../../../../core/node_modules/ionicons node_modules/ionicons
--- a/angular/tsconfig.json
+++ b/angular/tsconfig.json
@@ -31,10 +31,6 @@
    "strictPropertyInitialization": false,
    "target": "es2015",
    "baseUrl": ".",
-    "paths": {
-      "@ionic/core/hydrate": ["../core/hydrate"],
-      "@ionic/core": ["../core"]
-    },
    "plugins": [
      {
        "name": "typescript-eslint-language-service"