From 448e3fc3850f4c704e27caba52ef6c96e7a676e1 Mon Sep 17 00:00:00 2001 From: ionitron Date: Wed, 12 Oct 2022 12:40:53 +0000 Subject: [PATCH 01/12] v6.3.1 --- CHANGELOG.md | 14 ++++++++++++++ angular/CHANGELOG.md | 8 ++++++++ angular/package-lock.json | 6 +++--- angular/package.json | 4 ++-- core/CHANGELOG.md | 14 ++++++++++++++ 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/react-router/CHANGELOG.md | 8 ++++++++ packages/react-router/package-lock.json | 6 +++--- packages/react-router/package.json | 4 ++-- packages/react/CHANGELOG.md | 8 ++++++++ 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, 121 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76387c44a8..6a91431cd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.3.1](https://github.com/ionic-team/ionic-framework/compare/v6.3.0...v6.3.1) (2022-10-12) + + +### Bug Fixes + +* **datetime:** setting date async updates calendar grid ([#26070](https://github.com/ionic-team/ionic-framework/issues/26070)) ([0aee328](https://github.com/ionic-team/ionic-framework/commit/0aee328b4b84d5668752e5ae0792334d0173c2bb)), closes [#25776](https://github.com/ionic-team/ionic-framework/issues/25776) +* **datetime:** setting max/min does not increase number of nodes rendered ([#26065](https://github.com/ionic-team/ionic-framework/issues/26065)) ([a5d178f](https://github.com/ionic-team/ionic-framework/commit/a5d178f4c03a0ad2501095afe1f75914b0462ae1)), closes [#26059](https://github.com/ionic-team/ionic-framework/issues/26059) +* **item, card:** aria-label is reflected to the inner button ([#26028](https://github.com/ionic-team/ionic-framework/issues/26028)) ([3c89ebe](https://github.com/ionic-team/ionic-framework/commit/3c89ebe7216b2a19580a4f1ed23d5d1d4c37919d)), closes [#25885](https://github.com/ionic-team/ionic-framework/issues/25885) +* **toolbar:** MD height only applies to MD segment ([#26042](https://github.com/ionic-team/ionic-framework/issues/26042)) ([ab89679](https://github.com/ionic-team/ionic-framework/commit/ab8967936c6bef5fc0a884cb8bf8f2deb7784c13)), closes [#18617](https://github.com/ionic-team/ionic-framework/issues/18617) + + + + + # [6.3.0](https://github.com/ionic-team/ionic-framework/compare/v6.2.9...v6.3.0) (2022-10-05) diff --git a/angular/CHANGELOG.md b/angular/CHANGELOG.md index 697c10ab7e..807ace0c0a 100644 --- a/angular/CHANGELOG.md +++ b/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. +## [6.3.1](https://github.com/ionic-team/ionic/compare/v6.3.0...v6.3.1) (2022-10-12) + +**Note:** Version bump only for package @ionic/angular + + + + + # [6.3.0 Manganese](https://github.com/ionic-team/ionic/compare/v6.2.9...v6.3.0) (2022-10-05) diff --git a/angular/package-lock.json b/angular/package-lock.json index cb89c58b16..fc2723e6a3 100644 --- a/angular/package-lock.json +++ b/angular/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/angular", - "version": "6.3.0", + "version": "6.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular", - "version": "6.3.0", + "version": "6.3.1", "license": "MIT", "dependencies": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "jsonc-parser": "^3.0.0", "tslib": "^2.0.0" }, diff --git a/angular/package.json b/angular/package.json index b448328115..ee635a6706 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "6.3.0", + "version": "6.3.1", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -45,7 +45,7 @@ "validate": "npm i && npm run lint && npm run test && npm run build" }, "dependencies": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "jsonc-parser": "^3.0.0", "tslib": "^2.0.0" }, diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index ce6056b335..3ddbba9518 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.3.1](https://github.com/ionic-team/ionic/compare/v6.3.0...v6.3.1) (2022-10-12) + + +### Bug Fixes + +* **datetime:** setting date async updates calendar grid ([#26070](https://github.com/ionic-team/ionic/issues/26070)) ([0aee328](https://github.com/ionic-team/ionic/commit/0aee328b4b84d5668752e5ae0792334d0173c2bb)), closes [#25776](https://github.com/ionic-team/ionic/issues/25776) +* **datetime:** setting max/min does not increase number of nodes rendered ([#26065](https://github.com/ionic-team/ionic/issues/26065)) ([a5d178f](https://github.com/ionic-team/ionic/commit/a5d178f4c03a0ad2501095afe1f75914b0462ae1)), closes [#26059](https://github.com/ionic-team/ionic/issues/26059) +* **item, card:** aria-label is reflected to the inner button ([#26028](https://github.com/ionic-team/ionic/issues/26028)) ([3c89ebe](https://github.com/ionic-team/ionic/commit/3c89ebe7216b2a19580a4f1ed23d5d1d4c37919d)), closes [#25885](https://github.com/ionic-team/ionic/issues/25885) +* **toolbar:** MD height only applies to MD segment ([#26042](https://github.com/ionic-team/ionic/issues/26042)) ([ab89679](https://github.com/ionic-team/ionic/commit/ab8967936c6bef5fc0a884cb8bf8f2deb7784c13)), closes [#18617](https://github.com/ionic-team/ionic/issues/18617) + + + + + # [6.3.0](https://github.com/ionic-team/ionic/compare/v6.2.9...v6.3.0) (2022-10-05) diff --git a/core/package-lock.json b/core/package-lock.json index 051a54ad3b..b88d9b21db 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/core", - "version": "6.3.0", + "version": "6.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/core", - "version": "6.3.0", + "version": "6.3.1", "license": "MIT", "dependencies": { "@stencil/core": "^2.18.0", diff --git a/core/package.json b/core/package.json index 0794cf819c..3242725f89 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "6.3.0", + "version": "6.3.1", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 5b629a8264..857d6a1f51 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. +## [6.3.1](https://github.com/ionic-team/ionic-docs/compare/v6.3.0...v6.3.1) (2022-10-12) + +**Note:** Version bump only for package @ionic/docs + + + + + # [6.3.0](https://github.com/ionic-team/ionic-docs/compare/v6.2.9...v6.3.0) (2022-10-05) **Note:** Version bump only for package @ionic/docs diff --git a/docs/package-lock.json b/docs/package-lock.json index c3b5515370..449885a1fa 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/docs", - "version": "6.3.0", + "version": "6.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/docs", - "version": "6.3.0", + "version": "6.3.1", "license": "MIT" } } diff --git a/docs/package.json b/docs/package.json index 89ebbe3b72..609f6871ed 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "6.3.0", + "version": "6.3.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 15befd726c..4f05ea097b 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ "angular", "packages/*" ], - "version": "6.3.0" + "version": "6.3.1" } diff --git a/packages/angular-server/CHANGELOG.md b/packages/angular-server/CHANGELOG.md index ce47d3838f..afa7daeb62 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. +## [6.3.1](https://github.com/ionic-team/ionic/compare/v6.3.0...v6.3.1) (2022-10-12) + +**Note:** Version bump only for package @ionic/angular-server + + + + + # [6.3.0](https://github.com/ionic-team/ionic/compare/v6.2.9...v6.3.0) (2022-10-05) **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 02ca4e18ea..a2e94c6f37 100644 --- a/packages/angular-server/package-lock.json +++ b/packages/angular-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/angular-server", - "version": "6.3.0", + "version": "6.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular-server", - "version": "6.3.0", + "version": "6.3.1", "license": "MIT", "devDependencies": { "@angular-eslint/eslint-plugin": "^12.6.1", @@ -18,7 +18,7 @@ "@angular/platform-browser": "^12.0.0", "@angular/platform-browser-dynamic": "^12.2.10", "@angular/platform-server": "^12.0.0", - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "@ionic/eslint-config": "^0.3.0", "@ionic/prettier-config": "^2.0.0", "@typescript-eslint/eslint-plugin": "^5.2.0", diff --git a/packages/angular-server/package.json b/packages/angular-server/package.json index d55767c805..b42f04242f 100644 --- a/packages/angular-server/package.json +++ b/packages/angular-server/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular-server", - "version": "6.3.0", + "version": "6.3.1", "description": "Angular SSR Module for Ionic", "keywords": [ "ionic", @@ -56,7 +56,7 @@ "@angular/platform-browser": "^12.0.0", "@angular/platform-browser-dynamic": "^12.2.10", "@angular/platform-server": "^12.0.0", - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "@ionic/eslint-config": "^0.3.0", "@ionic/prettier-config": "^2.0.0", "@typescript-eslint/eslint-plugin": "^5.2.0", diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md index fed5ea226d..b9fc5d39b3 100644 --- a/packages/react-router/CHANGELOG.md +++ b/packages/react-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. +## [6.3.1](https://github.com/ionic-team/ionic/compare/v6.3.0...v6.3.1) (2022-10-12) + +**Note:** Version bump only for package @ionic/react-router + + + + + # [6.3.0](https://github.com/ionic-team/ionic/compare/v6.2.9...v6.3.0) (2022-10-05) **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 e8339cda2e..9ae0975c1a 100644 --- a/packages/react-router/package-lock.json +++ b/packages/react-router/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/react-router", - "version": "6.3.0", + "version": "6.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/react-router", - "version": "6.3.0", + "version": "6.3.1", "license": "MIT", "dependencies": { - "@ionic/react": "^6.3.0", + "@ionic/react": "^6.3.1", "tslib": "*" }, "devDependencies": { diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 7cc02b444c..0ea8fa77b3 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react-router", - "version": "6.3.0", + "version": "6.3.1", "description": "React Router wrapper for @ionic/react", "keywords": [ "ionic", @@ -37,7 +37,7 @@ "dist/" ], "dependencies": { - "@ionic/react": "^6.3.0", + "@ionic/react": "^6.3.1", "tslib": "*" }, "peerDependencies": { diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 26aa3d1cbe..aef2f54ba8 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/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. +## [6.3.1](https://github.com/ionic-team/ionic/compare/v6.3.0...v6.3.1) (2022-10-12) + +**Note:** Version bump only for package @ionic/react + + + + + # [6.3.0](https://github.com/ionic-team/ionic/compare/v6.2.9...v6.3.0) (2022-10-05) **Note:** Version bump only for package @ionic/react diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json index 50e5efc329..71e54c83a4 100644 --- a/packages/react/package-lock.json +++ b/packages/react/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/react", - "version": "6.3.0", + "version": "6.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/react", - "version": "6.3.0", + "version": "6.3.1", "license": "MIT", "dependencies": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "ionicons": "^6.0.2", "tslib": "*" }, diff --git a/packages/react/package.json b/packages/react/package.json index 1f0a5558ad..831e4d5b6a 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react", - "version": "6.3.0", + "version": "6.3.1", "description": "React specific wrapper for @ionic/core", "keywords": [ "ionic", @@ -41,7 +41,7 @@ "css/" ], "dependencies": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "ionicons": "^6.0.2", "tslib": "*" }, diff --git a/packages/vue-router/CHANGELOG.md b/packages/vue-router/CHANGELOG.md index b7516c072d..70bc3aec46 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. +## [6.3.1](https://github.com/ionic-team/ionic/compare/v6.3.0...v6.3.1) (2022-10-12) + +**Note:** Version bump only for package @ionic/vue-router + + + + + # [6.3.0](https://github.com/ionic-team/ionic/compare/v6.2.9...v6.3.0) (2022-10-05) **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 ef206e0c50..72122d197f 100644 --- a/packages/vue-router/package-lock.json +++ b/packages/vue-router/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/vue-router", - "version": "6.3.0", + "version": "6.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue-router", - "version": "6.3.0", + "version": "6.3.1", "license": "MIT", "dependencies": { - "@ionic/vue": "^6.3.0" + "@ionic/vue": "^6.3.1" }, "devDependencies": { "@types/jest": "^28.1.1", diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index 141ffdbc5e..f990db60a5 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue-router", - "version": "6.3.0", + "version": "6.3.1", "description": "Vue Router integration for @ionic/vue", "scripts": { "prepublishOnly": "npm run build", @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/ionic-team/ionic#readme", "dependencies": { - "@ionic/vue": "^6.3.0" + "@ionic/vue": "^6.3.1" }, "devDependencies": { "@types/jest": "^28.1.1", diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index 69bcc63a46..970c628a58 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. +## [6.3.1](https://github.com/ionic-team/ionic/compare/v6.3.0...v6.3.1) (2022-10-12) + +**Note:** Version bump only for package @ionic/vue + + + + + # [6.3.0](https://github.com/ionic-team/ionic/compare/v6.2.9...v6.3.0) (2022-10-05) diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index fd383c0482..9db944a29c 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/vue", - "version": "6.3.0", + "version": "6.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue", - "version": "6.3.0", + "version": "6.3.1", "license": "MIT", "dependencies": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "ionicons": "^6.0.2" }, "devDependencies": { diff --git a/packages/vue/package.json b/packages/vue/package.json index 0fcd063f01..91632f5182 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue", - "version": "6.3.0", + "version": "6.3.1", "description": "Vue specific wrapper for @ionic/core", "scripts": { "prepublishOnly": "npm run build", @@ -61,7 +61,7 @@ "vue-router": "^4.0.16" }, "dependencies": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "ionicons": "^6.0.2" }, "vetur": { From 01840741ce7e9f1821d2dce9f0840024c690e4d7 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 12 Oct 2022 14:12:17 +0000 Subject: [PATCH 02/12] chore(): bump package-lock files --- angular/package-lock.json | 12 +++++----- packages/angular-server/package-lock.json | 12 +++++----- packages/react-router/package-lock.json | 28 +++++++++++------------ packages/react/package-lock.json | 12 +++++----- packages/vue-router/package-lock.json | 28 +++++++++++------------ packages/vue/package-lock.json | 12 +++++----- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/angular/package-lock.json b/angular/package-lock.json index fc2723e6a3..1f8a11585d 100644 --- a/angular/package-lock.json +++ b/angular/package-lock.json @@ -1023,9 +1023,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "dependencies": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", @@ -7951,9 +7951,9 @@ "dev": true }, "@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "requires": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", diff --git a/packages/angular-server/package-lock.json b/packages/angular-server/package-lock.json index a2e94c6f37..9bff20fea0 100644 --- a/packages/angular-server/package-lock.json +++ b/packages/angular-server/package-lock.json @@ -786,9 +786,9 @@ "license": "BSD-3-Clause" }, "node_modules/@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "dev": true, "dependencies": { "@stencil/core": "^2.18.0", @@ -7116,9 +7116,9 @@ "dev": true }, "@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "dev": true, "requires": { "@stencil/core": "^2.18.0", diff --git a/packages/react-router/package-lock.json b/packages/react-router/package-lock.json index 9ae0975c1a..989438686e 100644 --- a/packages/react-router/package-lock.json +++ b/packages/react-router/package-lock.json @@ -147,9 +147,9 @@ } }, "node_modules/@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "dependencies": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", @@ -157,11 +157,11 @@ } }, "node_modules/@ionic/react": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.3.0.tgz", - "integrity": "sha512-h84M4HnhopKA7+vfnmB6zoOGJbun74LP1XtXluGi15Bi/buXCeBtHdgLunzLW50G/JMI6QvksyyQa/bhgRI+Eg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.3.1.tgz", + "integrity": "sha512-8Omxifn+b6wXjfm/+OH+AzKpFsR7xn0u8dxaAKeT66txh4fA7DBMgzEPBOe5+VvWarWI6B7cElX/7Xq8qJNwbw==", "dependencies": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "ionicons": "^6.0.2", "tslib": "*" }, @@ -1157,9 +1157,9 @@ } }, "@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "requires": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", @@ -1167,11 +1167,11 @@ } }, "@ionic/react": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.3.0.tgz", - "integrity": "sha512-h84M4HnhopKA7+vfnmB6zoOGJbun74LP1XtXluGi15Bi/buXCeBtHdgLunzLW50G/JMI6QvksyyQa/bhgRI+Eg==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/react/-/react-6.3.1.tgz", + "integrity": "sha512-8Omxifn+b6wXjfm/+OH+AzKpFsR7xn0u8dxaAKeT66txh4fA7DBMgzEPBOe5+VvWarWI6B7cElX/7Xq8qJNwbw==", "requires": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "ionicons": "^6.0.2", "tslib": "*" } diff --git a/packages/react/package-lock.json b/packages/react/package-lock.json index 71e54c83a4..55958a634e 100644 --- a/packages/react/package-lock.json +++ b/packages/react/package-lock.json @@ -607,9 +607,9 @@ } }, "node_modules/@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "dependencies": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", @@ -9534,9 +9534,9 @@ } }, "@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "requires": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", diff --git a/packages/vue-router/package-lock.json b/packages/vue-router/package-lock.json index 72122d197f..a00addca22 100644 --- a/packages/vue-router/package-lock.json +++ b/packages/vue-router/package-lock.json @@ -578,9 +578,9 @@ "dev": true }, "node_modules/@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "dependencies": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", @@ -588,11 +588,11 @@ } }, "node_modules/@ionic/vue": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.0.tgz", - "integrity": "sha512-9D7bK8xZ/qa6gWShgvBRCFSmwkZBN7RkJF1ItmNQXl1msszRjqi7W/++AsTjjGmqpWbupNkwwxZWP7IzN7vcjA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.1.tgz", + "integrity": "sha512-QFPF9Pshg4Ns3UDrbA+vGA1QyadIvW0r1Gct6Rv9S/eAfHMOXfAiaIqUgTy0BrFjcR+VCgiCZzg1atEvU0XvyA==", "dependencies": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "ionicons": "^6.0.2" } }, @@ -5233,9 +5233,9 @@ "dev": true }, "@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "requires": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", @@ -5243,11 +5243,11 @@ } }, "@ionic/vue": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.0.tgz", - "integrity": "sha512-9D7bK8xZ/qa6gWShgvBRCFSmwkZBN7RkJF1ItmNQXl1msszRjqi7W/++AsTjjGmqpWbupNkwwxZWP7IzN7vcjA==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.1.tgz", + "integrity": "sha512-QFPF9Pshg4Ns3UDrbA+vGA1QyadIvW0r1Gct6Rv9S/eAfHMOXfAiaIqUgTy0BrFjcR+VCgiCZzg1atEvU0XvyA==", "requires": { - "@ionic/core": "^6.3.0", + "@ionic/core": "^6.3.1", "ionicons": "^6.0.2" } }, diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index 9db944a29c..d24d676411 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -59,9 +59,9 @@ } }, "node_modules/@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "dependencies": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", @@ -768,9 +768,9 @@ } }, "@ionic/core": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.0.tgz", - "integrity": "sha512-6MR0hOdIM6sQyZyXez3/jWAnHScrZKaQxzGT2XiXXIpBrKztNdeAhqDLXoxbDU1PLyDnXXPWBzT6xZ698gG67g==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.1.tgz", + "integrity": "sha512-OpmGQQ/sGtoXW4PQRvRjYa9mTlAmAWwFMu8g/1rcdAPaTQQAlRnfZ62wYYqmChLSFlVbn6mCleeljzR9FaYrAg==", "requires": { "@stencil/core": "^2.18.0", "ionicons": "^6.0.3", From 61cc278f0598c9b4d5fdfc33a04ba4073c95d918 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 12 Oct 2022 14:12:40 +0000 Subject: [PATCH 03/12] chore(ci): release script bumps package-lock files --- .github/workflows/release.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5a2a7d9ce..4d5000ea4b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,6 +55,15 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash + # Lerna does not automatically bump versions + # of Ionic dependencies that have changed, + # so we do that here. + - name: Bump Package Lock + run: | + lerna exec "npm install --package-lock-only --legacy-peer-deps" + git add . + git commit -m "chore(): update package lock files" + git push # Purge the JSDeliver CDN cache so # component playgrounds always load # the latest version of Ionic. From ff6df69a678feeb195ca6976d354ff14daf478da Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 12 Oct 2022 17:25:32 -0500 Subject: [PATCH 04/12] chore(core): lint.fix command now runs prettier (#26114) --- core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/package.json b/core/package.json index 3242725f89..43b63719e8 100644 --- a/core/package.json +++ b/core/package.json @@ -86,7 +86,7 @@ "css.sass": "sass --embed-sources src/css:./css", "eslint": "eslint src", "lint": "npm run lint.ts && npm run lint.sass && npm run prettier -- --write", - "lint.fix": "npm run lint.ts.fix && npm run lint.sass.fix", + "lint.fix": "npm run lint.ts.fix && npm run lint.sass.fix && npm run prettier -- --write", "lint.sass": "stylelint \"src/**/*.scss\"", "lint.sass.fix": "npm run lint.sass -- --fix", "lint.ts": "npm run eslint", From 256b03f12a57c2b5904d9017e4fa93b11eea8fc7 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 13 Oct 2022 08:58:06 -0500 Subject: [PATCH 05/12] fix(modal): sheet modal dismisses correctly (#26110) resolves #26108 --- core/src/components/modal/modal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/components/modal/modal.tsx b/core/src/components/modal/modal.tsx index 502d502eec..5ad51aefb3 100644 --- a/core/src/components/modal/modal.tsx +++ b/core/src/components/modal/modal.tsx @@ -708,7 +708,7 @@ export class Modal implements ComponentInterface, OverlayInterface { this.currentTransition = dismiss(this, data, role, 'modalLeave', iosLeaveAnimation, mdLeaveAnimation, { presentingEl: this.presentingElement, - currentBreakpoint: this.currentBreakpoint !== undefined || this.initialBreakpoint, + currentBreakpoint: this.currentBreakpoint ?? this.initialBreakpoint, backdropBreakpoint: this.backdropBreakpoint, }); From 04df45a443e4faeea644daa76dc509fea0d24ca2 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 13 Oct 2022 11:17:21 -0500 Subject: [PATCH 06/12] fix(datetime): header renders correct date (#26120) resolves #26116 --- core/src/components/datetime/datetime.tsx | 4 ++-- .../datetime/test/multiple/datetime.e2e.ts | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/core/src/components/datetime/datetime.tsx b/core/src/components/datetime/datetime.tsx index a78bf569b8..dc68c86a07 100644 --- a/core/src/components/datetime/datetime.tsx +++ b/core/src/components/datetime/datetime.tsx @@ -2112,11 +2112,11 @@ export class Datetime implements ComponentInterface { return; } - const { activeParts, titleSelectedDatesFormatter } = this; + const { activeParts, multiple, titleSelectedDatesFormatter } = this; const isArray = Array.isArray(activeParts); let headerText: string; - if (isArray && activeParts.length !== 1) { + if (multiple && isArray && activeParts.length !== 1) { headerText = `${activeParts.length} days`; // default/fallback for multiple selection if (titleSelectedDatesFormatter !== undefined) { try { diff --git a/core/src/components/datetime/test/multiple/datetime.e2e.ts b/core/src/components/datetime/test/multiple/datetime.e2e.ts index e5d65c1756..c4bbb968b3 100644 --- a/core/src/components/datetime/test/multiple/datetime.e2e.ts +++ b/core/src/components/datetime/test/multiple/datetime.e2e.ts @@ -189,4 +189,28 @@ test.describe('datetime: multiple date selection (functionality)', () => { await juneButtons.nth(0).click(); await expect(header).toHaveText('Selected: 0'); }); + + test('header text should render default date when multiple="false"', async ({ page }) => { + await page.setContent(` + + + + `); + await page.waitForSelector(`.datetime-ready`); + const datetime = page.locator('ion-datetime'); + const header = datetime.locator('.datetime-selected-date'); + + await expect(header).toHaveText('Mon, Oct 10'); + }); }); From 5e4892676cb8e51b7297f1d691b7b7c53c018916 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 13 Oct 2022 12:04:01 -0500 Subject: [PATCH 07/12] chore(ci): update actions versions (#26100) --- .../actions/build-angular-server/action.yml | 2 +- .../actions/build-angular/action.yml | 6 ++-- .../workflows/actions/build-core/action.yml | 6 ++-- .../actions/build-react-router/action.yml | 4 +-- .../workflows/actions/build-react/action.yml | 4 +-- .../actions/build-vue-router/action.yml | 4 +-- .../workflows/actions/build-vue/action.yml | 4 +-- .../actions/download-archive/action.yml | 2 +- .../actions/test-angular-e2e/action.yml | 4 +-- .../actions/test-core-clean-build/action.yml | 2 +- .../actions/test-core-e2e/action.yml | 4 +-- .../actions/test-core-lint/action.yml | 4 +-- .../actions/test-core-screenshot/action.yml | 6 ++-- .../actions/test-core-spec/action.yml | 4 +-- .../actions/test-react-e2e/action.yml | 4 +-- .../actions/test-react-router-e2e/action.yml | 4 +-- .../workflows/actions/test-vue-e2e/action.yml | 4 +-- .../update-reference-screenshots/action.yml | 4 +-- .../actions/upload-archive/action.yml | 2 +- .github/workflows/build.yml | 32 +++++++++---------- .github/workflows/dev-build.yml | 4 +-- .github/workflows/nightly.yml | 4 +-- .github/workflows/pre-release.yml | 4 +-- .github/workflows/release.yml | 4 +-- .github/workflows/update-screenshots.yml | 6 ++-- 25 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.github/workflows/actions/build-angular-server/action.yml b/.github/workflows/actions/build-angular-server/action.yml index 6f848ee1b6..ba08574ec3 100644 --- a/.github/workflows/actions/build-angular-server/action.yml +++ b/.github/workflows/actions/build-angular-server/action.yml @@ -3,7 +3,7 @@ description: 'Build Ionic Angular Server' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x diff --git a/.github/workflows/actions/build-angular/action.yml b/.github/workflows/actions/build-angular/action.yml index d0ad69b38b..6a7f553b9b 100644 --- a/.github/workflows/actions/build-angular/action.yml +++ b/.github/workflows/actions/build-angular/action.yml @@ -3,19 +3,19 @@ description: 'Build Ionic Angular' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: path: ./core/node_modules key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./core/package-lock.json')}}-v2 - name: Cache Angular Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: angular-node-modules with: diff --git a/.github/workflows/actions/build-core/action.yml b/.github/workflows/actions/build-core/action.yml index 06a8e6e89f..1b23b8e20e 100644 --- a/.github/workflows/actions/build-core/action.yml +++ b/.github/workflows/actions/build-core/action.yml @@ -3,16 +3,16 @@ description: 'Build Ionic Core' runs: using: 'composite' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # Checkout the latest commit in this branch ref: ${{ github.event.pull_request.head.sha }} - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/build-react-router/action.yml b/.github/workflows/actions/build-react-router/action.yml index 318024f878..d7780cf7c7 100644 --- a/.github/workflows/actions/build-react-router/action.yml +++ b/.github/workflows/actions/build-react-router/action.yml @@ -3,12 +3,12 @@ description: 'Build Ionic React Router' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/build-react/action.yml b/.github/workflows/actions/build-react/action.yml index e457a3c71d..358ac39cf5 100644 --- a/.github/workflows/actions/build-react/action.yml +++ b/.github/workflows/actions/build-react/action.yml @@ -3,12 +3,12 @@ description: 'Build Ionic React' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/build-vue-router/action.yml b/.github/workflows/actions/build-vue-router/action.yml index ea77812675..cd1e135a32 100644 --- a/.github/workflows/actions/build-vue-router/action.yml +++ b/.github/workflows/actions/build-vue-router/action.yml @@ -3,12 +3,12 @@ description: 'Builds Ionic Vue Router' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/build-vue/action.yml b/.github/workflows/actions/build-vue/action.yml index 5da64ef981..b098994ef4 100644 --- a/.github/workflows/actions/build-vue/action.yml +++ b/.github/workflows/actions/build-vue/action.yml @@ -3,12 +3,12 @@ description: 'Build Ionic Vue' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/download-archive/action.yml b/.github/workflows/actions/download-archive/action.yml index eaa9cb951f..736a484333 100644 --- a/.github/workflows/actions/download-archive/action.yml +++ b/.github/workflows/actions/download-archive/action.yml @@ -10,7 +10,7 @@ inputs: runs: using: 'composite' steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: ${{ inputs.name }} path: ${{ inputs.path }} diff --git a/.github/workflows/actions/test-angular-e2e/action.yml b/.github/workflows/actions/test-angular-e2e/action.yml index 3741f170b9..e31fca88c9 100644 --- a/.github/workflows/actions/test-angular-e2e/action.yml +++ b/.github/workflows/actions/test-angular-e2e/action.yml @@ -6,12 +6,12 @@ inputs: runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16 - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/test-core-clean-build/action.yml b/.github/workflows/actions/test-core-clean-build/action.yml index 91a43f320d..f7b55d7465 100644 --- a/.github/workflows/actions/test-core-clean-build/action.yml +++ b/.github/workflows/actions/test-core-clean-build/action.yml @@ -3,7 +3,7 @@ description: 'Test Core Clean Build' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x diff --git a/.github/workflows/actions/test-core-e2e/action.yml b/.github/workflows/actions/test-core-e2e/action.yml index a7f3d67c12..d4c4a5bd53 100644 --- a/.github/workflows/actions/test-core-e2e/action.yml +++ b/.github/workflows/actions/test-core-e2e/action.yml @@ -3,12 +3,12 @@ description: 'Test Core E2E' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/test-core-lint/action.yml b/.github/workflows/actions/test-core-lint/action.yml index 2907acc38d..3cf7deea64 100644 --- a/.github/workflows/actions/test-core-lint/action.yml +++ b/.github/workflows/actions/test-core-lint/action.yml @@ -3,12 +3,12 @@ description: 'Test Core Lint' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/test-core-screenshot/action.yml b/.github/workflows/actions/test-core-screenshot/action.yml index fa75157b75..3ca1e01de6 100644 --- a/.github/workflows/actions/test-core-screenshot/action.yml +++ b/.github/workflows/actions/test-core-screenshot/action.yml @@ -10,12 +10,12 @@ inputs: runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: @@ -72,7 +72,7 @@ runs: working-directory: ./core - name: Archive Updated Screenshots if: inputs.update == 'true' && steps.test-and-update.outputs.hasUpdatedScreenshots == 'true' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: updated-screenshots-${{ inputs.shard }}-${{ inputs.totalShards }} path: UpdatedScreenshots-${{ inputs.shard }}-${{ inputs.totalShards }}.zip diff --git a/.github/workflows/actions/test-core-spec/action.yml b/.github/workflows/actions/test-core-spec/action.yml index 2b0995fdc9..813a300031 100644 --- a/.github/workflows/actions/test-core-spec/action.yml +++ b/.github/workflows/actions/test-core-spec/action.yml @@ -3,12 +3,12 @@ description: 'Test Core Spec' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/test-react-e2e/action.yml b/.github/workflows/actions/test-react-e2e/action.yml index 0bbaf8240c..7eb73985c6 100644 --- a/.github/workflows/actions/test-react-e2e/action.yml +++ b/.github/workflows/actions/test-react-e2e/action.yml @@ -3,12 +3,12 @@ description: 'Test React E2E' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/test-react-router-e2e/action.yml b/.github/workflows/actions/test-react-router-e2e/action.yml index ab44fc7a19..047c8434c5 100644 --- a/.github/workflows/actions/test-react-router-e2e/action.yml +++ b/.github/workflows/actions/test-react-router-e2e/action.yml @@ -3,12 +3,12 @@ description: 'Test React Router ' runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/test-vue-e2e/action.yml b/.github/workflows/actions/test-vue-e2e/action.yml index d71a52864d..8452420f54 100644 --- a/.github/workflows/actions/test-vue-e2e/action.yml +++ b/.github/workflows/actions/test-vue-e2e/action.yml @@ -6,12 +6,12 @@ inputs: runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - name: Cache Core Node Modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: core-node-modules with: diff --git a/.github/workflows/actions/update-reference-screenshots/action.yml b/.github/workflows/actions/update-reference-screenshots/action.yml index 3bd005fb47..008fca9b61 100644 --- a/.github/workflows/actions/update-reference-screenshots/action.yml +++ b/.github/workflows/actions/update-reference-screenshots/action.yml @@ -7,10 +7,10 @@ on: runs: using: 'composite' steps: - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v3 with: node-version: 16.x - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: path: ./artifacts - name: Extract Archives diff --git a/.github/workflows/actions/upload-archive/action.yml b/.github/workflows/actions/upload-archive/action.yml index 08349ceba3..45b272b261 100644 --- a/.github/workflows/actions/upload-archive/action.yml +++ b/.github/workflows/actions/upload-archive/action.yml @@ -13,7 +13,7 @@ runs: - name: Create Archive run: zip -q -r ${{ inputs.output }} ${{ inputs.paths }} shell: bash - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: ${{ inputs.name }} path: ${{ inputs.output }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 166231c01a..9d36623e48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: build-core: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # Checkout the latest commit in this branch ref: ${{ github.event.pull_request.head.sha }} @@ -25,28 +25,28 @@ jobs: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-core-clean-build test-core-lint: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-core-lint test-core-spec: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-core-spec test-core-e2e: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-core-e2e test-core-screenshot: @@ -67,7 +67,7 @@ jobs: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-core-screenshot with: shard: ${{ matrix.shard }} @@ -95,14 +95,14 @@ jobs: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/build-vue build-vue-router: needs: [build-vue] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/build-vue-router test-vue-e2e: @@ -113,7 +113,7 @@ jobs: needs: [build-vue, build-vue-router] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-vue-e2e with: app: ${{ matrix.apps }} @@ -131,14 +131,14 @@ jobs: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/build-angular build-angular-server: needs: [build-angular] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/build-angular-server test-angular-e2e: @@ -149,7 +149,7 @@ jobs: needs: [build-angular, build-angular-server] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-angular-e2e with: app: ${{ matrix.apps }} @@ -167,26 +167,26 @@ jobs: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/build-react build-react-router: needs: [build-react] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/build-react-router test-react-router-e2e: needs: [build-react, build-react-router] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-react-router-e2e test-react-e2e: needs: [build-react, build-react-router] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-react-e2e diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 5f4d222d7b..1a9ae81419 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -9,8 +9,8 @@ jobs: outputs: version: ${{ steps.dev-build.outputs.version }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: 16 - name: Install Dependencies diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 39096fd906..15f28ca526 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -10,10 +10,10 @@ jobs: nightly-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 16 - name: Install Dependencies diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 9b69df29d4..735697d71b 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -25,8 +25,8 @@ jobs: build-ionic: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: 16 - name: Configure Identity diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d5000ea4b..75b4d4902d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,11 +24,11 @@ jobs: build-ionic: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: ${{ secrets.IONITRON_TOKEN }} fetch-depth: 0 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: 16 - name: Configure Identity diff --git a/.github/workflows/update-screenshots.yml b/.github/workflows/update-screenshots.yml index d8c65a6417..7ff2c49901 100644 --- a/.github/workflows/update-screenshots.yml +++ b/.github/workflows/update-screenshots.yml @@ -7,7 +7,7 @@ jobs: build-core: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/build-core test-core-screenshot: @@ -28,7 +28,7 @@ jobs: needs: [build-core] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ./.github/workflows/actions/test-core-screenshot with: shard: ${{ matrix.shard }} @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest needs: [test-core-screenshot] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # Normally, we could just push with the # default GITHUB_TOKEN, but that will # not cause the build workflow From d60973b2449b29a982b752a98b10d2b043ecff2f Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 13 Oct 2022 12:35:15 -0500 Subject: [PATCH 08/12] fix(vue): routing components define child components (#26107) --- packages/vue/src/components/IonApp.ts | 5 ++--- packages/vue/src/components/IonBackButton.ts | 7 ++----- packages/vue/src/components/IonIcon.ts | 5 ++--- packages/vue/src/components/IonNav.ts | 5 ++--- packages/vue/src/components/IonRouterOutlet.ts | 6 +++--- packages/vue/src/components/IonTabBar.ts | 5 ++--- packages/vue/src/components/IonTabButton.ts | 5 ++--- packages/vue/src/utils.ts | 8 -------- 8 files changed, 15 insertions(+), 31 deletions(-) diff --git a/packages/vue/src/components/IonApp.ts b/packages/vue/src/components/IonApp.ts index 9dc4771760..3355a662c3 100644 --- a/packages/vue/src/components/IonApp.ts +++ b/packages/vue/src/components/IonApp.ts @@ -1,10 +1,9 @@ import { h, defineComponent, shallowRef, VNode } from 'vue'; -import { defineCustomElement } from '../utils'; -import { IonApp as IonAppCmp } from '@ionic/core/components/ion-app.js'; +import { defineCustomElement } from '@ionic/core/components/ion-app.js'; const userComponents = shallowRef([]); export const IonApp = /*@__PURE__*/ defineComponent((_, { attrs, slots }) => { - defineCustomElement('ion-app', IonAppCmp); + defineCustomElement(); return () => { return h( 'ion-app', diff --git a/packages/vue/src/components/IonBackButton.ts b/packages/vue/src/components/IonBackButton.ts index 2f86022ff3..7d4468a2b4 100644 --- a/packages/vue/src/components/IonBackButton.ts +++ b/packages/vue/src/components/IonBackButton.ts @@ -1,11 +1,8 @@ import { h, inject, defineComponent } from 'vue'; -import { defineCustomElement } from '../utils'; -import { IonBackButton as IonBackButtonCmp } from '@ionic/core/components/ion-back-button.js'; -import { IonIcon as IonIconCmp } from 'ionicons/components/ion-icon.js'; +import { defineCustomElement } from '@ionic/core/components/ion-back-button.js'; export const IonBackButton = /*@__PURE__*/ defineComponent((_, { attrs, slots }) => { - defineCustomElement('ion-back-button', IonBackButtonCmp); - defineCustomElement('ion-icon', IonIconCmp); + defineCustomElement(); const ionRouter: any = inject('navManager'); diff --git a/packages/vue/src/components/IonIcon.ts b/packages/vue/src/components/IonIcon.ts index 4bcc75c992..02944de8c6 100644 --- a/packages/vue/src/components/IonIcon.ts +++ b/packages/vue/src/components/IonIcon.ts @@ -1,7 +1,6 @@ import { h, defineComponent } from 'vue'; import { isPlatform } from '@ionic/core/components'; -import { defineCustomElement } from '../utils'; -import { IonIcon as IonIconCmp } from 'ionicons/components/ion-icon.js'; +import { defineCustomElement } from 'ionicons/components/ion-icon.js'; export const IonIcon = /*@__PURE__*/ defineComponent({ name: 'IonIcon', @@ -18,7 +17,7 @@ export const IonIcon = /*@__PURE__*/ defineComponent({ src: String }, setup(props, { slots }) { - defineCustomElement('ion-icon', IonIconCmp); + defineCustomElement(); return () => { const { icon, ios, md } = props; diff --git a/packages/vue/src/components/IonNav.ts b/packages/vue/src/components/IonNav.ts index af7889ea37..982a5ff027 100644 --- a/packages/vue/src/components/IonNav.ts +++ b/packages/vue/src/components/IonNav.ts @@ -1,10 +1,9 @@ import { defineComponent, h, shallowRef, VNode } from 'vue'; import { VueDelegate } from '../framework-delegate'; -import { defineCustomElement } from '../utils'; -import { IonNav as IonNavCmp } from '@ionic/core/components/ion-nav.js'; +import { defineCustomElement } from '@ionic/core/components/ion-nav.js'; export const IonNav = /*@__PURE__*/ defineComponent(() => { - defineCustomElement('ion-nav', IonNavCmp); + defineCustomElement(); const views = shallowRef([]); /** diff --git a/packages/vue/src/components/IonRouterOutlet.ts b/packages/vue/src/components/IonRouterOutlet.ts index 6ab254557a..339f24942e 100644 --- a/packages/vue/src/components/IonRouterOutlet.ts +++ b/packages/vue/src/components/IonRouterOutlet.ts @@ -12,9 +12,9 @@ import { Ref } from 'vue'; import { AnimationBuilder, LIFECYCLE_DID_ENTER, LIFECYCLE_DID_LEAVE, LIFECYCLE_WILL_ENTER, LIFECYCLE_WILL_LEAVE } from '@ionic/core/components'; -import { IonRouterOutlet as IonRouterOutletCmp } from '@ionic/core/components/ion-router-outlet.js'; +import { defineCustomElement } from '@ionic/core/components/ion-router-outlet.js'; import { matchedRouteKey, routeLocationKey, useRoute } from 'vue-router'; -import { fireLifecycle, generateId, getConfig, defineCustomElement } from '../utils'; +import { fireLifecycle, generateId, getConfig } from '../utils'; const isViewVisible = (enteringEl: HTMLElement) => { return !enteringEl.classList.contains('ion-page-hidden') && !enteringEl.classList.contains('ion-page-invisible'); @@ -24,7 +24,7 @@ let viewDepthKey: InjectionKey<0> = Symbol(0); export const IonRouterOutlet = /*@__PURE__*/ defineComponent({ name: 'IonRouterOutlet', setup() { - defineCustomElement('ion-router-outlet', IonRouterOutletCmp); + defineCustomElement(); const injectedRoute = inject(routeLocationKey)!; const route = useRoute(); diff --git a/packages/vue/src/components/IonTabBar.ts b/packages/vue/src/components/IonTabBar.ts index 02473295c6..e61bd8629a 100644 --- a/packages/vue/src/components/IonTabBar.ts +++ b/packages/vue/src/components/IonTabBar.ts @@ -1,6 +1,5 @@ import { h, defineComponent, getCurrentInstance, inject, VNode } from 'vue'; -import { defineCustomElement } from '../utils'; -import { IonTabBar as IonTabBarCmp } from '@ionic/core/components/ion-tab-bar.js'; +import { defineCustomElement } from '@ionic/core/components/ion-tab-bar.js'; interface TabState { activeTab?: string; @@ -172,7 +171,7 @@ export const IonTabBar = defineComponent({ ionRouter.registerHistoryChangeListener(() => this.checkActiveTab(ionRouter)); }, setup(_, { slots }) { - defineCustomElement('ion-tab-bar', IonTabBarCmp); + defineCustomElement(); return () => { return h( diff --git a/packages/vue/src/components/IonTabButton.ts b/packages/vue/src/components/IonTabButton.ts index b80a135475..dc522e9e5c 100644 --- a/packages/vue/src/components/IonTabButton.ts +++ b/packages/vue/src/components/IonTabButton.ts @@ -1,6 +1,5 @@ import { h, defineComponent, inject } from 'vue'; -import { defineCustomElement } from '../utils'; -import { IonTabButton as IonTabButtonCmp } from '@ionic/core/components/ion-tab-button.js'; +import { defineCustomElement } from '@ionic/core/components/ion-tab-button.js'; export const IonTabButton = /*@__PURE__*/ defineComponent({ name: 'IonTabButton', @@ -16,7 +15,7 @@ export const IonTabButton = /*@__PURE__*/ defineComponent({ target: String }, setup(props, { slots }) { - defineCustomElement('ion-tab-button', IonTabButtonCmp); + defineCustomElement(); const ionRouter: any = inject('navManager'); const onClick = (ev: Event) => { diff --git a/packages/vue/src/utils.ts b/packages/vue/src/utils.ts index bf38e9a449..db46362024 100644 --- a/packages/vue/src/utils.ts +++ b/packages/vue/src/utils.ts @@ -57,11 +57,3 @@ export const getConfig = (): CoreConfig | null => { } return null; }; - -export const defineCustomElement = (tagName: string, customElement: any) => { - if (typeof customElements === 'undefined') return; - - if (!customElements.get(tagName)) { - customElements.define(tagName, customElement); - } -} From d76a24dd9e485a2f3cc517231bbb1dab51fa1fd3 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 13 Oct 2022 15:34:28 -0500 Subject: [PATCH 09/12] fix(datetime): selecting days updates value (#26121) --- core/src/components/datetime/datetime.tsx | 94 +++++++++---------- .../datetime/test/basic/datetime.e2e.ts | 33 +++++++ .../test/prefer-wheel/datetime.e2e.ts | 76 +++++++++++++++ 3 files changed, 154 insertions(+), 49 deletions(-) diff --git a/core/src/components/datetime/datetime.tsx b/core/src/components/datetime/datetime.tsx index dc68c86a07..6420b48d68 100644 --- a/core/src/components/datetime/datetime.tsx +++ b/core/src/components/datetime/datetime.tsx @@ -561,7 +561,7 @@ export class Datetime implements ComponentInterface { * "activePartsClone" and then falling back to * today's DatetimeParts if no active date is selected. */ - private getDefaultPart = () => { + private getDefaultPart = (): DatetimeParts => { const { activePartsClone, todayParts } = this; const firstPart = Array.isArray(activePartsClone) ? activePartsClone[0] : activePartsClone; @@ -1393,7 +1393,9 @@ export class Datetime implements ComponentInterface { } private renderCombinedDatePickerColumn() { - const { activeParts, workingParts, locale, minParts, maxParts, todayParts, isDateEnabled } = this; + const { workingParts, locale, minParts, maxParts, todayParts, isDateEnabled } = this; + + const activePart = this.getDefaultPart(); /** * By default, generate a range of 3 months: @@ -1489,12 +1491,10 @@ export class Datetime implements ComponentInterface { ...findPart, }); - if (!Array.isArray(activeParts)) { - this.setActiveParts({ - ...activeParts, - ...findPart, - }); - } + this.setActiveParts({ + ...activePart, + ...findPart, + }); // We can re-attach the scroll listener after // the working parts have been updated. @@ -1583,7 +1583,9 @@ export class Datetime implements ComponentInterface { return []; } - const { activeParts, workingParts } = this; + const { workingParts } = this; + + const activePart = this.getDefaultPart(); return (