From 7aafed7e40e5f500311c1eb6d0999d159f05b70d Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Fri, 26 Apr 2019 15:52:30 -0400 Subject: [PATCH] Release 4.3.1 (#18152) (#18154) * fix(angular): support replaceUrl with angular <7.2 (#18106) * fix(angular): support replaceUrl with angular <7.2 * run linter * fix(): sanitize components using innerHTML (#18146) * 4.3.1 (#18150) --- CHANGELOG.md | 10 ++++++++++ angular/package.json | 4 ++-- .../directives/navigation/stack-controller.ts | 17 ++++++++++++++++- core/README.md | 4 ++-- core/package.json | 2 +- docs/package.json | 2 +- 6 files changed, 32 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba8d68f404c..4281f73de1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [4.3.1](https://github.com/ionic-team/ionic/compare/v4.3.0...v4.3.1) (2019-04-26) + + +### Bug Fixes + +* **angular:** support replaceUrl with angular <7.2 ([#18106](https://github.com/ionic-team/ionic/issues/18106)) ([eb3cbe4](https://github.com/ionic-team/ionic/commit/eb3cbe4)) +* **security:** sanitize components using innerHTML ([#18146](https://github.com/ionic-team/ionic/issues/18146)) ([b839e6f](https://github.com/ionic-team/ionic/commit/b839e6f)) + + + # [4.3.0 Lithium](https://github.com/ionic-team/ionic/compare/v4.2.0...v4.3.0) (2019-04-17) diff --git a/angular/package.json b/angular/package.json index 0b9598d344d..dbb841ced76 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "4.3.0", + "version": "4.3.1", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -45,7 +45,7 @@ "css/" ], "dependencies": { - "@ionic/core": "4.3.0", + "@ionic/core": "4.3.1", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/angular/src/directives/navigation/stack-controller.ts b/angular/src/directives/navigation/stack-controller.ts index 0680278c31e..a06eb0491ca 100644 --- a/angular/src/directives/navigation/stack-controller.ts +++ b/angular/src/directives/navigation/stack-controller.ts @@ -59,7 +59,22 @@ export class StackController { } const viewsSnapshot = this.views.slice(); - const currentNavigation = this.router.getCurrentNavigation(); + let currentNavigation; + + const router = (this.router as any); + + // Angular >= 7.2.0 + if (router.getCurrentNavigation) { + currentNavigation = router.getCurrentNavigation(); + + // Angular < 7.2.0 + } else if ( + router.navigations && + router.navigations.value + ) { + currentNavigation = router.navigations.value; + } + /** * If the navigation action * sets `replaceUrl: true` diff --git a/core/README.md b/core/README.md index 1441ec6e5f5..cc4ce0015ec 100644 --- a/core/README.md +++ b/core/README.md @@ -23,8 +23,8 @@ The Ionic Core package contains the Web Components that make up the reusable UI Easiest way to start using Ionic Core is by adding a script tag to the CDN: ```html - - + + ``` Any Ionic component added to the webpage will automatically load. This includes writing the component tag directly in HTML, or using JavaScript such as `document.createElement('ion-toggle')`. diff --git a/core/package.json b/core/package.json index a9c5949253a..5979ca9de1a 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "4.3.0", + "version": "4.3.1", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/package.json b/docs/package.json index 014e091dfd3..d0234bfa154 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "4.3.0", + "version": "4.3.1", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "files": [