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

merge release-6.1.3

Browse Source 
Release 6.1.3
This commit is contained in:
Liam DeBeasi
2022-04-27 20:27:38 +05:45
committed by GitHub
parent 5c4724d5cb 1c8d10ce75
commit 781a35dd56
723 changed files with 1101 additions and 69128 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.1.3](https://github.com/ionic-team/ionic/compare/v6.1.2...v6.1.3) (2022-04-27)
### Bug Fixes
* **vue:** replacing routes across nested outlets preserves previous route info ([#25171](https://github.com/ionic-team/ionic/issues/25171)) ([7b71607](https://github.com/ionic-team/ionic/commit/7b716076b66fbb5bd4620ea8ba74318bbbc1b7e8)), closes [#25017](https://github.com/ionic-team/ionic/issues/25017)
## [6.1.2](https://github.com/ionic-team/ionic/compare/v6.1.1...v6.1.2) (2022-04-20)
**Note:** Version bump only for package @ionic/vue-router

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

@ -1,6 +1,6 @@
{
"name": "@ionic/vue-router",
"version": "6.1.2",
"version": "6.1.3",
"lockfileVersion": 2,
"requires": true,
"packages": {

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

@ -1,6 +1,6 @@
{
"name": "@ionic/vue-router",
"version": "6.1.2",
"version": "6.1.3",
"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.1.2"
"@ionic/vue": "^6.1.3"
},
"devDependencies": {
"@types/jest": "^26.0.13",

10
packages/vue-router/src/locationHistory.ts
View File

@ -6,9 +6,6 @@ export const createLocationHistory = () => {
const add = (routeInfo: RouteInfo) => {
switch (routeInfo.routerAction) {
case "replace":
replaceRoute(routeInfo);
break;
case "pop":
pop(routeInfo);
break;
@ -41,13 +38,6 @@ export const createLocationHistory = () => {
}
}
const replaceRoute = (routeInfo: RouteInfo) => {
const routeInfos = getTabsHistory(routeInfo.tab);
routeInfos && routeInfos.pop();
locationHistory.pop();
addRoute(routeInfo);
}
const pop = (routeInfo: RouteInfo) => {
const tabHistory = getTabsHistory(routeInfo.tab);
let ri;