From 4cd8fb15afd20d71e324dfe17948da8da69517d4 Mon Sep 17 00:00:00 2001 From: ionitron Date: Wed, 20 Mar 2024 13:18:53 +0000 Subject: [PATCH 1/4] v7.8.1 --- CHANGELOG.md | 18 ++++++++++++++++++ core/CHANGELOG.md | 17 +++++++++++++++++ core/package-lock.json | 4 ++-- core/package.json | 2 +- docs/CHANGELOG.md | 8 ++++++++ docs/package-lock.json | 4 ++-- docs/package.json | 2 +- lerna.json | 2 +- packages/angular-server/CHANGELOG.md | 8 ++++++++ packages/angular-server/package-lock.json | 6 +++--- packages/angular-server/package.json | 4 ++-- packages/angular/CHANGELOG.md | 8 ++++++++ packages/angular/package-lock.json | 6 +++--- packages/angular/package.json | 4 ++-- packages/react-router/CHANGELOG.md | 11 +++++++++++ packages/react-router/package-lock.json | 6 +++--- packages/react-router/package.json | 4 ++-- packages/react/CHANGELOG.md | 11 +++++++++++ packages/react/package-lock.json | 6 +++--- packages/react/package.json | 4 ++-- packages/vue-router/CHANGELOG.md | 8 ++++++++ packages/vue-router/package-lock.json | 6 +++--- packages/vue-router/package.json | 4 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package-lock.json | 6 +++--- packages/vue/package.json | 4 ++-- 26 files changed, 134 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24c64ca781..e971c5e305 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.8.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + + +### Bug Fixes + +* **datetime:** wheel picker shows consistently in overlays ([#29147](https://github.com/ionic-team/ionic-framework/issues/29147)) ([19c1bc1](https://github.com/ionic-team/ionic-framework/commit/19c1bc16cbc6725463890382365203824b7fd353)), closes [#26234](https://github.com/ionic-team/ionic-framework/issues/26234) +* **header:** iOS headers in MD app are not hidden ([#29164](https://github.com/ionic-team/ionic-framework/issues/29164)) ([fdfecd3](https://github.com/ionic-team/ionic-framework/commit/fdfecd32c33c41cf202d3b30c073bfb1b077e2d6)), closes [#28867](https://github.com/ionic-team/ionic-framework/issues/28867) +* **react:** avoid definitely typed errors with @types/react@18 ([#29182](https://github.com/ionic-team/ionic-framework/issues/29182)) ([58d217d](https://github.com/ionic-team/ionic-framework/commit/58d217d0cf6b716da855c71c169fb1870d4067d3)), closes [#29178](https://github.com/ionic-team/ionic-framework/issues/29178) + + +### Performance Improvements + +* **datetime:** calendar body shows immediately in modal on ios ([#29163](https://github.com/ionic-team/ionic-framework/issues/29163)) ([f759776](https://github.com/ionic-team/ionic-framework/commit/f75977699dae5aeea3d97d4318377633e935afb9)), closes [#24542](https://github.com/ionic-team/ionic-framework/issues/24542) + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 6333207bfa..36d9f82751 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -3,6 +3,23 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.8.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + + +### Bug Fixes + +* **datetime:** wheel picker shows consistently in overlays ([#29147](https://github.com/ionic-team/ionic-framework/issues/29147)) ([19c1bc1](https://github.com/ionic-team/ionic-framework/commit/19c1bc16cbc6725463890382365203824b7fd353)), closes [#26234](https://github.com/ionic-team/ionic-framework/issues/26234) +* **header:** iOS headers in MD app are not hidden ([#29164](https://github.com/ionic-team/ionic-framework/issues/29164)) ([fdfecd3](https://github.com/ionic-team/ionic-framework/commit/fdfecd32c33c41cf202d3b30c073bfb1b077e2d6)), closes [#28867](https://github.com/ionic-team/ionic-framework/issues/28867) + + +### Performance Improvements + +* **datetime:** calendar body shows immediately in modal on ios ([#29163](https://github.com/ionic-team/ionic-framework/issues/29163)) ([f759776](https://github.com/ionic-team/ionic-framework/commit/f75977699dae5aeea3d97d4318377633e935afb9)), closes [#24542](https://github.com/ionic-team/ionic-framework/issues/24542) + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) diff --git a/core/package-lock.json b/core/package-lock.json index 6b7526e0ed..88a54a4eab 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/core", - "version": "7.8.0", + "version": "7.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/core", - "version": "7.8.0", + "version": "7.8.1", "license": "MIT", "dependencies": { "@stencil/core": "^4.12.2", diff --git a/core/package.json b/core/package.json index 92f097176d..79cfb65d8e 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "7.8.0", + "version": "7.8.1", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e2f4e2ee72..39d8ffd351 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -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.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + +**Note:** Version bump only for package @ionic/docs + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) **Note:** Version bump only for package @ionic/docs diff --git a/docs/package-lock.json b/docs/package-lock.json index 499e198463..2aa8761306 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/docs", - "version": "7.8.0", + "version": "7.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/docs", - "version": "7.8.0", + "version": "7.8.1", "license": "MIT" } } diff --git a/docs/package.json b/docs/package.json index 2e36d5d309..b4505e88a1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "7.8.0", + "version": "7.8.1", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "types": "core.d.ts", diff --git a/lerna.json b/lerna.json index 77bf87ff96..b861d7d587 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ "docs", "packages/*" ], - "version": "7.8.0" + "version": "7.8.1" } diff --git a/packages/angular-server/CHANGELOG.md b/packages/angular-server/CHANGELOG.md index 17db42772a..e1272ef636 100644 --- a/packages/angular-server/CHANGELOG.md +++ b/packages/angular-server/CHANGELOG.md @@ -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.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + +**Note:** Version bump only for package @ionic/angular-server + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) **Note:** Version bump only for package @ionic/angular-server diff --git a/packages/angular-server/package-lock.json b/packages/angular-server/package-lock.json index 0394453e53..e2179a65da 100644 --- a/packages/angular-server/package-lock.json +++ b/packages/angular-server/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/angular-server", - "version": "7.8.0", + "version": "7.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular-server", - "version": "7.8.0", + "version": "7.8.1", "license": "MIT", "dependencies": { - "@ionic/core": "^7.8.0" + "@ionic/core": "^7.8.1" }, "devDependencies": { "@angular-eslint/eslint-plugin": "^14.0.0", diff --git a/packages/angular-server/package.json b/packages/angular-server/package.json index a8f4a8e83f..059f4de8e6 100644 --- a/packages/angular-server/package.json +++ b/packages/angular-server/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular-server", - "version": "7.8.0", + "version": "7.8.1", "description": "Angular SSR Module for Ionic", "keywords": [ "ionic", @@ -62,6 +62,6 @@ }, "prettier": "@ionic/prettier-config", "dependencies": { - "@ionic/core": "^7.8.0" + "@ionic/core": "^7.8.1" } } diff --git a/packages/angular/CHANGELOG.md b/packages/angular/CHANGELOG.md index 3849b1a652..fa71ce7a8c 100644 --- a/packages/angular/CHANGELOG.md +++ b/packages/angular/CHANGELOG.md @@ -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.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + +**Note:** Version bump only for package @ionic/angular + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) diff --git a/packages/angular/package-lock.json b/packages/angular/package-lock.json index 76d3820eba..ce9471af49 100644 --- a/packages/angular/package-lock.json +++ b/packages/angular/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/angular", - "version": "7.8.0", + "version": "7.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular", - "version": "7.8.0", + "version": "7.8.1", "license": "MIT", "dependencies": { - "@ionic/core": "^7.8.0", + "@ionic/core": "^7.8.1", "ionicons": "^7.0.0", "jsonc-parser": "^3.0.0", "tslib": "^2.3.0" diff --git a/packages/angular/package.json b/packages/angular/package.json index 6da3f09d96..96583caf9d 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "7.8.0", + "version": "7.8.1", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -47,7 +47,7 @@ } }, "dependencies": { - "@ionic/core": "^7.8.0", + "@ionic/core": "^7.8.1", "ionicons": "^7.0.0", "jsonc-parser": "^3.0.0", "tslib": "^2.3.0" diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index 6a5277f491..b5afdd2737 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-router/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.8.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + + +### Bug Fixes + +* **react:** avoid definitely typed errors with @types/react@18 ([#29182](https://github.com/ionic-team/ionic-framework/issues/29182)) ([58d217d](https://github.com/ionic-team/ionic-framework/commit/58d217d0cf6b716da855c71c169fb1870d4067d3)), closes [#29178](https://github.com/ionic-team/ionic-framework/issues/29178) + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) **Note:** Version bump only for package @ionic/react-router diff --git a/packages/react-router/package-lock.json b/packages/react-router/package-lock.json index 4e3735d11d..aea678dcac 100644 --- a/packages/react-router/package-lock.json +++ b/packages/react-router/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/react-router", - "version": "7.8.0", + "version": "7.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/react-router", - "version": "7.8.0", + "version": "7.8.1", "license": "MIT", "dependencies": { - "@ionic/react": "^7.8.0", + "@ionic/react": "^7.8.1", "tslib": "*" }, "devDependencies": { diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 95c845e230..985bc9b163 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react-router", - "version": "7.8.0", + "version": "7.8.1", "description": "React Router wrapper for @ionic/react", "keywords": [ "ionic", @@ -36,7 +36,7 @@ "dist/" ], "dependencies": { - "@ionic/react": "^7.8.0", + "@ionic/react": "^7.8.1", "tslib": "*" }, "peerDependencies": { diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 03b2d56923..00d1107fe2 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.8.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + + +### Bug Fixes + +* **react:** avoid definitely typed errors with @types/react@18 ([#29182](https://github.com/ionic-team/ionic-framework/issues/29182)) ([58d217d](https://github.com/ionic-team/ionic-framework/commit/58d217d0cf6b716da855c71c169fb1870d4067d3)), closes [#29178](https://github.com/ionic-team/ionic-framework/issues/29178) + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) **Note:** Version bump only for package @ionic/react diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json index ddb49fb3c6..58b6123bf1 100644 --- a/packages/react/package-lock.json +++ b/packages/react/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/react", - "version": "7.8.0", + "version": "7.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/react", - "version": "7.8.0", + "version": "7.8.1", "license": "MIT", "dependencies": { - "@ionic/core": "^7.8.0", + "@ionic/core": "^7.8.1", "ionicons": "^7.0.0", "tslib": "*" }, diff --git a/packages/react/package.json b/packages/react/package.json index 88dc433b88..3a5aa08157 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react", - "version": "7.8.0", + "version": "7.8.1", "description": "React specific wrapper for @ionic/core", "keywords": [ "ionic", @@ -39,7 +39,7 @@ "css/" ], "dependencies": { - "@ionic/core": "^7.8.0", + "@ionic/core": "^7.8.1", "ionicons": "^7.0.0", "tslib": "*" }, diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index 522fccf6b2..d87cbae835 100644 --- a/packages/vue-router/CHANGELOG.md +++ b/packages/vue-router/CHANGELOG.md @@ -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.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + +**Note:** Version bump only for package @ionic/vue-router + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) **Note:** Version bump only for package @ionic/vue-router diff --git a/packages/vue-router/package-lock.json b/packages/vue-router/package-lock.json index ea8b3477ff..4daafaf59b 100644 --- a/packages/vue-router/package-lock.json +++ b/packages/vue-router/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/vue-router", - "version": "7.8.0", + "version": "7.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue-router", - "version": "7.8.0", + "version": "7.8.1", "license": "MIT", "dependencies": { - "@ionic/vue": "^7.8.0" + "@ionic/vue": "^7.8.1" }, "devDependencies": { "@ionic/eslint-config": "^0.3.0", diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index a0c22a2a1e..a8b7987f24 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue-router", - "version": "7.8.0", + "version": "7.8.1", "description": "Vue Router integration for @ionic/vue", "scripts": { "test.spec": "jest", @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/ionic-team/ionic#readme", "dependencies": { - "@ionic/vue": "^7.8.0" + "@ionic/vue": "^7.8.1" }, "devDependencies": { "@ionic/eslint-config": "^0.3.0", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index 88d0ad79c9..7704a3bdb9 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -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.1](https://github.com/ionic-team/ionic-framework/compare/v7.8.0...v7.8.1) (2024-03-20) + +**Note:** Version bump only for package @ionic/vue + + + + + # [7.8.0](https://github.com/ionic-team/ionic-framework/compare/v7.7.5...v7.8.0) (2024-03-13) diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index f373f41b70..790ef69290 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/vue", - "version": "7.8.0", + "version": "7.8.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue", - "version": "7.8.0", + "version": "7.8.1", "license": "MIT", "dependencies": { - "@ionic/core": "^7.8.0", + "@ionic/core": "^7.8.1", "ionicons": "^7.0.0" }, "devDependencies": { diff --git a/packages/vue/package.json b/packages/vue/package.json index 6262b49836..1f8bb6bc33 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue", - "version": "7.8.0", + "version": "7.8.1", "description": "Vue specific wrapper for @ionic/core", "scripts": { "eslint": "eslint src", @@ -66,7 +66,7 @@ "vue-router": "^4.0.16" }, "dependencies": { - "@ionic/core": "^7.8.0", + "@ionic/core": "^7.8.1", "ionicons": "^7.0.0" }, "vetur": { From 7ca6b80b04544b8eb7ddbd6d9f50fe6655a91cad Mon Sep 17 00:00:00 2001 From: ionitron Date: Wed, 20 Mar 2024 13:19:42 +0000 Subject: [PATCH 2/4] chore(): update package lock files --- packages/angular-server/package-lock.json | 12 +++--- packages/angular/package-lock.json | 12 +++--- packages/react-router/package-lock.json | 52 +++++++++++------------ packages/react/package-lock.json | 12 +++--- packages/vue-router/package-lock.json | 52 +++++++++++------------ packages/vue/package-lock.json | 12 +++--- 6 files changed, 76 insertions(+), 76 deletions(-) diff --git a/packages/angular-server/package-lock.json b/packages/angular-server/package-lock.json index e2179a65da..6f6f605c77 100644 --- a/packages/angular-server/package-lock.json +++ b/packages/angular-server/package-lock.json @@ -1060,9 +1060,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "dependencies": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -7330,9 +7330,9 @@ "dev": true }, "@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "requires": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", diff --git a/packages/angular/package-lock.json b/packages/angular/package-lock.json index ce9471af49..958569ad8c 100644 --- a/packages/angular/package-lock.json +++ b/packages/angular/package-lock.json @@ -1407,9 +1407,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "dependencies": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -9697,9 +9697,9 @@ "dev": true }, "@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "requires": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", diff --git a/packages/react-router/package-lock.json b/packages/react-router/package-lock.json index aea678dcac..39ffb59dba 100644 --- a/packages/react-router/package-lock.json +++ b/packages/react-router/package-lock.json @@ -238,9 +238,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "dependencies": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -414,11 +414,11 @@ } }, "node_modules/@ionic/react": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/react/-/react-7.8.0.tgz", - "integrity": "sha512-OpP3WWnbD0cdP98afJk/Z6DmXk4t1ZBOLzZvBaNlRUMbnkTZOjt/PufCK+qvaPVGc2OKfKhv+XRckbx9uX5Few==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/react/-/react-7.8.1.tgz", + "integrity": "sha512-MJgmlsm69lvHiPBFHSUg9ZGbWyjfn5ZDUidYSE8oWA/L0Mtd7XqNl9DMlSXWy87jaOET96R72eSwgsAPZ+FEBA==", "dependencies": { - "@ionic/core": "7.8.0", + "@ionic/core": "7.8.1", "ionicons": "^7.0.0", "tslib": "*" }, @@ -667,9 +667,9 @@ ] }, "node_modules/@stencil/core": { - "version": "4.12.6", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.12.6.tgz", - "integrity": "sha512-15JO2TdaxGVKNdLZb/2TtDa+juj3XGD/V0y/disgdzYYSnajgSh06nwODfdHz9eTUh1Hisz+KIo857I1rCZrfg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.13.0.tgz", + "integrity": "sha512-gg+gtBWekQ08mDja8GVAUHNu+rrFhQaKZDvfhnS3l/5JbYiJddTimuDPPhuc0sR0JZL1iRdJTJSa+JbvmnQ1cQ==", "bin": { "stencil": "bin/stencil" }, @@ -2425,9 +2425,9 @@ } }, "node_modules/ionicons": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.2.tgz", - "integrity": "sha512-I3iYIfc9Q9FRifWyFSwTAvbEABWlWY32i0sAVDDPGYnaIZVugkLCZFbEcrphW6ixVPg8tt1oLwalo/JJwbEqnA==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.3.tgz", + "integrity": "sha512-DtO85dgNAYFjshAiETdXQbw84Ztgy5Rb5HCWFAYpJWQ72OUNHJ7hSBlZAOaxNK4HoGljMMyT/jbMaCd3bpSLLw==", "dependencies": { "@stencil/core": "^4.0.3" } @@ -4057,9 +4057,9 @@ "dev": true }, "@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "requires": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -4163,11 +4163,11 @@ "requires": {} }, "@ionic/react": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/react/-/react-7.8.0.tgz", - "integrity": "sha512-OpP3WWnbD0cdP98afJk/Z6DmXk4t1ZBOLzZvBaNlRUMbnkTZOjt/PufCK+qvaPVGc2OKfKhv+XRckbx9uX5Few==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/react/-/react-7.8.1.tgz", + "integrity": "sha512-MJgmlsm69lvHiPBFHSUg9ZGbWyjfn5ZDUidYSE8oWA/L0Mtd7XqNl9DMlSXWy87jaOET96R72eSwgsAPZ+FEBA==", "requires": { - "@ionic/core": "7.8.0", + "@ionic/core": "7.8.1", "ionicons": "^7.0.0", "tslib": "*" } @@ -4304,9 +4304,9 @@ "optional": true }, "@stencil/core": { - "version": "4.12.6", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.12.6.tgz", - "integrity": "sha512-15JO2TdaxGVKNdLZb/2TtDa+juj3XGD/V0y/disgdzYYSnajgSh06nwODfdHz9eTUh1Hisz+KIo857I1rCZrfg==" + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.13.0.tgz", + "integrity": "sha512-gg+gtBWekQ08mDja8GVAUHNu+rrFhQaKZDvfhnS3l/5JbYiJddTimuDPPhuc0sR0JZL1iRdJTJSa+JbvmnQ1cQ==" }, "@types/estree": { "version": "1.0.4", @@ -5584,9 +5584,9 @@ } }, "ionicons": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.2.tgz", - "integrity": "sha512-I3iYIfc9Q9FRifWyFSwTAvbEABWlWY32i0sAVDDPGYnaIZVugkLCZFbEcrphW6ixVPg8tt1oLwalo/JJwbEqnA==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.3.tgz", + "integrity": "sha512-DtO85dgNAYFjshAiETdXQbw84Ztgy5Rb5HCWFAYpJWQ72OUNHJ7hSBlZAOaxNK4HoGljMMyT/jbMaCd3bpSLLw==", "requires": { "@stencil/core": "^4.0.3" } diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json index 58b6123bf1..9227689597 100644 --- a/packages/react/package-lock.json +++ b/packages/react/package-lock.json @@ -798,9 +798,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "dependencies": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -13035,9 +13035,9 @@ "dev": true }, "@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "requires": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", diff --git a/packages/vue-router/package-lock.json b/packages/vue-router/package-lock.json index 4daafaf59b..9803d466b0 100644 --- a/packages/vue-router/package-lock.json +++ b/packages/vue-router/package-lock.json @@ -661,9 +661,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "dependencies": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -852,11 +852,11 @@ } }, "node_modules/@ionic/vue": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.8.0.tgz", - "integrity": "sha512-IXOUO9SQHXU3Ec/9u6u2JPNcu9VL8jamvM+elzBam7e0GDSQ56cyYDRnptROBdfBYop2EGiNJvzjWxAuZnM6kw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.8.1.tgz", + "integrity": "sha512-jEOss4oslEB38ASaBsYNRMpkLq6IYWmmscHAR01reEBiLt1144SqxQ3y4mhgHBdAP7gZrULMFdVTDUdJdlSq9Q==", "dependencies": { - "@ionic/core": "7.8.0", + "@ionic/core": "7.8.1", "ionicons": "^7.0.0" } }, @@ -1508,9 +1508,9 @@ } }, "node_modules/@stencil/core": { - "version": "4.12.6", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.12.6.tgz", - "integrity": "sha512-15JO2TdaxGVKNdLZb/2TtDa+juj3XGD/V0y/disgdzYYSnajgSh06nwODfdHz9eTUh1Hisz+KIo857I1rCZrfg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.13.0.tgz", + "integrity": "sha512-gg+gtBWekQ08mDja8GVAUHNu+rrFhQaKZDvfhnS3l/5JbYiJddTimuDPPhuc0sR0JZL1iRdJTJSa+JbvmnQ1cQ==", "bin": { "stencil": "bin/stencil" }, @@ -4279,9 +4279,9 @@ } }, "node_modules/ionicons": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.2.tgz", - "integrity": "sha512-I3iYIfc9Q9FRifWyFSwTAvbEABWlWY32i0sAVDDPGYnaIZVugkLCZFbEcrphW6ixVPg8tt1oLwalo/JJwbEqnA==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.3.tgz", + "integrity": "sha512-DtO85dgNAYFjshAiETdXQbw84Ztgy5Rb5HCWFAYpJWQ72OUNHJ7hSBlZAOaxNK4HoGljMMyT/jbMaCd3bpSLLw==", "dependencies": { "@stencil/core": "^4.0.3" } @@ -7878,9 +7878,9 @@ "dev": true }, "@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "requires": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -7993,11 +7993,11 @@ "requires": {} }, "@ionic/vue": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.8.0.tgz", - "integrity": "sha512-IXOUO9SQHXU3Ec/9u6u2JPNcu9VL8jamvM+elzBam7e0GDSQ56cyYDRnptROBdfBYop2EGiNJvzjWxAuZnM6kw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-7.8.1.tgz", + "integrity": "sha512-jEOss4oslEB38ASaBsYNRMpkLq6IYWmmscHAR01reEBiLt1144SqxQ3y4mhgHBdAP7gZrULMFdVTDUdJdlSq9Q==", "requires": { - "@ionic/core": "7.8.0", + "@ionic/core": "7.8.1", "ionicons": "^7.0.0" } }, @@ -8461,9 +8461,9 @@ } }, "@stencil/core": { - "version": "4.12.6", - "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.12.6.tgz", - "integrity": "sha512-15JO2TdaxGVKNdLZb/2TtDa+juj3XGD/V0y/disgdzYYSnajgSh06nwODfdHz9eTUh1Hisz+KIo857I1rCZrfg==" + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-4.13.0.tgz", + "integrity": "sha512-gg+gtBWekQ08mDja8GVAUHNu+rrFhQaKZDvfhnS3l/5JbYiJddTimuDPPhuc0sR0JZL1iRdJTJSa+JbvmnQ1cQ==" }, "@tootallnate/once": { "version": "2.0.0", @@ -10515,9 +10515,9 @@ } }, "ionicons": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.2.tgz", - "integrity": "sha512-I3iYIfc9Q9FRifWyFSwTAvbEABWlWY32i0sAVDDPGYnaIZVugkLCZFbEcrphW6ixVPg8tt1oLwalo/JJwbEqnA==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-7.2.3.tgz", + "integrity": "sha512-DtO85dgNAYFjshAiETdXQbw84Ztgy5Rb5HCWFAYpJWQ72OUNHJ7hSBlZAOaxNK4HoGljMMyT/jbMaCd3bpSLLw==", "requires": { "@stencil/core": "^4.0.3" } diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index 790ef69290..3287500620 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -208,9 +208,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "dependencies": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -3959,9 +3959,9 @@ "dev": true }, "@ionic/core": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.0.tgz", - "integrity": "sha512-rogQw6lWH367E5XQnovbAIB4pT1YmuTz7OvyQm0cp4pO2/64faKyTGteSxc99stG01CoARW+pjJN1K09hfKFPw==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", + "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", "requires": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", From 8c578da8cbb301fa62c7ee0efd59a5abf56ed997 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 20 Mar 2024 09:53:33 -0400 Subject: [PATCH 3/4] chore: remove additional merge conflict markers --- packages/vue/package-lock.json | 12 ------------ packages/vue/package.json | 4 ---- 2 files changed, 16 deletions(-) diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index 07ff44c7e3..41ba1e8db7 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -208,15 +208,9 @@ "dev": true }, "node_modules/@ionic/core": { -<<<<<<< HEAD "version": "8.0.0-dev.11709632212.139b6f63", "resolved": "https://registry.npmjs.org/@ionic/core/-/core-8.0.0-dev.11709632212.139b6f63.tgz", "integrity": "sha512-NV/dwHkL+8TDT6cyslJoAJTEPD8Er+CEtA900DUZAe13Y5JntW4eWrH9uWKfhL4ZxAKaug/KdjoENXaa7TPc0A==", -======= - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", - "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", ->>>>>>> origin/main "dependencies": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", @@ -3965,15 +3959,9 @@ "dev": true }, "@ionic/core": { -<<<<<<< HEAD "version": "8.0.0-dev.11709632212.139b6f63", "resolved": "https://registry.npmjs.org/@ionic/core/-/core-8.0.0-dev.11709632212.139b6f63.tgz", "integrity": "sha512-NV/dwHkL+8TDT6cyslJoAJTEPD8Er+CEtA900DUZAe13Y5JntW4eWrH9uWKfhL4ZxAKaug/KdjoENXaa7TPc0A==", -======= - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-7.8.1.tgz", - "integrity": "sha512-SsoDy0HaifCcWBlcyRIpTceboz6tSg4gjNr/LRGJyg+r2bWdoG3jeuQDg0Affox8dar7QvODk3AWO/7RFWLOfg==", ->>>>>>> origin/main "requires": { "@stencil/core": "^4.12.2", "ionicons": "^7.2.2", diff --git a/packages/vue/package.json b/packages/vue/package.json index d7723eaa30..c331120a40 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -66,11 +66,7 @@ "vue-router": "^4.0.16" }, "dependencies": { -<<<<<<< HEAD "@ionic/core": "^8.0.0-beta.2", -======= - "@ionic/core": "^7.8.1", ->>>>>>> origin/main "ionicons": "^7.0.0" }, "vetur": { From cdcb2025c96ffd1eb5d367d124ca407f0cd85c5a Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 20 Mar 2024 09:54:50 -0400 Subject: [PATCH 4/4] chore(ci): use local version of lerna --- .github/workflows/actions/publish-npm/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions/publish-npm/action.yml b/.github/workflows/actions/publish-npm/action.yml index ede59d830a..f4f8d40e4d 100644 --- a/.github/workflows/actions/publish-npm/action.yml +++ b/.github/workflows/actions/publish-npm/action.yml @@ -32,11 +32,11 @@ runs: run: npm ci shell: bash - name: Install Dependencies - run: npx lerna bootstrap --include-dependencies --scope ${{ inputs.scope }} --ignore-scripts -- --legacy-peer-deps + run: ./node_modules/.bin/lerna bootstrap --include-dependencies --scope ${{ inputs.scope }} --ignore-scripts -- --legacy-peer-deps shell: bash working-directory: ${{ inputs.working-directory }} - name: Update Version - run: npx lerna version ${{ inputs.version }} --yes --exact --no-changelog --no-push --no-git-tag-version --preid=${{ inputs.preid }} + run: ./node_modules/.bin/lerna version ${{ inputs.version }} --yes --exact --no-changelog --no-push --no-git-tag-version --preid=${{ inputs.preid }} shell: bash working-directory: ${{ inputs.working-directory }} - name: Run Build