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

merge release-6.3.7

Browse Source 
Release 6.3.7
This commit is contained in:
Liam DeBeasi
2022-11-16 11:21:09 -05:00
committed by GitHub
parent 5c23dc871f af5c57efa5
commit fa01664477
433 changed files with 1383 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.7](https://github.com/ionic-team/ionic/compare/v6.3.6...v6.3.7) (2022-11-16)
**Note:** Version bump only for package @ionic/vue-router
## [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

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

@ -1,15 +1,15 @@
{
"name": "@ionic/vue-router",
"version": "6.3.6",
"version": "6.3.7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/vue-router",
"version": "6.3.6",
"version": "6.3.7",
"license": "MIT",
"dependencies": {
"@ionic/vue": "^6.3.6"
"@ionic/vue": "^6.3.7"
},
"devDependencies": {
"@types/jest": "^28.1.1",
@ -588,9 +588,9 @@
}
},
"node_modules/@ionic/vue": {
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.6.tgz",
"integrity": "sha512-0u5vWo++jDHqW92PbRFrIAQjBakJmjAhe2P1R/DqWv0zoMeZcwCNh9DKqKqrl9xIStnu6gjLSnT/lywrksiDuA==",
"version": "6.3.7",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.7.tgz",
"integrity": "sha512-mMqCpvD7ezuJKKwiHiLzFh9myD7ThFP2g5WpGpqCfbMeWPC9Bp/oTM+SMNeQ6cE10wNsx7Op8axaT2euJeAj8g==",
"dependencies": {
"@ionic/core": "^6.3.6",
"ionicons": "^6.0.2"
@ -5231,9 +5231,9 @@
}
},
"@ionic/vue": {
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.6.tgz",
"integrity": "sha512-0u5vWo++jDHqW92PbRFrIAQjBakJmjAhe2P1R/DqWv0zoMeZcwCNh9DKqKqrl9xIStnu6gjLSnT/lywrksiDuA==",
"version": "6.3.7",
"resolved": "https://registry.npmjs.org/@ionic/vue/-/vue-6.3.7.tgz",
"integrity": "sha512-mMqCpvD7ezuJKKwiHiLzFh9myD7ThFP2g5WpGpqCfbMeWPC9Bp/oTM+SMNeQ6cE10wNsx7Op8axaT2euJeAj8g==",
"requires": {
"@ionic/core": "^6.3.6",
"ionicons": "^6.0.2"

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

@ -1,9 +1,8 @@
{
"name": "@ionic/vue-router",
"version": "6.3.6",
"version": "6.3.7",
"description": "Vue Router integration for @ionic/vue",
"scripts": {
"prepublishOnly": "npm run build",
"test.spec": "jest",
"lint": "echo add linter",
"bundle": "rollup --config rollup.config.js",
@ -44,7 +43,7 @@
},
"homepage": "https://github.com/ionic-team/ionic#readme",
"dependencies": {
"@ionic/vue": "^6.3.6"
"@ionic/vue": "^6.3.7"
},
"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;