chore(): sync with main

This commit is contained in:
Liam DeBeasi
2023-02-08 09:44:42 -05:00
189 changed files with 288 additions and 311 deletions

View File

@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [6.5.3](https://github.com/ionic-team/ionic/compare/v6.5.2...v6.5.3) (2023-02-08)
**Note:** Version bump only for package @ionic/angular
# [7.0.0-beta.1](https://github.com/ionic-team/ionic/compare/v6.5.2...v7.0.0-beta.1) (2023-02-01)
@ -81,7 +87,6 @@ Angular:
## [6.5.2](https://github.com/ionic-team/ionic/compare/v6.5.1...v6.5.2) (2023-02-01)
### Bug Fixes

View File

@ -1006,9 +1006,15 @@
"license": "BSD-3-Clause"
},
"node_modules/@ionic/core": {
<<<<<<< HEAD
"version": "7.0.0-dev.11675196564.12c5f9a0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.0.0-dev.11675196564.12c5f9a0.tgz",
"integrity": "sha512-KXVl0xPslPSisKjeWDVOojxteYyIQZdXxGgHN5N0zhovVEdqPrx2Na40QWzd0oyn5Jl3kAIdicOaCIyDyJ09Fw==",
=======
"version": "6.5.3",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.5.3.tgz",
"integrity": "sha512-z4slJZEw0PLet2htICKmCh76sN6kY28GSaYLDV1b4O/ya6qgu4QDwPkKbg22E8fiXBALlilce2zJQ55Tx5C6Aw==",
>>>>>>> origin/main
"dependencies": {
"@stencil/core": "^2.18.0",
"ionicons": "^6.1.1",
@ -7334,9 +7340,15 @@
"dev": true
},
"@ionic/core": {
<<<<<<< HEAD
"version": "7.0.0-dev.11675196564.12c5f9a0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.0.0-dev.11675196564.12c5f9a0.tgz",
"integrity": "sha512-KXVl0xPslPSisKjeWDVOojxteYyIQZdXxGgHN5N0zhovVEdqPrx2Na40QWzd0oyn5Jl3kAIdicOaCIyDyJ09Fw==",
=======
"version": "6.5.3",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.5.3.tgz",
"integrity": "sha512-z4slJZEw0PLet2htICKmCh76sN6kY28GSaYLDV1b4O/ya6qgu4QDwPkKbg22E8fiXBALlilce2zJQ55Tx5C6Aw==",
>>>>>>> origin/main
"requires": {
"@stencil/core": "^2.18.0",
"ionicons": "^6.1.1",