fix merge conflicts

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,7 +20,8 @@ assignees: ''
 <!-- (For Ionic 1.x issues, please use https://github.com/ionic-team/ionic-v1) -->
 <!-- (For Ionic 2.x & 3.x issues, please use https://github.com/ionic-team/ionic-v3) -->
 [ ] **4.x**
-[x] **5.x**
+[ ] **5.x**
+[ ] **6.x**
 
 **Current behavior:**
 <!-- Describe how the bug manifests. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -19,7 +19,9 @@ assignees: ''
 **Ionic version:**
 <!-- (For Ionic 1.x issues, please use https://github.com/ionic-team/ionic-v1) -->
 <!-- (For Ionic 2.x & 3.x issues, please use https://github.com/ionic-team/ionic-v3) -->
-[x] **4.x**
+[ ] **4.x**
+[ ] **5.x**
+[ ] **6.x**
 
 **Describe the Feature Request**
 <!-- A clear and concise description of what the feature request is. Please include if your feature request is related to a problem. -->

CHANGELOG.md

@@ -1,5 +1,13 @@
-# [6.0.0-beta.0](https://github.com/ionic-team/ionic/compare/v5.6.10...v6.0.0-beta.0) (2021-06-23)
+## [5.6.11](https://github.com/ionic-team/ionic/compare/v5.6.10...v5.6.11) (2021-07-01)
 
+### Bug Fixes
+
+* **animation:** typescript interface has correct return value for progress methods ([#23536](https://github.com/ionic-team/ionic/issues/23536)) ([f3d6abb](https://github.com/ionic-team/ionic/commit/f3d6abbc1beeafe3b5e7f473d70d0b8ef4c79bc8))
+* **ios, md:** double tapping back button no longer causes app to go back 2 pages ([#23526](https://github.com/ionic-team/ionic/issues/23526)) ([69be51d](https://github.com/ionic-team/ionic/commit/69be51dc54e670b2f75cbfac28a4a09517dbf355)), closes [#18455](https://github.com/ionic-team/ionic/issues/18455)
+
+
+
+# [6.0.0-beta.0](https://github.com/ionic-team/ionic/compare/v5.6.10...v6.0.0-beta.0) (2021-06-23)
 
 ### Bug Fixes
 

README.md

@@ -5,6 +5,9 @@ build top quality native and progressive web apps with web technologies.
 
 Ionic Framework is based on [Web Components](https://www.webcomponents.org/introduction) and comes with many significant performance, usability, and feature improvements over the past versions.
 
+## Looking for the Ionic Framework v6 beta?
+
+[Click here to get started!](https://github.com/ionic-team/ionic-framework/blob/next/BETA.md)
 
 ### Packages
 

core/src/components/card/readme.md

@@ -250,12 +250,12 @@ export class CardExample {
 </template>
 
 <script>
-import { IonCard, IonCardContent, IonCardSubtitle, IonCardTitle, IonIcon, IonItem, IonLabel } from '@ionic/vue';
+import { IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonIcon, IonItem, IonLabel } from '@ionic/vue';
 import { pin, walk, warning, wifi, wine } from 'ionicons/icons';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-  components: { IonCard, IonCardContent, IonCardSubtitle, IonCardTitle, IonIcon, IonItem, IonLabel }
+  components: { IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonIcon, IonItem, IonLabel }
   setup() {
     return { warning };
   }

core/src/components/card/usage/vue.md

@@ -49,12 +49,12 @@
 </template>
 
 <script>
-import { IonCard, IonCardContent, IonCardSubtitle, IonCardTitle, IonIcon, IonItem, IonLabel } from '@ionic/vue';
+import { IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonIcon, IonItem, IonLabel } from '@ionic/vue';
 import { pin, walk, warning, wifi, wine } from 'ionicons/icons';
 import { defineComponent } from 'vue';
 
 export default defineComponent({
-  components: { IonCard, IonCardContent, IonCardSubtitle, IonCardTitle, IonIcon, IonItem, IonLabel }
+  components: { IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonIcon, IonItem, IonLabel }
   setup() {
     return { warning };
   }

core/src/utils/animation/animation-interface.ts

@@ -29,9 +29,9 @@ export interface Animation {
    */
   destroy(clearStyleSheets?: boolean): void;
 
-  progressStart(forceLinearEasing: boolean, step?: number): void;
+  progressStart(forceLinearEasing?: boolean, step?: number): Animation;
-  progressStep(step: number): void;
+  progressStep(step: number): Animation;
-  progressEnd(playTo: 0 | 1 | undefined, step: number, dur?: number): void;
+  progressEnd(playTo: 0 | 1 | undefined, step: number, dur?: number): Animation;
 
   from(property: string, value: any): Animation;
   to(property: string, value: any): Animation;

core/src/utils/transition/index.ts

@@ -37,8 +37,18 @@ const beforeTransition = (opts: TransitionOptions) => {
     enteringEl.classList.remove('can-go-back');
   }
   setPageHidden(enteringEl, false);
+
+  /**
+   * When transitioning, the page should not
+   * respond to click events. This resolves small
+   * issues like users double tapping the ion-back-button.
+   * These pointer events are removed in `afterTransition`.
+   */
+  enteringEl.style.setProperty('pointer-events', 'none');
+
   if (leavingEl) {
     setPageHidden(leavingEl, false);
+    leavingEl.style.setProperty('pointer-events', 'none');
   }
 };
 
@@ -56,8 +66,10 @@ const afterTransition = (opts: TransitionOptions) => {
   const enteringEl = opts.enteringEl;
   const leavingEl = opts.leavingEl;
   enteringEl.classList.remove('ion-page-invisible');
+  enteringEl.style.removeProperty('pointer-events');
   if (leavingEl !== undefined) {
     leavingEl.classList.remove('ion-page-invisible');
+    leavingEl.style.removeProperty('pointer-events');
   }
 };
 

docs/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@ionic/docs",
+<<<<<<< HEAD
   "version": "6.0.0-beta.0",
+=======
+  "version": "5.6.11",
+>>>>>>> origin/master
   "description": "Pre-packaged API documentation for the Ionic docs.",
   "main": "core.json",
   "types": "core.d.ts",