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

Merge remote-tracking branch 'origin/main' into sync-7-11-15-22

Browse Source
This commit is contained in:
Sean Perkins
2022-11-15 15:40:21 -05:00
parent 44472aeb9f 7a990ff403
commit c149b42d0b
437 changed files with 1449 additions and 1499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [6.3.6](https://github.com/ionic-team/ionic/compare/v6.3.5...v6.3.6) (2022-11-10)
**Note:** Version bump only for package @ionic/vue-router
## [6.3.5](https://github.com/ionic-team/ionic/compare/v6.3.4...v6.3.5) (2022-11-09)
**Note:** Version bump only for package @ionic/vue-router
## [6.3.4](https://github.com/ionic-team/ionic/compare/v6.3.3...v6.3.4) (2022-11-02)
**Note:** Version bump only for package @ionic/vue-router

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

@ -1,15 +1,15 @@
{
"name": "@ionic/vue-router",
"version": "6.3.4",
"version": "6.3.6",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/vue-router",
"version": "6.3.4",
"version": "6.3.6",
"license": "MIT",
"dependencies": {
"@ionic/vue": "^6.3.4"
"@ionic/vue": "^6.3.6"
},
"devDependencies": {
"@types/jest": "^28.1.1",
@ -578,21 +578,21 @@
"dev": true
},
"node_modules/@ionic/core": {
"version": "6.3.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.4.tgz",
"integrity": "sha512-3EnKqFdon7Im8JNvuPoq/iGyYK7hskdb9u5hlQE0fHU/9Q0DvFVh17QTq1sQjXntoJovfRhaPJhG+kvZK3mVAQ==",
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.6.tgz",
"integrity": "sha512-QbLp9XNRfFHUVpSEEcFJYEyxek6Vi82EDIdJj0JvUPqMFdzF93dfzRoEIOos52jWxTG4LwGHLHlWem/3stF5Rg==",
"dependencies": {
"@stencil/core": "^2.18.0",
"ionicons": "^6.0.3",
"ionicons": "^6.0.4",
"tslib": "^2.1.0"
}
},
"node_modules/@ionic/vue": {
"version": "6.3.4",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.4.tgz",
"integrity": "sha512-Ww1qa+5iaF+Qmm131/5YxCQg+sL7GmKvTe1ODrLkP8l06Hp3usWft848dM1zP2yw5M+CdEOTBmLFpOitRGUQ1Q==",
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.6.tgz",
"integrity": "sha512-0u5vWo++jDHqW92PbRFrIAQjBakJmjAhe2P1R/DqWv0zoMeZcwCNh9DKqKqrl9xIStnu6gjLSnT/lywrksiDuA==",
"dependencies": {
"@ionic/core": "^6.3.4",
"@ionic/core": "^6.3.6",
"ionicons": "^6.0.2"
}
},
@ -2374,23 +2374,11 @@
"license": "ISC"
},
"node_modules/ionicons": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.3.tgz",
"integrity": "sha512-kVOWER991EMqLiVShrCSWKMHkgHZP7XfVdyN6YPMuoO33W7pc5CPNVNfR8OMe/I8rYEbaunyBs6dXNYpR6gGZw==",
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
"integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
"dependencies": {
"@stencil/core": "~2.16.0"
}
},
"node_modules/ionicons/node_modules/@stencil/core": {
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
"integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw==",
"bin": {
"stencil": "bin/stencil"
},
"engines": {
"node": ">=12.10.0",
"npm": ">=6.0.0"
"@stencil/core": "^2.18.0"
}
},
"node_modules/is-arrayish": {
@ -5233,21 +5221,21 @@
"dev": true
},
"@ionic/core": {
"version": "6.3.4",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.4.tgz",
"integrity": "sha512-3EnKqFdon7Im8JNvuPoq/iGyYK7hskdb9u5hlQE0fHU/9Q0DvFVh17QTq1sQjXntoJovfRhaPJhG+kvZK3mVAQ==",
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.3.6.tgz",
"integrity": "sha512-QbLp9XNRfFHUVpSEEcFJYEyxek6Vi82EDIdJj0JvUPqMFdzF93dfzRoEIOos52jWxTG4LwGHLHlWem/3stF5Rg==",
"requires": {
"@stencil/core": "^2.18.0",
"ionicons": "^6.0.3",
"ionicons": "^6.0.4",
"tslib": "^2.1.0"
}
},
"@ionic/vue": {
"version": "6.3.4",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.4.tgz",
"integrity": "sha512-Ww1qa+5iaF+Qmm131/5YxCQg+sL7GmKvTe1ODrLkP8l06Hp3usWft848dM1zP2yw5M+CdEOTBmLFpOitRGUQ1Q==",
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.6.tgz",
"integrity": "sha512-0u5vWo++jDHqW92PbRFrIAQjBakJmjAhe2P1R/DqWv0zoMeZcwCNh9DKqKqrl9xIStnu6gjLSnT/lywrksiDuA==",
"requires": {
"@ionic/core": "^6.3.4",
"@ionic/core": "^6.3.6",
"ionicons": "^6.0.2"
}
},
@ -6646,18 +6634,11 @@
"dev": true
},
"ionicons": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.3.tgz",
"integrity": "sha512-kVOWER991EMqLiVShrCSWKMHkgHZP7XfVdyN6YPMuoO33W7pc5CPNVNfR8OMe/I8rYEbaunyBs6dXNYpR6gGZw==",
"version": "6.0.4",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-6.0.4.tgz",
"integrity": "sha512-uDNOkBo0OVYV+kIhb51g9mb7r3Z0b+78GPZQBsjXuaetNmrB/mNTqN/uFtO+vxL/rQySKjzk8qeKJI5NWL9Ueg==",
"requires": {
"@stencil/core": "~2.16.0"
},
"dependencies": {
"@stencil/core": {
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.16.1.tgz",
"integrity": "sha512-s/UJp9qxExL3DyQPT70kiuWeb3AdjbUZM+5lEIXn30I2DLcLYPOPXfsoWJODieQywq+3vPiLZeIdkoqjf6jcSw=="
}
"@stencil/core": "^2.18.0"
}
},
"is-arrayish": {

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

@ -1,6 +1,6 @@
{
"name": "@ionic/vue-router",
"version": "6.3.4",
"version": "6.3.6",
"description": "Vue Router integration for @ionic/vue",
"scripts": {
"prepublishOnly": "npm run build",
@ -43,7 +43,7 @@
},
"homepage": "https://github.com/ionic-team/ionic#readme",
"dependencies": {
"@ionic/vue": "^6.3.4"
"@ionic/vue": "^6.3.6"
},
"devDependencies": {
"@types/jest": "^28.1.1",

8
packages/vue-router/scripts/sync.sh
View File

@ -1,3 +1,7 @@
#!/bin/bash
set -e
# Copy ionic vue dist
rm -rf node_modules/@ionic/vue/dist node_modules/@ionic/vue/css
cp -a ../vue/dist node_modules/@ionic/vue/dist
@ -9,7 +13,3 @@ rm -rf node_modules/@ionic/core/dist node_modules/@ionic/core/components
cp -a ../../core/dist node_modules/@ionic/core/dist
cp -a ../../core/components node_modules/@ionic/core/components
cp -a ../../core/package.json node_modules/@ionic/core/package.json
# Copy ionicons
rm -rf node_modules/ionicons
cp -a ../../core/node_modules/ionicons node_modules/ionicons

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

@ -66,7 +66,6 @@ export const createIonRouter = (opts: IonicVueRouterOptions, router: Router) =>
let currentRouteInfo: RouteInfo;
let incomingRouteParams: RouteParams;
// TODO types
let historyChangeListeners: any[] = [];
if (typeof (document as any) !== 'undefined') {
@ -104,7 +103,6 @@ export const createIonRouter = (opts: IonicVueRouterOptions, router: Router) =>
});
const handleNavigateBack = (defaultHref?: string, routerAnimation?: AnimationBuilder) => {
// todo grab default back button href from config
const routeInfo = locationHistory.current(initialHistoryPosition, currentHistoryPosition);
if (routeInfo && routeInfo.pushedByRoute) {
const prevInfo = locationHistory.findLastLocation(routeInfo);
@ -561,7 +559,6 @@ export const createIonRouter = (opts: IonicVueRouterOptions, router: Router) =>
}
}
// TODO types
const registerHistoryChangeListener = (cb: any) => {
historyChangeListeners.push(cb);
}

2
packages/vue-router/src/types.ts
View File

@ -63,7 +63,7 @@ export interface ViewItem {
outletId: number;
matchedRoute: RouteLocationMatched;
ionPageElement?: HTMLElement;
vueComponent: any; // todo
vueComponent: any;
ionRoute: boolean;
mount: boolean;
exact: boolean;