From a6829bff4fdeecd372c73838aca9b59047406026 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 1 Apr 2021 14:36:50 +0200 Subject: [PATCH 1/2] Prepare develop: v2.16.0-develop --- CHANGELOG.md | 12 ++++++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b08ab4c9..dca36d61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](https://semver.org/). ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror² +## [2.16.0] - Unreleased (Develop Branch) + +_This release is scheduled to be released on 2021-04-01._ + +### Added + +### Updated + +### Removed + +### Fixed + ## [2.15.0] - 2021-04-01 Special thanks to the following contributors: @EdgardosReis, @MystaraTheGreat, @TheDuffman85, @ashishtank, @buxxi, @codac, @fewieden, @khassel, @klaernie, @qu1que, @rejas, @sdetweil & @thomasrockhu. diff --git a/package-lock.json b/package-lock.json index b84201cc..de46ba1e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.15.0", + "version": "2.16.0-develop", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0f1f1ddf..1c1251ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.15.0", + "version": "2.16.0-develop", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": { From b29b65851e386f018967ba65d85c5680d85004ea Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Thu, 1 Apr 2021 20:02:08 +0200 Subject: [PATCH 2/2] Bump node-ical to v0.13.0 (now last runtime dependency using deprecated `request` package is removed). --- CHANGELOG.md | 2 ++ package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dca36d61..d2b051b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ _This release is scheduled to be released on 2021-04-01._ ### Updated +- Bump node-ical to v0.13.0 (now last runtime dependency using deprecated `request` package is removed). + ### Removed ### Fixed diff --git a/package-lock.json b/package-lock.json index de46ba1e..5e6adb67 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4375,12 +4375,12 @@ "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" }, "node-ical": { - "version": "0.12.9", - "resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.12.9.tgz", - "integrity": "sha512-5nUEZfZPpBpeZbmYCCmNRLsoP08+SGZy/fKxNBX9k67JMUTMFPLEyZ0CXApPDIExX0izMRndG1PsymhEkkSL2Q==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.13.0.tgz", + "integrity": "sha512-hfV7HsY0oTehirXLtkKgAdVomSv6/zjSw66z/RTkKfEp9MwwIz1asyE/g9x4ZKWE2YqGnr81Se5zSRcligPY5Q==", "requires": { "moment-timezone": "^0.5.31", - "request": "^2.88.2", + "node-fetch": "^2.6.1", "rrule": "2.6.8", "uuid": "^8.3.1" } diff --git a/package.json b/package.json index 1c1251ee..d9b3c271 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "module-alias": "^2.2.2", "moment": "^2.29.1", "node-fetch": "^2.6.1", - "node-ical": "^0.12.9", + "node-ical": "^0.13.0", "rrule": "^2.6.8", "rrule-alt": "^2.2.8", "simple-git": "^2.37.0",