javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 19:57:22 +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

12
packages/vue/CHANGELOG.md
View File

@ -3,6 +3,18 @@
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:** canDismiss definition is now exposed ([#25195](https://github.com/ionic-team/ionic/issues/25195)) ([e5e0e24](https://github.com/ionic-team/ionic/commit/e5e0e24f76c15c1a49f759b1a140e337f5393edd))
* **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

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

@ -1,15 +1,15 @@
{
"name": "@ionic/vue",
"version": "6.1.2",
"version": "6.1.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@ionic/vue",
"version": "6.0.1",
"version": "6.1.3",
"license": "MIT",
"dependencies": {
"@ionic/core": "6.0.0",
"@ionic/core": "^6.1.3",
"ionicons": "^6.0.0"
},
"devDependencies": {
@ -53,19 +53,19 @@
}
},
"node_modules/@ionic/core": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.0.0.tgz",
"integrity": "sha512-3e5EJhDebK4pCiFREpNB95o2kBSAdhRb3eMsBDOCYWYuFlcZEOGOpiGx+kYF/klYVQnB45UXAmR8nCX1indmHQ==",
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.1.3.tgz",
"integrity": "sha512-levKZw7wqfPZylx+DsG0sca7/ymKNo9/Hjf1qhXjU4xlALHVhU2c8LaAXmi1s47YGKrkOZYC5d/siUfjb9Kh4Q==",
"dependencies": {
"@stencil/core": "~2.11.0-0",
"@stencil/core": "^2.14.2",
"ionicons": "^6.0.0",
"tslib": "^2.1.0"
}
},
"node_modules/@ionic/core/node_modules/@stencil/core": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.11.0.tgz",
"integrity": "sha512-/IubCWhVXCguyMUp/3zGrg3c882+RJNg/zpiKfyfJL3kRCOwe+/MD8OoAXVGdd+xAohZKIi1Ik+EHFlsptsjLg==",
"version": "2.15.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.15.1.tgz",
"integrity": "sha512-NYjRwQnjzscyFfqK+iIwRdr/dgYn33u6KE7kyQWdi7xsCkqMHalXYgJlN/QBQ9PN3qXmXKeBrJNG8EkNdCbK5g==",
"bin": {
"stencil": "bin/stencil"
},
@ -633,19 +633,19 @@
}
},
"@ionic/core": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.0.0.tgz",
"integrity": "sha512-3e5EJhDebK4pCiFREpNB95o2kBSAdhRb3eMsBDOCYWYuFlcZEOGOpiGx+kYF/klYVQnB45UXAmR8nCX1indmHQ==",
"version": "6.1.3",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-6.1.3.tgz",
"integrity": "sha512-levKZw7wqfPZylx+DsG0sca7/ymKNo9/Hjf1qhXjU4xlALHVhU2c8LaAXmi1s47YGKrkOZYC5d/siUfjb9Kh4Q==",
"requires": {
"@stencil/core": "~2.11.0-0",
"@stencil/core": "^2.14.2",
"ionicons": "^6.0.0",
"tslib": "^2.1.0"
},
"dependencies": {
"@stencil/core": {
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.11.0.tgz",
"integrity": "sha512-/IubCWhVXCguyMUp/3zGrg3c882+RJNg/zpiKfyfJL3kRCOwe+/MD8OoAXVGdd+xAohZKIi1Ik+EHFlsptsjLg=="
"version": "2.15.1",
"resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.15.1.tgz",
"integrity": "sha512-NYjRwQnjzscyFfqK+iIwRdr/dgYn33u6KE7kyQWdi7xsCkqMHalXYgJlN/QBQ9PN3qXmXKeBrJNG8EkNdCbK5g=="
},
"tslib": {
"version": "2.2.0",

4
packages/vue/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ionic/vue",
"version": "6.1.2",
"version": "6.1.3",
"description": "Vue specific wrapper for @ionic/core",
"scripts": {
"prepublishOnly": "npm run build",
@ -60,7 +60,7 @@
"vue-router": "^4.0.0-rc.4"
},
"dependencies": {
"@ionic/core": "^6.1.2",
"@ionic/core": "^6.1.3",
"ionicons": "^6.0.0"
},
"vetur": {

2
packages/vue/src/components/Overlays.ts
View File

@ -29,7 +29,7 @@ export const IonPicker = /*@__PURE__*/ defineOverlayContainer<JSX.IonPicker>('io
export const IonToast = /*@__PURE__*/ defineOverlayContainer<JSX.IonToast>('ion-toast', defineIonToastCustomElement, ['animated', 'buttons', 'color', 'cssClass', 'duration', 'enterAnimation', 'header', 'htmlAttributes', 'icon', 'keyboardClose', 'leaveAnimation', 'message', 'mode', 'position', 'translucent'], toastController);
export const IonModal = /*@__PURE__*/ defineOverlayContainer<JSX.IonModal>('ion-modal', defineIonModalCustomElement, ['animated', 'backdropBreakpoint', 'backdropDismiss', 'breakpoints', 'enterAnimation', 'handle', 'htmlAttributes', 'initialBreakpoint', 'isOpen', 'keyboardClose', 'leaveAnimation', 'mode', 'presentingElement', 'showBackdrop', 'swipeToClose', 'trigger']);
export const IonModal = /*@__PURE__*/ defineOverlayContainer<JSX.IonModal>('ion-modal', defineIonModalCustomElement, ['animated', 'backdropBreakpoint', 'backdropDismiss', 'breakpoints', 'canDismiss', 'enterAnimation', 'handle', 'htmlAttributes', 'initialBreakpoint', 'isOpen', 'keyboardClose', 'leaveAnimation', 'mode', 'presentingElement', 'showBackdrop', 'swipeToClose', 'trigger']);
export const IonPopover = /*@__PURE__*/ defineOverlayContainer<JSX.IonPopover>('ion-popover', defineIonPopoverCustomElement, ['alignment', 'animated', 'arrow', 'backdropDismiss', 'component', 'componentProps', 'dismissOnSelect', 'enterAnimation', 'event', 'htmlAttributes', 'isOpen', 'keyboardClose', 'leaveAnimation', 'mode', 'reference', 'showBackdrop', 'side', 'size', 'translucent', 'trigger', 'triggerAction']);

3
packages/vue/test-app/src/views/RouterOutlet.vue
View File

@ -3,6 +3,7 @@
<ion-header>
<ion-toolbar>
<ion-buttons slot="start">
<ion-back-button id="routeroutlet-back-button" text="Back to main outlet"></ion-back-button>
<ion-button id="inbox" router-link="/nested/inbox" router-direction="root">Inbox</ion-button>
<ion-button id="trash" router-link="/nested/trash" router-direction="root">Trash</ion-button>
<ion-button id="outbox" router-link="/nested/outbox" router-direction="root">Outbox</ion-button>
@ -19,6 +20,7 @@
<script lang="ts">
import {
IonBackButton,
IonHeader,
IonButtons,
IonButton,
@ -31,6 +33,7 @@ import { defineComponent } from 'vue';
export default defineComponent({
components: {
IonBackButton,
IonHeader,
IonButtons,
IonButton,

28
packages/vue/test-app/tests/e2e/specs/nested.js
View File

@ -4,10 +4,6 @@ describe('Nested', () => {
cy.ionPageVisible('nestedchild');
});
it('should show first page', () => {
cy.ionPageVisible('nestedchild');
});
it('should go to second page', () => {
cy.get('#nested-child-two').click();
cy.ionPageVisible('nestedchildtwo');
@ -21,8 +17,6 @@ describe('Nested', () => {
});
it('should go navigate across nested outlet contexts', () => {
cy.ionPageVisible('nestedchild');
cy.get('#nested-tabs').click();
cy.ionPageHidden('routeroutlet');
@ -34,3 +28,25 @@ describe('Nested', () => {
cy.ionPageVisible('routeroutlet');
});
})
describe('Nested - Replace', () => {
it('should replace a route but still be able to go back to main outlet', () => {
cy.visit('http://localhost:8080');
cy.routerPush('/nested');
cy.ionPageHidden('home');
cy.ionPageVisible('nestedchild');
cy.routerReplace('/nested/two');
cy.ionPageDoesNotExist('nestedchild');
cy.ionPageVisible('nestedchildtwo');
/**
* ionBackClick does not handle nested pages
* with multiple back buttons
*/
cy.get('#routeroutlet-back-button').click();
cy.ionPageDoesNotExist('nestedchildtwo');
cy.ionPageVisible('home');
})
})