javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 11:17:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge release-6.2.2

Browse Source 
Release 6.2.2
This commit is contained in:
Liam DeBeasi
2022-08-10 14:39:08 -05:00
committed by GitHub
parent e60e700ae0 22830257cf
commit d21b6cd084
86 changed files with 655 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/vue-router/CHANGELOG.md
View File

@ -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.
## [6.2.2](https://github.com/ionic-team/ionic/compare/v6.2.1...v6.2.2) (2022-08-10)
### Bug Fixes
* **vue:** go back to correct view with memory history ([#25732](https://github.com/ionic-team/ionic/issues/25732)) ([8327889](https://github.com/ionic-team/ionic/commit/832788971a7098e52812f66563cbc0a63d3e5df7)), closes [#25705](https://github.com/ionic-team/ionic/issues/25705)
## [6.2.1](https://github.com/ionic-team/ionic/compare/v6.2.0...v6.2.1) (2022-08-03)
**Note:** Version bump only for package @ionic/vue-router

34
packages/vue-router/package-lock.json generated
View File

@ -1,15 +1,15 @@
{
"name": "@ionic/vue-router",
"version": "6.2.1",
"version": "6.2.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/vue-router",
"version": "6.2.1",
"version": "6.2.2",
"license": "MIT",
"dependencies": {
"@ionic/vue": "^6.2.1"
"@ionic/vue": "^6.2.2"
},
"devDependencies": {
"@types/jest": "^28.1.1",
@ -578,9 +578,9 @@
"dev": true
},
"node_modules/@ionic/core": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.2.1.tgz",
"integrity": "sha512-bWlE2ZMR7tMyqcBhncc21zZPMZfCEoyGQP2bdu/ft1uov0ozw/wfETygd07C+0DOkbU6x1OYncIvo+1bzK4alA==",
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.2.2.tgz",
"integrity": "sha512-neE+JhtQ7Kb4nGoKR3e55edHQot5BZTw+woV9+pbyCXP1jGeyFeWWPYBYYOkm05TSEkHgh0v6NkV9y31k8GTNw==",
"dependencies": {
"@stencil/core": "^2.16.0",
"ionicons": "^6.0.2",
@ -588,11 +588,11 @@
}
},
"node_modules/@ionic/vue": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.2.1.tgz",
"integrity": "sha512-buVKw5ZAeNCBa1PmSZWkUDaNJgRSjp2iBzYH6/8MQC/bniTRb1QV6LebTAw3xt+6QhHqCeiBedZtwYCSlr510Q==",
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.2.2.tgz",
"integrity": "sha512-jxFW/FFCW6PB5daOGrBlHzZiabS+1A2MUExLQmBoVvw8Dt5gypv1J6oMWKqdVlBDOU7wqozkFjqioeK3c5sPSA==",
"dependencies": {
"@ionic/core": "^6.2.1",
"@ionic/core": "^6.2.2",
"ionicons": "^6.0.2"
}
},
@ -5233,9 +5233,9 @@
"dev": true
},
"@ionic/core": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.2.1.tgz",
"integrity": "sha512-bWlE2ZMR7tMyqcBhncc21zZPMZfCEoyGQP2bdu/ft1uov0ozw/wfETygd07C+0DOkbU6x1OYncIvo+1bzK4alA==",
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.2.2.tgz",
"integrity": "sha512-neE+JhtQ7Kb4nGoKR3e55edHQot5BZTw+woV9+pbyCXP1jGeyFeWWPYBYYOkm05TSEkHgh0v6NkV9y31k8GTNw==",
"requires": {
"@stencil/core": "^2.16.0",
"ionicons": "^6.0.2",
@ -5243,11 +5243,11 @@
}
},
"@ionic/vue": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.2.1.tgz",
"integrity": "sha512-buVKw5ZAeNCBa1PmSZWkUDaNJgRSjp2iBzYH6/8MQC/bniTRb1QV6LebTAw3xt+6QhHqCeiBedZtwYCSlr510Q==",
"version": "6.2.2",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.2.2.tgz",
"integrity": "sha512-jxFW/FFCW6PB5daOGrBlHzZiabS+1A2MUExLQmBoVvw8Dt5gypv1J6oMWKqdVlBDOU7wqozkFjqioeK3c5sPSA==",
"requires": {
"@ionic/core": "^6.2.1",
"@ionic/core": "^6.2.2",
"ionicons": "^6.0.2"
}
},

4
packages/vue-router/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ionic/vue-router",
"version": "6.2.1",
"version": "6.2.2",
"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.2.1"
"@ionic/vue": "^6.2.2"
},
"devDependencies": {
"@types/jest": "^28.1.1",

7
packages/vue-router/src/router.ts
View File

@ -120,7 +120,12 @@ export const createIonRouter = (opts: IonicVueRouterOptions, router: Router) =>
* will go back in a linear fashion.
*/
prevInfo.pathname === routeInfo.pushedByRoute &&
routeInfo.tab === '' && prevInfo.tab === ''
/**
* Tab info can be undefined or '' (empty string)
* both are false-y values, so we can just use !.
*/
!routeInfo.tab && !prevInfo.tab
)
) {
router.back();