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

chore(): resolve merge conflicts

Browse Source
This commit is contained in:
Liam DeBeasi
2021-04-23 11:41:46 -04:00
parent d4e773623f dab927d290
commit aede8e686f
120 changed files with 21206 additions and 2546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,12 @@
{
"name": "@ionic/vue-router",
"version": "5.6.3",
"version": "5.6.5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/vue-router",
"version": "5.6.3",
"version": "5.6.5",
"license": "MIT",
"devDependencies": {
"@ionic/vue": "5.4.1",
@ -23,7 +23,7 @@
},
"../../core": {
"name": "@ionic/core",
"version": "5.6.2",
"version": "5.6.4",
"dev": true,
"license": "MIT",
"dependencies": {
@ -32,11 +32,12 @@
"tslib": "^2.1.0"
},
"devDependencies": {
"@axe-core/puppeteer": "^4.1.1",
"@jest/core": "^26.6.3",
"@rollup/plugin-node-resolve": "^8.4.0",
"@rollup/plugin-virtual": "^2.0.3",
"@stencil/sass": "1.3.2",
"@stencil/vue-output-target": "^0.4.1",
"@stencil/vue-output-target": "^0.4.2",
"@types/jest": "^26.0.20",
"@types/node": "^14.6.0",
"@types/puppeteer": "5.4.3",
@ -8241,12 +8242,13 @@
"@ionic/core": {
"version": "file:../../core",
"requires": {
"@axe-core/puppeteer": "^4.1.1",
"@jest/core": "^26.6.3",
"@rollup/plugin-node-resolve": "^8.4.0",
"@rollup/plugin-virtual": "^2.0.3",
"@stencil/core": "^2.4.0",
"@stencil/sass": "1.3.2",
"@stencil/vue-output-target": "^0.4.1",
"@stencil/vue-output-target": "^0.4.2",
"@types/jest": "^26.0.20",
"@types/node": "^14.6.0",
"@types/puppeteer": "5.4.3",

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

@ -1,6 +1,6 @@
{
"name": "@ionic/vue-router",
"version": "5.6.3",
"version": "5.6.5",
"description": "Vue Router integration for @ionic/vue",
"scripts": {
"test.spec": "jest",

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

@ -88,7 +88,19 @@ export const createIonRouter = (opts: IonicVueRouterOptions, router: Router) =>
const prevInfo = locationHistory.findLastLocation(routeInfo);
if (prevInfo) {
incomingRouteParams = { ...prevInfo, routerAction: 'pop', routerDirection: 'back', routerAnimation: routerAnimation || routeInfo.routerAnimation };
if (routeInfo.lastPathname === routeInfo.pushedByRoute || prevInfo.pathname === routeInfo.pushedByRoute) {
if (
routeInfo.lastPathname === routeInfo.pushedByRoute ||
(
/**
* We need to exclude tab switches/tab
* context changes here because tabbed
* navigation is not linear, but router.back()
* will go back in a linear fashion.
*/
prevInfo.pathname === routeInfo.pushedByRoute &&
routeInfo.tab === '' && prevInfo.tab === ''
)
) {
router.back();
} else {
router.replace({ path: prevInfo.pathname, query: parseQuery(prevInfo.search) });