javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: sync with main

Browse Source
This commit is contained in:
Liam DeBeasi
2024-04-10 09:50:08 -04:00
parent adf220b681 1388014b65
commit d8599b3282
13 changed files with 108 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/angular-server/package-lock.json generated
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",