chore: sync with main

This commit is contained in:
Liam DeBeasi
2024-04-10 09:50:08 -04:00
13 changed files with 108 additions and 12 deletions

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [7.8.4](https://github.com/ionic-team/ionic-framework/compare/v7.8.3...v7.8.4) (2024-04-10)
**Note:** Version bump only for package @ionic/angular-server
## [7.8.3](https://github.com/ionic-team/ionic-framework/compare/v7.8.2...v7.8.3) (2024-04-03)
**Note:** Version bump only for package @ionic/angular-server

View File

@ -1119,9 +1119,15 @@
"dev": true
},
"node_modules/@ionic/core": {
<<<<<<< HEAD
"version": "8.0.0-rc.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-8.0.0-rc.0.tgz",
"integrity": "sha512-aVHHI9Nl4F54ME9mmHNNluZdAP40kTQOoMhcWWVgOvvkKTFY5pVyQI/CLQEkIEp0Q+bBOqVcHlMDYtCPnuqS1w==",
=======
"version": "7.8.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.4.tgz",
"integrity": "sha512-GiQM3Gb1kjaxQyDTQfXd54p/a8cK+ccaYKH30pRpzFMborqCZwhcCUQWV1zNAUuFI8YkC5CWTi6bdHyiYuxw4w==",
>>>>>>> origin/main
"dependencies": {
"@stencil/core": "^4.12.2",
"ionicons": "^7.2.2",
@ -7011,9 +7017,15 @@
"dev": true
},
"@ionic/core": {
<<<<<<< HEAD
"version": "8.0.0-rc.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-8.0.0-rc.0.tgz",
"integrity": "sha512-aVHHI9Nl4F54ME9mmHNNluZdAP40kTQOoMhcWWVgOvvkKTFY5pVyQI/CLQEkIEp0Q+bBOqVcHlMDYtCPnuqS1w==",
=======
"version": "7.8.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.4.tgz",
"integrity": "sha512-GiQM3Gb1kjaxQyDTQfXd54p/a8cK+ccaYKH30pRpzFMborqCZwhcCUQWV1zNAUuFI8YkC5CWTi6bdHyiYuxw4w==",
>>>>>>> origin/main
"requires": {
"@stencil/core": "^4.12.2",
"ionicons": "^7.2.2",