this.config.lengthDescription ? txtDesc.substring(0, this.config.lengthDescription) + "..." : txtDesc) : txtDesc);
+ description.innerHTML = this.config.truncDescription ? (txtDesc.length > this.config.lengthDescription ? txtDesc.substring(0, this.config.lengthDescription) + "..." : txtDesc) : txtDesc;
wrapper.appendChild(description);
}
@@ -199,7 +189,6 @@ Module.register("newsfeed",{
if (this.config.hideLoading) {
this.show();
}
-
} else {
if (this.config.hideLoading) {
this.hide();
@@ -212,14 +201,14 @@ Module.register("newsfeed",{
return wrapper;
},
- getActiveItemURL: function() {
+ getActiveItemURL: function () {
return typeof this.newsItems[this.activeItem].url === "string" ? this.newsItems[this.activeItem].url : this.newsItems[this.activeItem].url.href;
},
/* registerFeeds()
* registers the feeds to be used by the backend.
*/
- registerFeeds: function() {
+ registerFeeds: function () {
for (var f in this.config.feeds) {
var feed = this.config.feeds[f];
this.sendSocketNotification("ADD_FEED", {
@@ -234,7 +223,7 @@ Module.register("newsfeed",{
*
* attribute feeds object - An object with feeds returned by the node helper.
*/
- generateFeed: function(feeds) {
+ generateFeed: function (feeds) {
var newsItems = [];
for (var feed in feeds) {
var feedItems = feeds[feed];
@@ -242,24 +231,24 @@ Module.register("newsfeed",{
for (var i in feedItems) {
var item = feedItems[i];
item.sourceTitle = this.titleForFeed(feed);
- if (!(this.config.ignoreOldItems && ((Date.now() - new Date(item.pubdate)) > this.config.ignoreOlderThan))) {
+ if (!(this.config.ignoreOldItems && Date.now() - new Date(item.pubdate) > this.config.ignoreOlderThan)) {
newsItems.push(item);
}
}
}
}
- newsItems.sort(function(a,b) {
+ newsItems.sort(function (a, b) {
var dateA = new Date(a.pubdate);
var dateB = new Date(b.pubdate);
return dateB - dateA;
});
- if(this.config.maxNewsItems > 0) {
+ if (this.config.maxNewsItems > 0) {
newsItems = newsItems.slice(0, this.config.maxNewsItems);
}
- if(this.config.prohibitedWords.length > 0) {
- newsItems = newsItems.filter(function(value){
- for (var i=0; i < this.config.prohibitedWords.length; i++) {
+ if (this.config.prohibitedWords.length > 0) {
+ newsItems = newsItems.filter(function (value) {
+ for (var i = 0; i < this.config.prohibitedWords.length; i++) {
if (value["title"].toLowerCase().indexOf(this.config.prohibitedWords[i].toLowerCase()) > -1) {
return false;
}
@@ -270,8 +259,8 @@ Module.register("newsfeed",{
// get updated news items and broadcast them
var updatedItems = [];
- newsItems.forEach(value => {
- if (this.newsItems.findIndex(value1 => value1 === value) === -1) {
+ newsItems.forEach((value) => {
+ if (this.newsItems.findIndex((value1) => value1 === value) === -1) {
// Add item to updated items list
updatedItems.push(value);
}
@@ -279,7 +268,7 @@ Module.register("newsfeed",{
// check if updated items exist, if so and if we should broadcast these updates, then lets do so
if (this.config.broadcastNewsUpdates && updatedItems.length > 0) {
- this.sendNotification("NEWS_FEED_UPDATE", {items: updatedItems});
+ this.sendNotification("NEWS_FEED_UPDATE", { items: updatedItems });
}
this.newsItems = newsItems;
@@ -292,7 +281,7 @@ Module.register("newsfeed",{
*
* returns bool
*/
- subscribedToFeed: function(feedUrl) {
+ subscribedToFeed: function (feedUrl) {
for (var f in this.config.feeds) {
var feed = this.config.feeds[f];
if (feed.url === feedUrl) {
@@ -309,7 +298,7 @@ Module.register("newsfeed",{
*
* returns string
*/
- titleForFeed: function(feedUrl) {
+ titleForFeed: function (feedUrl) {
for (var f in this.config.feeds) {
var feed = this.config.feeds[f];
if (feed.url === feedUrl) {
@@ -322,23 +311,23 @@ Module.register("newsfeed",{
/* scheduleUpdateInterval()
* Schedule visual update.
*/
- scheduleUpdateInterval: function() {
+ scheduleUpdateInterval: function () {
var self = this;
self.updateDom(self.config.animationSpeed);
// Broadcast NewsFeed if needed
if (self.config.broadcastNewsFeeds) {
- self.sendNotification("NEWS_FEED", {items: self.newsItems});
+ self.sendNotification("NEWS_FEED", { items: self.newsItems });
}
- timer = setInterval(function() {
+ this.timer = setInterval(function () {
self.activeItem++;
self.updateDom(self.config.animationSpeed);
// Broadcast NewsFeed if needed
if (self.config.broadcastNewsFeeds) {
- self.sendNotification("NEWS_FEED", {items: self.newsItems});
+ self.sendNotification("NEWS_FEED", { items: self.newsItems });
}
}, this.config.updateInterval);
},
@@ -350,25 +339,25 @@ Module.register("newsfeed",{
*
* return string - Capitalized output string.
*/
- capitalizeFirstLetter: function(string) {
+ capitalizeFirstLetter: function (string) {
return string.charAt(0).toUpperCase() + string.slice(1);
},
- resetDescrOrFullArticleAndTimer: function() {
+ resetDescrOrFullArticleAndTimer: function () {
this.isShowingDescription = this.config.showDescription;
this.config.showFullArticle = false;
this.scrollPosition = 0;
// reset bottom bar alignment
document.getElementsByClassName("region bottom bar")[0].style.bottom = "0";
document.getElementsByClassName("region bottom bar")[0].style.top = "inherit";
- if(!timer){
+ if (!this.timer) {
this.scheduleUpdateInterval();
}
},
- notificationReceived: function(notification, payload, sender) {
- if(notification === "ARTICLE_NEXT"){
- var before = this.activeItem;
+ notificationReceived: function (notification, payload, sender) {
+ var before = this.activeItem;
+ if (notification === "ARTICLE_NEXT") {
this.activeItem++;
if (this.activeItem >= this.newsItems.length) {
this.activeItem = 0;
@@ -376,8 +365,7 @@ Module.register("newsfeed",{
this.resetDescrOrFullArticleAndTimer();
Log.info(this.name + " - going from article #" + before + " to #" + this.activeItem + " (of " + this.newsItems.length + ")");
this.updateDom(100);
- } else if(notification === "ARTICLE_PREVIOUS"){
- var before = this.activeItem;
+ } else if (notification === "ARTICLE_PREVIOUS") {
this.activeItem--;
if (this.activeItem < 0) {
this.activeItem = this.newsItems.length - 1;
@@ -387,58 +375,56 @@ Module.register("newsfeed",{
this.updateDom(100);
}
// if "more details" is received the first time: show article summary, on second time show full article
- else if(notification === "ARTICLE_MORE_DETAILS"){
+ else if (notification === "ARTICLE_MORE_DETAILS") {
// full article is already showing, so scrolling down
- if(this.config.showFullArticle === true){
+ if (this.config.showFullArticle === true) {
this.scrollPosition += this.config.scrollLength;
window.scrollTo(0, this.scrollPosition);
Log.info(this.name + " - scrolling down");
Log.info(this.name + " - ARTICLE_MORE_DETAILS, scroll position: " + this.config.scrollLength);
- }
- else {
+ } else {
this.showFullArticle();
}
- } else if(notification === "ARTICLE_SCROLL_UP"){
- if(this.config.showFullArticle === true){
+ } else if (notification === "ARTICLE_SCROLL_UP") {
+ if (this.config.showFullArticle === true) {
this.scrollPosition -= this.config.scrollLength;
window.scrollTo(0, this.scrollPosition);
Log.info(this.name + " - scrolling up");
Log.info(this.name + " - ARTICLE_SCROLL_UP, scroll position: " + this.config.scrollLength);
}
- } else if(notification === "ARTICLE_LESS_DETAILS"){
+ } else if (notification === "ARTICLE_LESS_DETAILS") {
this.resetDescrOrFullArticleAndTimer();
Log.info(this.name + " - showing only article titles again");
this.updateDom(100);
- } else if (notification === "ARTICLE_TOGGLE_FULL"){
- if (this.config.showFullArticle){
+ } else if (notification === "ARTICLE_TOGGLE_FULL") {
+ if (this.config.showFullArticle) {
this.activeItem++;
this.resetDescrOrFullArticleAndTimer();
} else {
this.showFullArticle();
}
- } else if (notification === "ARTICLE_INFO_REQUEST"){
+ } else if (notification === "ARTICLE_INFO_REQUEST") {
this.sendNotification("ARTICLE_INFO_RESPONSE", {
- title: this.newsItems[this.activeItem].title,
+ title: this.newsItems[this.activeItem].title,
source: this.newsItems[this.activeItem].sourceTitle,
- date: this.newsItems[this.activeItem].pubdate,
- desc: this.newsItems[this.activeItem].description,
- url: this.getActiveItemURL()
+ date: this.newsItems[this.activeItem].pubdate,
+ desc: this.newsItems[this.activeItem].description,
+ url: this.getActiveItemURL()
});
}
},
- showFullArticle: function() {
+ showFullArticle: function () {
this.isShowingDescription = !this.isShowingDescription;
this.config.showFullArticle = !this.isShowingDescription;
// make bottom bar align to top to allow scrolling
- if(this.config.showFullArticle === true){
+ if (this.config.showFullArticle === true) {
document.getElementsByClassName("region bottom bar")[0].style.bottom = "inherit";
document.getElementsByClassName("region bottom bar")[0].style.top = "-90px";
}
- clearInterval(timer);
- timer = null;
+ clearInterval(this.timer);
+ this.timer = null;
Log.info(this.name + " - showing " + this.isShowingDescription ? "article description" : "full article");
this.updateDom(100);
}
-
});
diff --git a/modules/default/newsfeed/node_helper.js b/modules/default/newsfeed/node_helper.js
index 79c4d2fa..f6d6705a 100644
--- a/modules/default/newsfeed/node_helper.js
+++ b/modules/default/newsfeed/node_helper.js
@@ -1,7 +1,7 @@
/* Magic Mirror
* Node Helper: Newsfeed
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
@@ -11,13 +11,13 @@ var Fetcher = require("./fetcher.js");
module.exports = NodeHelper.create({
// Subclass start method.
- start: function() {
+ start: function () {
console.log("Starting module: " + this.name);
this.fetchers = [];
},
// Subclass socketNotificationReceived received.
- socketNotificationReceived: function(notification, payload) {
+ socketNotificationReceived: function (notification, payload) {
if (notification === "ADD_FEED") {
this.createFetcher(payload.feed, payload.config);
return;
@@ -31,7 +31,7 @@ module.exports = NodeHelper.create({
* attribute feed object - A feed object.
* attribute config object - A configuration object containing reload interval in milliseconds.
*/
- createFetcher: function(feed, config) {
+ createFetcher: function (feed, config) {
var self = this;
var url = feed.url || "";
@@ -48,11 +48,11 @@ module.exports = NodeHelper.create({
console.log("Create new news fetcher for url: " + url + " - Interval: " + reloadInterval);
fetcher = new Fetcher(url, reloadInterval, encoding, config.logFeedWarnings);
- fetcher.onReceive(function(fetcher) {
+ fetcher.onReceive(function (fetcher) {
self.broadcastFeeds();
});
- fetcher.onError(function(fetcher, error) {
+ fetcher.onError(function (fetcher, error) {
self.sendSocketNotification("FETCH_ERROR", {
url: fetcher.url(),
error: error
@@ -74,7 +74,7 @@ module.exports = NodeHelper.create({
* Creates an object with all feed items of the different registered feeds,
* and broadcasts these using sendSocketNotification.
*/
- broadcastFeeds: function() {
+ broadcastFeeds: function () {
var feeds = {};
for (var f in this.fetchers) {
feeds[f] = this.fetchers[f].items();
diff --git a/modules/default/newsfeed/translations/de.json b/modules/default/newsfeed/translations/de.json
index 9ec3ef7b..a11eb323 100644
--- a/modules/default/newsfeed/translations/de.json
+++ b/modules/default/newsfeed/translations/de.json
@@ -1,3 +1,3 @@
{
- "configuration_changed": "Die Konfigurationsoptionen für das Newsfeed-Modul haben sich geändert. \nBitte überprüfen Sie die Dokumentation."
-}
\ No newline at end of file
+ "configuration_changed": "Die Konfigurationsoptionen für das Newsfeed-Modul haben sich geändert. \nBitte überprüfen Sie die Dokumentation."
+}
diff --git a/modules/default/newsfeed/translations/en.json b/modules/default/newsfeed/translations/en.json
index 23b6100d..9e804445 100644
--- a/modules/default/newsfeed/translations/en.json
+++ b/modules/default/newsfeed/translations/en.json
@@ -1,3 +1,3 @@
{
- "configuration_changed": "The configuration options for the newsfeed module have changed.\nPlease check the documentation."
-}
\ No newline at end of file
+ "configuration_changed": "The configuration options for the newsfeed module have changed.\nPlease check the documentation."
+}
diff --git a/modules/default/newsfeed/translations/es.json b/modules/default/newsfeed/translations/es.json
index 6143f68c..b1124b6e 100644
--- a/modules/default/newsfeed/translations/es.json
+++ b/modules/default/newsfeed/translations/es.json
@@ -1,3 +1,3 @@
{
- "configuration_changed": "Las opciones de configuración para el módulo de suministro de noticias han cambiado. \nVerifique la documentación."
-}
\ No newline at end of file
+ "configuration_changed": "Las opciones de configuración para el módulo de suministro de noticias han cambiado. \nVerifique la documentación."
+}
diff --git a/modules/default/newsfeed/translations/fr.json b/modules/default/newsfeed/translations/fr.json
index 85c6b412..fa6d522e 100644
--- a/modules/default/newsfeed/translations/fr.json
+++ b/modules/default/newsfeed/translations/fr.json
@@ -1,3 +1,3 @@
{
- "configuration_changed": "Les options de configuration du module newsfeed ont changé. \nVeuillez consulter la documentation."
-}
\ No newline at end of file
+ "configuration_changed": "Les options de configuration du module newsfeed ont changé. \nVeuillez consulter la documentation."
+}
diff --git a/modules/default/updatenotification/README.md b/modules/default/updatenotification/README.md
index af6305e6..0ab6886a 100644
--- a/modules/default/updatenotification/README.md
+++ b/modules/default/updatenotification/README.md
@@ -1,4 +1,5 @@
# Module: Update Notification
+
The `updatenotification` module is one of the default modules of the MagicMirror.
This will display a message whenever a new version of the MagicMirror application is available.
diff --git a/modules/default/updatenotification/node_helper.js b/modules/default/updatenotification/node_helper.js
index 2d41626c..1e47b47e 100644
--- a/modules/default/updatenotification/node_helper.js
+++ b/modules/default/updatenotification/node_helper.js
@@ -6,25 +6,22 @@ var defaultModules = require(__dirname + "/../defaultmodules.js");
var NodeHelper = require("node_helper");
module.exports = NodeHelper.create({
-
config: {},
updateTimer: null,
updateProcessStarted: false,
- start: function () {
- },
-
- configureModules: function(modules) {
+ start: function () {},
+ configureModules: function (modules) {
// Push MagicMirror itself , biggest chance it'll show up last in UI and isn't overwritten
// others will be added in front
// this method returns promises so we can't wait for every one to resolve before continuing
- simpleGits.push({"module": "default", "git": SimpleGit(path.normalize(__dirname + "/../../../"))});
+ simpleGits.push({ module: "default", git: SimpleGit(path.normalize(__dirname + "/../../../")) });
var promises = [];
- for (moduleName in modules) {
+ for (var moduleName in modules) {
if (!this.ignoreUpdateChecking(moduleName)) {
// Default modules are included in the main MagicMirror repo
var moduleFolder = path.normalize(__dirname + "/../../" + moduleName);
@@ -33,7 +30,7 @@ module.exports = NodeHelper.create({
//console.log("checking git for module="+moduleName)
let stat = fs.statSync(path.join(moduleFolder, ".git"));
promises.push(this.resolveRemote(moduleName, moduleFolder));
- } catch(err) {
+ } catch (err) {
// Error when directory .git doesn't exist
// This module is not managed with git, skip
continue;
@@ -47,7 +44,7 @@ module.exports = NodeHelper.create({
socketNotificationReceived: function (notification, payload) {
if (notification === "CONFIG") {
this.config = payload;
- } else if(notification === "MODULES") {
+ } else if (notification === "MODULES") {
// if this is the 1st time thru the update check process
if (!this.updateProcessStarted) {
this.updateProcessStarted = true;
@@ -56,7 +53,7 @@ module.exports = NodeHelper.create({
}
},
- resolveRemote: function(moduleName, moduleFolder) {
+ resolveRemote: function (moduleName, moduleFolder) {
return new Promise((resolve, reject) => {
var git = SimpleGit(moduleFolder);
git.getRemotes(true, (err, remotes) => {
@@ -65,19 +62,19 @@ module.exports = NodeHelper.create({
return resolve();
}
// Folder has .git and has at least one git remote, watch this folder
- simpleGits.unshift({"module": moduleName, "git": git});
+ simpleGits.unshift({ module: moduleName, git: git });
resolve();
});
});
},
- performFetch: function() {
+ performFetch: function () {
var self = this;
simpleGits.forEach((sg) => {
sg.git.fetch().status((err, data) => {
data.module = sg.module;
if (!err) {
- sg.git.log({"-1": null}, (err, data2) => {
+ sg.git.log({ "-1": null }, (err, data2) => {
if (!err && data2.latest && "hash" in data2.latest) {
data.hash = data2.latest.hash;
self.sendSocketNotification("STATUS", data);
@@ -90,19 +87,19 @@ module.exports = NodeHelper.create({
this.scheduleNextFetch(this.config.updateInterval);
},
- scheduleNextFetch: function(delay) {
+ scheduleNextFetch: function (delay) {
if (delay < 60 * 1000) {
delay = 60 * 1000;
}
var self = this;
clearTimeout(this.updateTimer);
- this.updateTimer = setTimeout(function() {
+ this.updateTimer = setTimeout(function () {
self.performFetch();
}, delay);
},
- ignoreUpdateChecking: function(moduleName) {
+ ignoreUpdateChecking: function (moduleName) {
// Should not check for updates for default modules
if (defaultModules.indexOf(moduleName) >= 0) {
return true;
@@ -116,5 +113,4 @@ module.exports = NodeHelper.create({
// The rest of the modules that passes should check for updates
return false;
}
-
});
diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js
index 35a018bf..3de82f1c 100644
--- a/modules/default/updatenotification/updatenotification.js
+++ b/modules/default/updatenotification/updatenotification.js
@@ -1,5 +1,10 @@
+/* Magic Mirror
+ * Module: UpdateNotification
+ *
+ * By Michael Teeuw https://michaelteeuw.nl
+ * MIT Licensed.
+ */
Module.register("updatenotification", {
-
defaults: {
updateInterval: 10 * 60 * 1000, // every 10 minutes
refreshInterval: 24 * 60 * 60 * 1000, // one day
@@ -12,7 +17,10 @@ Module.register("updatenotification", {
start: function () {
var self = this;
Log.log("Start updatenotification");
- setInterval( () => { self.moduleList = {};self.updateDom(2); } , self.config.refreshInterval);
+ setInterval(() => {
+ self.moduleList = {};
+ self.updateDom(2);
+ }, self.config.refreshInterval);
},
notificationReceived: function (notification, payload, sender) {
@@ -33,16 +41,15 @@ Module.register("updatenotification", {
var self = this;
if (payload && payload.behind > 0) {
// if we haven't seen info for this module
- if(this.moduleList[payload.module] == undefined){
+ if (this.moduleList[payload.module] === undefined) {
// save it
- this.moduleList[payload.module]=payload;
+ this.moduleList[payload.module] = payload;
self.updateDom(2);
}
//self.show(1000, { lockString: self.identifier });
-
- } else if (payload && payload.behind == 0){
+ } else if (payload && payload.behind === 0) {
// if the module WAS in the list, but shouldn't be
- if(this.moduleList[payload.module] != undefined){
+ if (this.moduleList[payload.module] !== undefined) {
// remove it
delete this.moduleList[payload.module];
self.updateDom(2);
@@ -50,24 +57,19 @@ Module.register("updatenotification", {
}
},
- diffLink: function(module, text) {
+ diffLink: function (module, text) {
var localRef = module.hash;
var remoteRef = module.tracking.replace(/.*\//, "");
- return "" +
- text +
- "";
+ return '' + text + "";
},
// Override dom generator.
getDom: function () {
var wrapper = document.createElement("div");
- if(this.suspended==false){
+ if (this.suspended === false) {
// process the hash of module info found
- for(key of Object.keys(this.moduleList)){
- let m= this.moduleList[key];
+ for (var key of Object.keys(this.moduleList)) {
+ let m = this.moduleList[key];
var message = document.createElement("div");
message.className = "small bright";
@@ -77,7 +79,7 @@ Module.register("updatenotification", {
icon.innerHTML = " ";
message.appendChild(icon);
- var updateInfoKeyName = m.behind == 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE";
+ var updateInfoKeyName = m.behind === 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE";
var subtextHtml = this.translate(updateInfoKeyName, {
COMMIT_COUNT: m.behind,
@@ -85,9 +87,9 @@ Module.register("updatenotification", {
});
var text = document.createElement("span");
- if (m.module == "default") {
+ if (m.module === "default") {
text.innerHTML = this.translate("UPDATE_NOTIFICATION");
- subtextHtml = this.diffLink(m,subtextHtml);
+ subtextHtml = this.diffLink(m, subtextHtml);
} else {
text.innerHTML = this.translate("UPDATE_NOTIFICATION_MODULE", {
MODULE_NAME: m.module
@@ -106,11 +108,11 @@ Module.register("updatenotification", {
return wrapper;
},
- suspend: function() {
- this.suspended=true;
+ suspend: function () {
+ this.suspended = true;
},
- resume: function() {
- this.suspended=false;
+ resume: function () {
+ this.suspended = false;
this.updateDom(2);
}
});
diff --git a/modules/default/weather/README.md b/modules/default/weather/README.md
index ebc301f4..93f1595d 100755
--- a/modules/default/weather/README.md
+++ b/modules/default/weather/README.md
@@ -1,5 +1,5 @@
# Weather Module
-This module is aimed to be the replacement for the current `currentweather` and `weatherforcast` modules. The module will be configurable to be used as a current weather view, or to show the forecast. This way the module can be used twice to fullfil both purposes.
+This module aims to be the replacement for the current `currentweather` and `weatherforcast` modules. The module will be configurable to be used as a current weather view, or to show the forecast. This way the module can be used twice to fullfil both purposes.
For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/weather.html).
diff --git a/modules/default/weather/providers/README.md b/modules/default/weather/providers/README.md
index dad9ed49..02cef8dd 100755
--- a/modules/default/weather/providers/README.md
+++ b/modules/default/weather/providers/README.md
@@ -13,17 +13,17 @@ Table of Contents:
## The weather provider file: yourprovider.js
-This is the script in which the weather provider will be defined. In it's most simple form, the weather provider must implement the following:
+This is the script in which the weather provider will be defined. In its most simple form, the weather provider must implement the following:
-````javascript
+```javascript
WeatherProvider.register("yourprovider", {
- providerName: "YourProvider",
+ providerName: "YourProvider",
- fetchCurrentWeather() {},
+ fetchCurrentWeather() {},
- fetchWeatherForecast() {}
+ fetchWeatherForecast() {}
});
-````
+```
### Weather provider methods to implement
@@ -36,7 +36,7 @@ It will then automatically refresh the module DOM with the new data.
#### `fetchWeatherForecast()`
-This method is called when the weather module tries to fetch the weather weather of your provider. The implementation of this method is required.
+This method is called when the weather module tries to fetch the weather of your provider. The implementation of this method is required.
The implementation can make use of the already implemented function `this.fetchData(url, method, data);`, which is returning a promise.
After the response is processed, the weather forecast information (as an array of [WeatherObject](#weatherobject)s) needs to be set with `this.setCurrentWeather(forecast);`.
It will then automatically refresh the module DOM with the new data.
@@ -89,24 +89,24 @@ A convenience function to make requests. It returns a promise.
### WeatherObject
-| Property | Type | Value/Unit |
-| --- | --- | --- |
-| units | `string` | Gets initialized with the constructor.
Possible values: `metric`, `imperial` |
-| tempUnits | `string` | Gets initialized with the constructor.
Possible values: `metric`, `imperial` |
-| windUnits | `string` | Gets initialized with the constructor.
Possible values: `metric`, `imperial` |
-| date | `object` | [Moment.js](https://momentjs.com/) object of the time/date. |
-| windSpeed |`number` | Metric: `meter/second`
Imperial: `miles/hour` |
-| windDirection |`number` | Direction of the wind in degrees. |
-| sunrise |`object` | [Moment.js](https://momentjs.com/) object of sunrise. |
-| sunset |`object` | [Moment.js](https://momentjs.com/) object of sunset. |
-| temperature | `number` | Current temperature |
-| minTemperature | `number` | Lowest temperature of the day. |
-| maxTemperature | `number` | Highest temperature of the day. |
-| weatherType | `string` | Icon name of the weather type.
Possible values: [WeatherIcons](https://www.npmjs.com/package/weathericons) |
-| humidity | `number` | Percentage of humidity |
-| rain | `number` | Metric: `millimeters`
Imperial: `inches` |
-| snow | `number` | Metric: `millimeters`
Imperial: `inches` |
-| precipitation | `number` | Metric: `millimeters`
Imperial: `inches`
UK Met Office provider: `percent` |
+| Property | Type | Value/Unit |
+| -------------- | -------- | --------------------------------------------------------------------------------------------------------------- |
+| units | `string` | Gets initialized with the constructor.
Possible values: `metric`, `imperial` |
+| tempUnits | `string` | Gets initialized with the constructor.
Possible values: `metric`, `imperial` |
+| windUnits | `string` | Gets initialized with the constructor.
Possible values: `metric`, `imperial` |
+| date | `object` | [Moment.js](https://momentjs.com/) object of the time/date. |
+| windSpeed | `number` | Metric: `meter/second`
Imperial: `miles/hour` |
+| windDirection | `number` | Direction of the wind in degrees. |
+| sunrise | `object` | [Moment.js](https://momentjs.com/) object of sunrise. |
+| sunset | `object` | [Moment.js](https://momentjs.com/) object of sunset. |
+| temperature | `number` | Current temperature |
+| minTemperature | `number` | Lowest temperature of the day. |
+| maxTemperature | `number` | Highest temperature of the day. |
+| weatherType | `string` | Icon name of the weather type.
Possible values: [WeatherIcons](https://www.npmjs.com/package/weathericons) |
+| humidity | `number` | Percentage of humidity |
+| rain | `number` | Metric: `millimeters`
Imperial: `inches` |
+| snow | `number` | Metric: `millimeters`
Imperial: `inches` |
+| precipitation | `number` | Metric: `millimeters`
Imperial: `inches`
UK Met Office provider: `percent` |
#### Current weather
diff --git a/modules/default/weather/providers/darksky.js b/modules/default/weather/providers/darksky.js
index b24c4794..4ba90105 100755
--- a/modules/default/weather/providers/darksky.js
+++ b/modules/default/weather/providers/darksky.js
@@ -1,4 +1,4 @@
-/* global WeatherProvider, WeatherDay */
+/* global WeatherProvider, WeatherObject */
/* Magic Mirror
* Module: Weather
@@ -16,40 +16,42 @@ WeatherProvider.register("darksky", {
providerName: "Dark Sky",
units: {
- imperial: 'us',
- metric: 'si'
+ imperial: "us",
+ metric: "si"
},
fetchCurrentWeather() {
this.fetchData(this.getUrl())
- .then(data => {
- if(!data || !data.currently || typeof data.currently.temperature === "undefined") {
+ .then((data) => {
+ if (!data || !data.currently || typeof data.currently.temperature === "undefined") {
// No usable data?
return;
}
const currentWeather = this.generateWeatherDayFromCurrentWeather(data);
this.setCurrentWeather(currentWeather);
- }).catch(function(request) {
+ })
+ .catch(function (request) {
Log.error("Could not load data ... ", request);
})
- .finally(() => this.updateAvailable())
+ .finally(() => this.updateAvailable());
},
fetchWeatherForecast() {
this.fetchData(this.getUrl())
- .then(data => {
- if(!data || !data.daily || !data.daily.data.length) {
+ .then((data) => {
+ if (!data || !data.daily || !data.daily.data.length) {
// No usable data?
return;
}
const forecast = this.generateWeatherObjectsFromForecast(data.daily.data);
this.setWeatherForecast(forecast);
- }).catch(function(request) {
+ })
+ .catch(function (request) {
Log.error("Could not load data ... ", request);
})
- .finally(() => this.updateAvailable())
+ .finally(() => this.updateAvailable());
},
// Create a URL from the config and base URL.
@@ -109,12 +111,12 @@ WeatherProvider.register("darksky", {
const weatherTypes = {
"clear-day": "day-sunny",
"clear-night": "night-clear",
- "rain": "rain",
- "snow": "snow",
- "sleet": "snow",
- "wind": "wind",
- "fog": "fog",
- "cloudy": "cloudy",
+ rain: "rain",
+ snow: "snow",
+ sleet: "snow",
+ wind: "wind",
+ fog: "fog",
+ cloudy: "cloudy",
"partly-cloudy-day": "day-cloudy",
"partly-cloudy-night": "night-cloudy"
};
diff --git a/modules/default/weather/providers/openweathermap.js b/modules/default/weather/providers/openweathermap.js
index e99dc476..70b715a0 100755
--- a/modules/default/weather/providers/openweathermap.js
+++ b/modules/default/weather/providers/openweathermap.js
@@ -3,14 +3,12 @@
/* Magic Mirror
* Module: Weather
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*
* This class is the blueprint for a weather provider.
*/
-
WeatherProvider.register("openweathermap", {
-
// Set the name of the provider.
// This isn't strictly necessary, since it will fallback to the provider identifier
// But for debugging (and future alerts) it would be nice to have the real name.
@@ -19,7 +17,7 @@ WeatherProvider.register("openweathermap", {
// Overwrite the fetchCurrentWeather method.
fetchCurrentWeather() {
this.fetchData(this.getUrl())
- .then(data => {
+ .then((data) => {
if (!data || !data.main || typeof data.main.temp === "undefined") {
// Did not receive usable new data.
// Maybe this needs a better check?
@@ -31,16 +29,16 @@ WeatherProvider.register("openweathermap", {
const currentWeather = this.generateWeatherObjectFromCurrentWeather(data);
this.setCurrentWeather(currentWeather);
})
- .catch(function(request) {
+ .catch(function (request) {
Log.error("Could not load data ... ", request);
})
- .finally(() => this.updateAvailable())
+ .finally(() => this.updateAvailable());
},
// Overwrite the fetchCurrentWeather method.
fetchWeatherForecast() {
this.fetchData(this.getUrl())
- .then(data => {
+ .then((data) => {
if (!data || !data.list || !data.list.length) {
// Did not receive usable new data.
// Maybe this needs a better check?
@@ -52,10 +50,10 @@ WeatherProvider.register("openweathermap", {
const forecast = this.generateWeatherObjectsFromForecast(data.list);
this.setWeatherForecast(forecast);
})
- .catch(function(request) {
+ .catch(function (request) {
Log.error("Could not load data ... ", request);
})
- .finally(() => this.updateAvailable())
+ .finally(() => this.updateAvailable());
},
/** OpenWeatherMap Specific Methods - These are not part of the default provider methods */
@@ -87,7 +85,6 @@ WeatherProvider.register("openweathermap", {
* Generate WeatherObjects based on forecast information
*/
generateWeatherObjectsFromForecast(forecasts) {
-
if (this.config.weatherEndpoint === "/forecast") {
return this.fetchForecastHourly(forecasts);
} else if (this.config.weatherEndpoint === "/forecast/daily") {
@@ -114,7 +111,6 @@ WeatherProvider.register("openweathermap", {
let weather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
for (const forecast of forecasts) {
-
if (date !== moment(forecast.dt, "X").format("YYYY-MM-DD")) {
// calculate minimum/maximum temperature, specify rain amount
weather.minTemperature = Math.min.apply(null, minTemp);
@@ -140,7 +136,6 @@ WeatherProvider.register("openweathermap", {
// If the first value of today is later than 17:00, we have an icon at least!
weather.weatherType = this.convertWeatherType(forecast.weather[0].icon);
-
}
if (moment(forecast.dt, "X").format("H") >= 8 && moment(forecast.dt, "X").format("H") <= 17) {
@@ -223,7 +218,7 @@ WeatherProvider.register("openweathermap", {
days.push(weather);
}
- return days;
+ return days;
},
/*
@@ -261,16 +256,16 @@ WeatherProvider.register("openweathermap", {
*/
getParams() {
let params = "?";
- if(this.config.locationID) {
+ if (this.config.locationID) {
params += "id=" + this.config.locationID;
- } else if(this.config.location) {
+ } else if (this.config.location) {
params += "q=" + this.config.location;
} else if (this.firstEvent && this.firstEvent.geo) {
params += "lat=" + this.firstEvent.geo.lat + "&lon=" + this.firstEvent.geo.lon;
} else if (this.firstEvent && this.firstEvent.location) {
params += "q=" + this.firstEvent.location;
} else {
- this.hide(this.config.animationSpeed, {lockString:this.identifier});
+ this.hide(this.config.animationSpeed, { lockString: this.identifier });
return;
}
diff --git a/modules/default/weather/providers/ukmetoffice.js b/modules/default/weather/providers/ukmetoffice.js
index 47785b3b..f1a50074 100755
--- a/modules/default/weather/providers/ukmetoffice.js
+++ b/modules/default/weather/providers/ukmetoffice.js
@@ -1,4 +1,4 @@
-/* global WeatherProvider, WeatherObject */
+/* global WeatherProvider, WeatherObject, SunCalc */
/* Magic Mirror
* Module: Weather
@@ -8,10 +8,7 @@
*
* This class is a provider for UK Met Office Datapoint.
*/
-
-
WeatherProvider.register("ukmetoffice", {
-
// Set the name of the provider.
// This isn't strictly necessary, since it will fallback to the provider identifier
// But for debugging (and future alerts) it would be nice to have the real name.
@@ -25,9 +22,8 @@ WeatherProvider.register("ukmetoffice", {
// Overwrite the fetchCurrentWeather method.
fetchCurrentWeather() {
this.fetchData(this.getUrl("3hourly"))
- .then(data => {
- if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location ||
- !data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length == 0) {
+ .then((data) => {
+ if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location || !data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length === 0) {
// Did not receive usable new data.
// Maybe this needs a better check?
return;
@@ -38,18 +34,17 @@ WeatherProvider.register("ukmetoffice", {
const currentWeather = this.generateWeatherObjectFromCurrentWeather(data);
this.setCurrentWeather(currentWeather);
})
- .catch(function(request) {
+ .catch(function (request) {
Log.error("Could not load data ... ", request);
})
- .finally(() => this.updateAvailable())
+ .finally(() => this.updateAvailable());
},
// Overwrite the fetchCurrentWeather method.
fetchWeatherForecast() {
this.fetchData(this.getUrl("daily"))
- .then(data => {
- if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location ||
- !data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length == 0) {
+ .then((data) => {
+ if (!data || !data.SiteRep || !data.SiteRep.DV || !data.SiteRep.DV.Location || !data.SiteRep.DV.Location.Period || data.SiteRep.DV.Location.Period.length === 0) {
// Did not receive usable new data.
// Maybe this needs a better check?
return;
@@ -60,14 +55,12 @@ WeatherProvider.register("ukmetoffice", {
const forecast = this.generateWeatherObjectsFromForecast(data);
this.setWeatherForecast(forecast);
})
- .catch(function(request) {
+ .catch(function (request) {
Log.error("Could not load data ... ", request);
})
- .finally(() => this.updateAvailable())
+ .finally(() => this.updateAvailable());
},
-
-
/** UK Met Office Specific Methods - These are not part of the default provider methods */
/*
* Gets the complete url for the request
@@ -83,24 +76,23 @@ WeatherProvider.register("ukmetoffice", {
const currentWeather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
// data times are always UTC
- let nowUtc = moment.utc()
- let midnightUtc = nowUtc.clone().startOf("day")
+ let nowUtc = moment.utc();
+ let midnightUtc = nowUtc.clone().startOf("day");
let timeInMins = nowUtc.diff(midnightUtc, "minutes");
// loop round each of the (5) periods, look for today (the first period may be yesterday)
- for (i in currentWeatherData.SiteRep.DV.Location.Period) {
- let periodDate = moment.utc(currentWeatherData.SiteRep.DV.Location.Period[i].value.substr(0,10), "YYYY-MM-DD")
+ for (var i in currentWeatherData.SiteRep.DV.Location.Period) {
+ let periodDate = moment.utc(currentWeatherData.SiteRep.DV.Location.Period[i].value.substr(0, 10), "YYYY-MM-DD");
// ignore if period is before today
if (periodDate.isSameOrAfter(moment.utc().startOf("day"))) {
-
// check this is the period we want, after today the diff will be -ve
if (moment().diff(periodDate, "minutes") > 0) {
// loop round the reports looking for the one we are in
// $ value specifies the time in minutes-of-the-day: 0, 180, 360,...1260
- for (j in currentWeatherData.SiteRep.DV.Location.Period[i].Rep){
+ for (var j in currentWeatherData.SiteRep.DV.Location.Period[i].Rep) {
let p = currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].$;
- if (timeInMins >= p && timeInMins-180 < p) {
+ if (timeInMins >= p && timeInMins - 180 < p) {
// finally got the one we want, so populate weather object
currentWeather.humidity = currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].H;
currentWeather.temperature = this.convertTemp(currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].T);
@@ -116,7 +108,7 @@ WeatherProvider.register("ukmetoffice", {
}
// determine the sunrise/sunset times - not supplied in UK Met Office data
- let times = this.calcAstroData(currentWeatherData.SiteRep.DV.Location)
+ let times = this.calcAstroData(currentWeatherData.SiteRep.DV.Location);
currentWeather.sunrise = times[0];
currentWeather.sunset = times[1];
@@ -127,22 +119,21 @@ WeatherProvider.register("ukmetoffice", {
* Generate WeatherObjects based on forecast information
*/
generateWeatherObjectsFromForecast(forecasts) {
-
const days = [];
// loop round the (5) periods getting the data
// for each period array, Day is [0], Night is [1]
- for (j in forecasts.SiteRep.DV.Location.Period) {
+ for (var j in forecasts.SiteRep.DV.Location.Period) {
const weather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
// data times are always UTC
- dateStr = forecasts.SiteRep.DV.Location.Period[j].value
- let periodDate = moment.utc(dateStr.substr(0,10), "YYYY-MM-DD")
+ const dateStr = forecasts.SiteRep.DV.Location.Period[j].value;
+ let periodDate = moment.utc(dateStr.substr(0, 10), "YYYY-MM-DD");
// ignore if period is before today
if (periodDate.isSameOrAfter(moment.utc().startOf("day"))) {
// populate the weather object
- weather.date = moment.utc(dateStr.substr(0,10), "YYYY-MM-DD");
+ weather.date = moment.utc(dateStr.substr(0, 10), "YYYY-MM-DD");
weather.minTemperature = this.convertTemp(forecasts.SiteRep.DV.Location.Period[j].Rep[1].Nm);
weather.maxTemperature = this.convertTemp(forecasts.SiteRep.DV.Location.Period[j].Rep[0].Dm);
weather.weatherType = this.convertWeatherType(forecasts.SiteRep.DV.Location.Period[j].Rep[0].W);
@@ -213,7 +204,7 @@ WeatherProvider.register("ukmetoffice", {
* Convert temp (from degrees C) if required
*/
convertTemp(tempInC) {
- return this.tempUnits === "imperial" ? tempInC * 9 / 5 + 32 : tempInC;
+ return this.tempUnits === "imperial" ? (tempInC * 9) / 5 + 32 : tempInC;
},
/*
@@ -228,22 +219,22 @@ WeatherProvider.register("ukmetoffice", {
*/
convertWindDirection(windDirection) {
const windCardinals = {
- "N": 0,
- "NNE": 22,
- "NE": 45,
- "ENE": 67,
- "E": 90,
- "ESE": 112,
- "SE": 135,
- "SSE": 157,
- "S": 180,
- "SSW": 202,
- "SW": 225,
- "WSW": 247,
- "W": 270,
- "WNW": 292,
- "NW": 315,
- "NNW": 337
+ N: 0,
+ NNE: 22,
+ NE: 45,
+ ENE: 67,
+ E: 90,
+ ESE: 112,
+ SE: 135,
+ SSE: 157,
+ S: 180,
+ SSW: 202,
+ SW: 225,
+ WSW: 247,
+ W: 270,
+ WNW: 292,
+ NW: 315,
+ NNW: 337
};
return windCardinals.hasOwnProperty(windDirection) ? windCardinals[windDirection] : null;
diff --git a/modules/default/weather/providers/weathergov.js b/modules/default/weather/providers/weathergov.js
index 74d95522..c24e4de1 100755
--- a/modules/default/weather/providers/weathergov.js
+++ b/modules/default/weather/providers/weathergov.js
@@ -1,4 +1,4 @@
-/* global WeatherProvider, WeatherObject */
+/* global WeatherProvider, WeatherObject, SunCalc */
/* Magic Mirror
* Module: Weather
@@ -11,9 +11,7 @@
* Note that this is only for US locations (lat and lon) and does not require an API key
* Since it is free, there are some items missing - like sunrise, sunset, humidity, etc.
*/
-
WeatherProvider.register("weathergov", {
-
// Set the name of the provider.
// This isn't strictly necessary, since it will fallback to the provider identifier
// But for debugging (and future alerts) it would be nice to have the real name.
@@ -22,7 +20,7 @@ WeatherProvider.register("weathergov", {
// Overwrite the fetchCurrentWeather method.
fetchCurrentWeather() {
this.fetchData(this.getUrl())
- .then(data => {
+ .then((data) => {
if (!data || !data.properties || !data.properties.periods || !data.properties.periods.length) {
// Did not receive usable new data.
// Maybe this needs a better check?
@@ -32,16 +30,16 @@ WeatherProvider.register("weathergov", {
const currentWeather = this.generateWeatherObjectFromCurrentWeather(data.properties.periods[0]);
this.setCurrentWeather(currentWeather);
})
- .catch(function(request) {
+ .catch(function (request) {
Log.error("Could not load data ... ", request);
})
- .finally(() => this.updateAvailable())
+ .finally(() => this.updateAvailable());
},
// Overwrite the fetchCurrentWeather method.
fetchWeatherForecast() {
this.fetchData(this.getUrl())
- .then(data => {
+ .then((data) => {
if (!data || !data.properties || !data.properties.periods || !data.properties.periods.length) {
// Did not receive usable new data.
// Maybe this needs a better check?
@@ -51,10 +49,10 @@ WeatherProvider.register("weathergov", {
const forecast = this.generateWeatherObjectsFromForecast(data.properties.periods);
this.setWeatherForecast(forecast);
})
- .catch(function(request) {
+ .catch(function (request) {
Log.error("Could not load data ... ", request);
})
- .finally(() => this.updateAvailable())
+ .finally(() => this.updateAvailable());
},
/** Weather.gov Specific Methods - These are not part of the default provider methods */
@@ -77,7 +75,7 @@ WeatherProvider.register("weathergov", {
currentWeather.weatherType = this.convertWeatherType(currentWeatherData.shortForecast, currentWeatherData.isDaytime);
// determine the sunrise/sunset times - not supplied in weather.gov data
- let times = this.calcAstroData(this.config.lat, this.config.lon)
+ let times = this.calcAstroData(this.config.lat, this.config.lon);
currentWeather.sunrise = times[0];
currentWeather.sunset = times[1];
@@ -106,9 +104,7 @@ WeatherProvider.register("weathergov", {
weather.precipitation = 0;
for (const forecast of forecasts) {
-
if (date !== moment(forecast.startTime).format("YYYY-MM-DD")) {
-
// calculate minimum/maximum temperature, specify rain amount
weather.minTemperature = Math.min.apply(null, minTemp);
weather.maxTemperature = Math.max.apply(null, maxTemp);
@@ -241,22 +237,22 @@ WeatherProvider.register("weathergov", {
*/
convertWindDirection(windDirection) {
const windCardinals = {
- "N": 0,
- "NNE": 22,
- "NE": 45,
- "ENE": 67,
- "E": 90,
- "ESE": 112,
- "SE": 135,
- "SSE": 157,
- "S": 180,
- "SSW": 202,
- "SW": 225,
- "WSW": 247,
- "W": 270,
- "WNW": 292,
- "NW": 315,
- "NNW": 337
+ N: 0,
+ NNE: 22,
+ NE: 45,
+ ENE: 67,
+ E: 90,
+ ESE: 112,
+ SE: 135,
+ SSE: 157,
+ S: 180,
+ SSW: 202,
+ SW: 225,
+ WSW: 247,
+ W: 270,
+ WNW: 292,
+ NW: 315,
+ NNW: 337
};
return windCardinals.hasOwnProperty(windDirection) ? windCardinals[windDirection] : null;
diff --git a/modules/default/weather/weather.css b/modules/default/weather/weather.css
index 639ce7a9..2d7600ad 100644
--- a/modules/default/weather/weather.css
+++ b/modules/default/weather/weather.css
@@ -3,8 +3,6 @@
font-size: 75%;
line-height: 65px;
display: inline-block;
- -ms-transform: translate(0, -3px); /* IE 9 */
- -webkit-transform: translate(0, -3px); /* Safari */
transform: translate(0, -3px);
}
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 868316d9..b7ddd0c9 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -1,16 +1,14 @@
-/* global Module, WeatherProvider */
+/* global WeatherProvider */
/* Magic Mirror
* Module: Weather
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
-
-Module.register("weather",{
+Module.register("weather", {
// Default module config.
defaults: {
- updateInterval: 10 * 60 * 1000,
weatherProvider: "openweathermap",
roundTemp: false,
type: "current", //current, forecast
@@ -45,7 +43,7 @@ Module.register("weather",{
retryDelay: 2500,
apiVersion: "2.5",
- apiBase: "http://api.openweathermap.org/data/",
+ apiBase: "https://api.openweathermap.org/data/",
weatherEndpoint: "/weather",
appendLocationNameToHeader: true,
@@ -62,23 +60,17 @@ Module.register("weather",{
weatherProvider: null,
// Define required scripts.
- getStyles: function() {
+ getStyles: function () {
return ["font-awesome.css", "weather-icons.css", "weather.css"];
},
// Return the scripts that are necessary for the weather module.
getScripts: function () {
- return [
- "moment.js",
- "weatherprovider.js",
- "weatherobject.js",
- "suncalc.js",
- this.file("providers/" + this.config.weatherProvider.toLowerCase() + ".js")
- ];
+ return ["moment.js", "weatherprovider.js", "weatherobject.js", "suncalc.js", this.file("providers/" + this.config.weatherProvider.toLowerCase() + ".js")];
},
// Override getHeader method.
- getHeader: function() {
+ getHeader: function () {
if (this.config.appendLocationNameToHeader && this.data.header !== undefined && this.weatherProvider) {
return this.data.header + " " + this.weatherProvider.fetchedLocation();
}
@@ -104,7 +96,7 @@ Module.register("weather",{
},
// Override notification handler.
- notificationReceived: function(notification, payload, sender) {
+ notificationReceived: function (notification, payload, sender) {
if (notification === "CALENDAR_EVENTS") {
var senderClasses = sender.data.classes.toLowerCase().split(" ");
if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
@@ -147,13 +139,13 @@ Module.register("weather",{
},
// What to do when the weather provider has new information available?
- updateAvailable: function() {
+ updateAvailable: function () {
Log.log("New weather information available.");
this.updateDom(0);
this.scheduleUpdate();
},
- scheduleUpdate: function(delay = null) {
+ scheduleUpdate: function (delay = null) {
var nextLoad = this.config.updateInterval;
if (delay !== null && delay >= 0) {
nextLoad = delay;
@@ -168,88 +160,106 @@ Module.register("weather",{
}, nextLoad);
},
- roundValue: function(temperature) {
+ roundValue: function (temperature) {
var decimals = this.config.roundTemp ? 0 : 1;
return parseFloat(temperature).toFixed(decimals);
},
addFilters() {
- this.nunjucksEnvironment().addFilter("formatTime", function(date) {
- date = moment(date);
+ this.nunjucksEnvironment().addFilter(
+ "formatTime",
+ function (date) {
+ date = moment(date);
- if (this.config.timeFormat !== 24) {
- if (this.config.showPeriod) {
- if (this.config.showPeriodUpper) {
- return date.format("h:mm A");
+ if (this.config.timeFormat !== 24) {
+ if (this.config.showPeriod) {
+ if (this.config.showPeriodUpper) {
+ return date.format("h:mm A");
+ } else {
+ return date.format("h:mm a");
+ }
} else {
- return date.format("h:mm a");
- }
- } else {
- return date.format("h:mm");
- }
- }
-
- return date.format("HH:mm");
- }.bind(this));
-
- this.nunjucksEnvironment().addFilter("unit", function (value, type) {
- if (type === "temperature") {
- if (this.config.tempUnits === "metric" || this.config.tempUnits === "imperial") {
- value += "°";
- }
- if (this.config.degreeLabel) {
- if (this.config.tempUnits === "metric") {
- value += "C";
- } else if (this.config.tempUnits === "imperial") {
- value += "F";
- } else {
- value += "K";
+ return date.format("h:mm");
}
}
- } else if (type === "precip") {
- if (isNaN(value) || value === 0 || value.toFixed(2) === "0.00") {
- value = "";
- } else {
- if (this.config.weatherProvider === "ukmetoffice") {
- value += "%";
- } else {
- value = `${value.toFixed(2)} ${this.config.units === "imperial" ? "in" : "mm"}`;
- }
+
+ return date.format("HH:mm");
+ }.bind(this)
+ );
+
+ this.nunjucksEnvironment().addFilter(
+ "unit",
+ function (value, type) {
+ if (type === "temperature") {
+ if (this.config.tempUnits === "metric" || this.config.tempUnits === "imperial") {
+ value += "°";
+ }
+ if (this.config.degreeLabel) {
+ if (this.config.tempUnits === "metric") {
+ value += "C";
+ } else if (this.config.tempUnits === "imperial") {
+ value += "F";
+ } else {
+ value += "K";
+ }
+ }
+ } else if (type === "precip") {
+ if (isNaN(value) || value === 0 || value.toFixed(2) === "0.00") {
+ value = "";
+ } else {
+ if (this.config.weatherProvider === "ukmetoffice") {
+ value += "%";
+ } else {
+ value = `${value.toFixed(2)} ${this.config.units === "imperial" ? "in" : "mm"}`;
+ }
+ }
+ } else if (type === "humidity") {
+ value += "%";
}
- } else if (type === "humidity") {
- value += "%";
- }
- return value;
- }.bind(this));
+ return value;
+ }.bind(this)
+ );
- this.nunjucksEnvironment().addFilter("roundValue", function(value) {
- return this.roundValue(value);
- }.bind(this));
+ this.nunjucksEnvironment().addFilter(
+ "roundValue",
+ function (value) {
+ return this.roundValue(value);
+ }.bind(this)
+ );
- this.nunjucksEnvironment().addFilter("decimalSymbol", function(value) {
- return value.toString().replace(/\./g, this.config.decimalSymbol);
- }.bind(this));
+ this.nunjucksEnvironment().addFilter(
+ "decimalSymbol",
+ function (value) {
+ return value.toString().replace(/\./g, this.config.decimalSymbol);
+ }.bind(this)
+ );
- this.nunjucksEnvironment().addFilter("calcNumSteps", function(forecast) {
- return Math.min(forecast.length, this.config.maxNumberOfDays);
- }.bind(this));
+ this.nunjucksEnvironment().addFilter(
+ "calcNumSteps",
+ function (forecast) {
+ return Math.min(forecast.length, this.config.maxNumberOfDays);
+ }.bind(this)
+ );
- this.nunjucksEnvironment().addFilter("opacity", function(currentStep, numSteps) {
- if (this.config.fade && this.config.fadePoint < 1) {
- if (this.config.fadePoint < 0) {
- this.config.fadePoint = 0;
- }
- var startingPoint = numSteps * this.config.fadePoint;
- var numFadesteps = numSteps - startingPoint;
- if (currentStep >= startingPoint) {
- return 1 - (currentStep - startingPoint) / numFadesteps;
+ this.nunjucksEnvironment().addFilter(
+ "opacity",
+ function (currentStep, numSteps) {
+ if (this.config.fade && this.config.fadePoint < 1) {
+ if (this.config.fadePoint < 0) {
+ this.config.fadePoint = 0;
+ }
+ var startingPoint = numSteps * this.config.fadePoint;
+ var numFadesteps = numSteps - startingPoint;
+ if (currentStep >= startingPoint) {
+ return 1 - (currentStep - startingPoint) / numFadesteps;
+ } else {
+ return 1;
+ }
} else {
return 1;
}
- } else {
- return 1;
- }
- }.bind(this));
+ }.bind(this)
+ );
}
});
diff --git a/modules/default/weather/weatherobject.js b/modules/default/weather/weatherobject.js
index ed455537..0ee42123 100755
--- a/modules/default/weather/weatherobject.js
+++ b/modules/default/weather/weatherobject.js
@@ -1,20 +1,16 @@
-/* global Class */
-
/* Magic Mirror
* Module: Weather
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*
* This class is the blueprint for a day which includes weather information.
+ *
+ * Currently this is focused on the information which is necessary for the current weather.
+ * As soon as we start implementing the forecast, mode properties will be added.
*/
-
-// Currently this is focused on the information which is necessary for the current weather.
-// As soon as we start implementing the forecast, mode properties will be added.
-
class WeatherObject {
constructor(units, tempUnits, windUnits) {
-
this.units = units;
this.tempUnits = tempUnits;
this.windUnits = windUnits;
@@ -32,11 +28,10 @@ class WeatherObject {
this.snow = null;
this.precipitation = null;
this.feelsLikeTemp = null;
-
}
cardinalWindDirection() {
- if (this.windDirection > 11.25 && this.windDirection <= 33.75){
+ if (this.windDirection > 11.25 && this.windDirection <= 33.75) {
return "NNE";
} else if (this.windDirection > 33.75 && this.windDirection <= 56.25) {
return "NE";
@@ -72,7 +67,7 @@ class WeatherObject {
}
beaufortWindSpeed() {
- const windInKmh = (this.windUnits === "imperial") ? this.windSpeed * 1.609344 : this.windSpeed * 60 * 60 / 1000;
+ const windInKmh = this.windUnits === "imperial" ? this.windSpeed * 1.609344 : (this.windSpeed * 60 * 60) / 1000;
const speeds = [1, 5, 11, 19, 28, 38, 49, 61, 74, 88, 102, 117, 1000];
for (const [index, speed] of speeds.entries()) {
if (speed > windInKmh) {
@@ -87,24 +82,28 @@ class WeatherObject {
}
feelsLike() {
- if (this.feelsLikeTemp) {
- return this.feelsLikeTemp;
+ if (this.feelsLikeTemp) {
+ return this.feelsLikeTemp;
}
- const windInMph = (this.windUnits === "imperial") ? this.windSpeed : this.windSpeed * 2.23694;
- const tempInF = this.tempUnits === "imperial" ? this.temperature : this.temperature * 9 / 5 + 32;
+ const windInMph = this.windUnits === "imperial" ? this.windSpeed : this.windSpeed * 2.23694;
+ const tempInF = this.tempUnits === "imperial" ? this.temperature : (this.temperature * 9) / 5 + 32;
let feelsLike = tempInF;
if (windInMph > 3 && tempInF < 50) {
feelsLike = Math.round(35.74 + 0.6215 * tempInF - 35.75 * Math.pow(windInMph, 0.16) + 0.4275 * tempInF * Math.pow(windInMph, 0.16));
} else if (tempInF > 80 && this.humidity > 40) {
- feelsLike = -42.379 + 2.04901523 * tempInF + 10.14333127 * this.humidity
- - 0.22475541 * tempInF * this.humidity - 6.83783 * Math.pow(10, -3) * tempInF * tempInF
- - 5.481717 * Math.pow(10, -2) * this.humidity * this.humidity
- + 1.22874 * Math.pow(10, -3) * tempInF * tempInF * this.humidity
- + 8.5282 * Math.pow(10, -4) * tempInF * this.humidity * this.humidity
- - 1.99 * Math.pow(10, -6) * tempInF * tempInF * this.humidity * this.humidity;
+ feelsLike =
+ -42.379 +
+ 2.04901523 * tempInF +
+ 10.14333127 * this.humidity -
+ 0.22475541 * tempInF * this.humidity -
+ 6.83783 * Math.pow(10, -3) * tempInF * tempInF -
+ 5.481717 * Math.pow(10, -2) * this.humidity * this.humidity +
+ 1.22874 * Math.pow(10, -3) * tempInF * tempInF * this.humidity +
+ 8.5282 * Math.pow(10, -4) * tempInF * this.humidity * this.humidity -
+ 1.99 * Math.pow(10, -6) * tempInF * tempInF * this.humidity * this.humidity;
}
- return this.tempUnits === "imperial" ? feelsLike : (feelsLike - 32) * 5 / 9;
+ return this.tempUnits === "imperial" ? feelsLike : ((feelsLike - 32) * 5) / 9;
}
}
diff --git a/modules/default/weather/weatherprovider.js b/modules/default/weather/weatherprovider.js
index 1789b95c..cfcb3ef6 100644
--- a/modules/default/weather/weatherprovider.js
+++ b/modules/default/weather/weatherprovider.js
@@ -3,15 +3,11 @@
/* Magic Mirror
* Module: Weather
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*
* This class is the blueprint for a weather provider.
*/
-
-/**
- * Base BluePrint for the WeatherProvider
- */
var WeatherProvider = Class.extend({
// Weather Provider Properties
providerName: null,
@@ -32,77 +28,77 @@ var WeatherProvider = Class.extend({
// All the following methods can be overwritten, although most are good as they are.
// Called when a weather provider is initialized.
- init: function(config) {
+ init: function (config) {
this.config = config;
Log.info(`Weather provider: ${this.providerName} initialized.`);
},
// Called to set the config, this config is the same as the weather module's config.
- setConfig: function(config) {
+ setConfig: function (config) {
this.config = config;
Log.info(`Weather provider: ${this.providerName} config set.`, this.config);
},
// Called when the weather provider is about to start.
- start: function() {
+ start: function () {
Log.info(`Weather provider: ${this.providerName} started.`);
},
// This method should start the API request to fetch the current weather.
// This method should definitely be overwritten in the provider.
- fetchCurrentWeather: function() {
+ fetchCurrentWeather: function () {
Log.warn(`Weather provider: ${this.providerName} does not subclass the fetchCurrentWeather method.`);
},
// This method should start the API request to fetch the weather forecast.
// This method should definitely be overwritten in the provider.
- fetchWeatherForecast: function() {
+ fetchWeatherForecast: function () {
Log.warn(`Weather provider: ${this.providerName} does not subclass the fetchWeatherForecast method.`);
},
// This returns a WeatherDay object for the current weather.
- currentWeather: function() {
+ currentWeather: function () {
return this.currentWeatherObject;
},
// This returns an array of WeatherDay objects for the weather forecast.
- weatherForecast: function() {
+ weatherForecast: function () {
return this.weatherForecastArray;
},
// This returns the name of the fetched location or an empty string.
- fetchedLocation: function() {
+ fetchedLocation: function () {
return this.fetchedLocationName || "";
},
// Set the currentWeather and notify the delegate that new information is available.
- setCurrentWeather: function(currentWeatherObject) {
+ setCurrentWeather: function (currentWeatherObject) {
// We should check here if we are passing a WeatherDay
this.currentWeatherObject = currentWeatherObject;
},
// Set the weatherForecastArray and notify the delegate that new information is available.
- setWeatherForecast: function(weatherForecastArray) {
+ setWeatherForecast: function (weatherForecastArray) {
// We should check here if we are passing a WeatherDay
this.weatherForecastArray = weatherForecastArray;
},
// Set the fetched location name.
- setFetchedLocation: function(name) {
+ setFetchedLocation: function (name) {
this.fetchedLocationName = name;
},
// Notify the delegate that new weather is available.
- updateAvailable: function() {
+ updateAvailable: function () {
this.delegate.updateAvailable(this);
},
// A convenience function to make requests. It returns a promise.
- fetchData: function(url, method = "GET", data = null) {
- return new Promise(function(resolve, reject) {
+ fetchData: function (url, method = "GET", data = null) {
+ return new Promise(function (resolve, reject) {
var request = new XMLHttpRequest();
request.open(method, url, true);
- request.onreadystatechange = function() {
+ request.onreadystatechange = function () {
if (this.readyState === 4) {
if (this.status === 200) {
resolve(JSON.parse(this.response));
@@ -124,14 +120,14 @@ WeatherProvider.providers = [];
/**
* Static method to register a new weather provider.
*/
-WeatherProvider.register = function(providerIdentifier, providerDetails) {
+WeatherProvider.register = function (providerIdentifier, providerDetails) {
WeatherProvider.providers[providerIdentifier.toLowerCase()] = WeatherProvider.extend(providerDetails);
};
/**
* Static method to initialize a new weather provider.
*/
-WeatherProvider.initialize = function(providerIdentifier, delegate) {
+WeatherProvider.initialize = function (providerIdentifier, delegate) {
providerIdentifier = providerIdentifier.toLowerCase();
var provider = new WeatherProvider.providers[providerIdentifier]();
diff --git a/modules/default/weatherforecast/README.md b/modules/default/weatherforecast/README.md
index 7dfbd16f..035e23c0 100644
--- a/modules/default/weatherforecast/README.md
+++ b/modules/default/weatherforecast/README.md
@@ -1,4 +1,5 @@
# Module: Weather Forecast
+
The `weatherforecast` module is one of the default modules of the MagicMirror.
This module displays the weather forecast for the coming week, including an an icon to display the current conditions, the minimum temperature and the maximum temperature.
diff --git a/modules/default/weatherforecast/weatherforecast.css b/modules/default/weatherforecast/weatherforecast.css
index 21be13b7..8c419cee 100644
--- a/modules/default/weatherforecast/weatherforecast.css
+++ b/modules/default/weatherforecast/weatherforecast.css
@@ -19,9 +19,9 @@
}
.weatherforecast tr.colored .min-temp {
- color: #BCDDFF;
+ color: #bcddff;
}
.weatherforecast tr.colored .max-temp {
- color: #FF8E99;
+ color: #ff8e99;
}
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index b8fab9e4..8846289e 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -1,14 +1,10 @@
-/* global Module */
-
/* Magic Mirror
* Module: WeatherForecast
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
-
-Module.register("weatherforecast",{
-
+Module.register("weatherforecast", {
// Default module config.
defaults: {
location: false,
@@ -59,27 +55,27 @@ Module.register("weatherforecast",{
"11n": "wi-night-thunderstorm",
"13n": "wi-night-snow",
"50n": "wi-night-alt-cloudy-windy"
- },
+ }
},
- // create a variable for the first upcoming calendaar event. Used if no location is specified.
+ // create a variable for the first upcoming calendar event. Used if no location is specified.
firstEvent: false,
// create a variable to hold the location name based on the API result.
fetchedLocationName: "",
// Define required scripts.
- getScripts: function() {
+ getScripts: function () {
return ["moment.js"];
},
// Define required scripts.
- getStyles: function() {
+ getStyles: function () {
return ["weather-icons.css", "weatherforecast.css"];
},
// Define required translations.
- getTranslations: function() {
+ getTranslations: function () {
// The translations for the default modules are defined in the core translation files.
// Therefor we can just return false. Otherwise we should have returned a dictionary.
// If you're trying to build your own module including translations, check out the documentation.
@@ -87,7 +83,7 @@ Module.register("weatherforecast",{
},
// Define start sequence.
- start: function() {
+ start: function () {
Log.info("Starting module: " + this.name);
// Set locale.
@@ -98,11 +94,10 @@ Module.register("weatherforecast",{
this.scheduleUpdate(this.config.initialLoadDelay);
this.updateTimer = null;
-
},
// Override dom generator.
- getDom: function() {
+ getDom: function () {
var wrapper = document.createElement("div");
if (this.config.appid === "") {
@@ -146,17 +141,17 @@ Module.register("weatherforecast",{
if (this.config.units === "metric" || this.config.units === "imperial") {
degreeLabel += "°";
}
- if(this.config.scale) {
- switch(this.config.units) {
- case "metric":
- degreeLabel += "C";
- break;
- case "imperial":
- degreeLabel += "F";
- break;
- case "default":
- degreeLabel = "K";
- break;
+ if (this.config.scale) {
+ switch (this.config.units) {
+ case "metric":
+ degreeLabel += "C";
+ break;
+ case "imperial":
+ degreeLabel += "F";
+ break;
+ case "default":
+ degreeLabel = "K";
+ break;
}
}
@@ -179,7 +174,7 @@ Module.register("weatherforecast",{
if (isNaN(forecast.rain)) {
rainCell.innerHTML = "";
} else {
- if(config.units !== "imperial") {
+ if (config.units !== "imperial") {
rainCell.innerHTML = parseFloat(forecast.rain).toFixed(1).replace(".", this.config.decimalSymbol) + " mm";
} else {
rainCell.innerHTML = (parseFloat(forecast.rain) / 25.4).toFixed(2).replace(".", this.config.decimalSymbol) + " in";
@@ -197,7 +192,7 @@ Module.register("weatherforecast",{
var steps = this.forecast.length - startingPoint;
if (f >= startingPoint) {
var currentStep = f - startingPoint;
- row.style.opacity = 1 - (1 / steps * currentStep);
+ row.style.opacity = 1 - (1 / steps) * currentStep;
}
}
}
@@ -206,7 +201,7 @@ Module.register("weatherforecast",{
},
// Override getHeader method.
- getHeader: function() {
+ getHeader: function () {
if (this.config.appendLocationNameToHeader) {
return this.data.header + " " + this.fetchedLocationName;
}
@@ -215,10 +210,10 @@ Module.register("weatherforecast",{
},
// Override notification handler.
- notificationReceived: function(notification, payload, sender) {
+ notificationReceived: function (notification, payload, sender) {
if (notification === "DOM_OBJECTS_CREATED") {
if (this.config.appendLocationNameToHeader) {
- this.hide(0, {lockString: this.identifier});
+ this.hide(0, { lockString: this.identifier });
}
}
if (notification === "CALENDAR_EVENTS") {
@@ -242,7 +237,7 @@ Module.register("weatherforecast",{
* Requests new data from openweather.org.
* Calls processWeather on successful response.
*/
- updateWeather: function() {
+ updateWeather: function () {
if (this.config.appid === "") {
Log.error("WeatherForecast: APPID not set!");
return;
@@ -254,7 +249,7 @@ Module.register("weatherforecast",{
var weatherRequest = new XMLHttpRequest();
weatherRequest.open("GET", url, true);
- weatherRequest.onreadystatechange = function() {
+ weatherRequest.onreadystatechange = function () {
if (this.readyState === 4) {
if (this.status === 200) {
self.processWeather(JSON.parse(this.response));
@@ -272,7 +267,7 @@ Module.register("weatherforecast",{
}
if (retry) {
- self.scheduleUpdate((self.loaded) ? -1 : self.config.retryDelay);
+ self.scheduleUpdate(self.loaded ? -1 : self.config.retryDelay);
}
}
};
@@ -284,18 +279,18 @@ Module.register("weatherforecast",{
*
* return String - URL params.
*/
- getParams: function() {
+ getParams: function () {
var params = "?";
- if(this.config.locationID) {
+ if (this.config.locationID) {
params += "id=" + this.config.locationID;
- } else if(this.config.location) {
+ } else if (this.config.location) {
params += "q=" + this.config.location;
} else if (this.firstEvent && this.firstEvent.geo) {
params += "lat=" + this.firstEvent.geo.lat + "&lon=" + this.firstEvent.geo.lon;
} else if (this.firstEvent && this.firstEvent.location) {
params += "q=" + this.firstEvent.location;
} else {
- this.hide(this.config.animationSpeed, {lockString:this.identifier});
+ this.hide(this.config.animationSpeed, { lockString: this.identifier });
return;
}
@@ -310,12 +305,12 @@ Module.register("weatherforecast",{
* parserDataWeather(data)
*
* Use the parse to keep the same struct between daily and forecast Endpoint
- * from Openweather
+ * from openweather.org
*
*/
- parserDataWeather: function(data) {
+ parserDataWeather: function (data) {
if (data.hasOwnProperty("main")) {
- data["temp"] = {"min": data.main.temp_min, "max": data.main.temp_max};
+ data["temp"] = { min: data.main.temp_min, max: data.main.temp_max };
}
return data;
},
@@ -325,7 +320,7 @@ Module.register("weatherforecast",{
*
* argument data object - Weather information received form openweather.org.
*/
- processWeather: function(data) {
+ processWeather: function (data) {
this.fetchedLocationName = data.city.name + ", " + data.city.country;
this.forecast = [];
@@ -333,13 +328,12 @@ Module.register("weatherforecast",{
var forecastData = {};
for (var i = 0, count = data.list.length; i < count; i++) {
-
var forecast = data.list[i];
this.parserDataWeather(forecast); // hack issue #1017
var day;
var hour;
- if(!!forecast.dt_txt) {
+ if (forecast.dt_txt) {
day = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("ddd");
hour = moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss").format("H");
} else {
@@ -348,7 +342,7 @@ Module.register("weatherforecast",{
}
if (day !== lastDay) {
- var forecastData = {
+ forecastData = {
day: day,
icon: this.config.iconTable[forecast.weather[0].icon],
maxTemp: this.roundValue(forecast.temp.max),
@@ -378,7 +372,7 @@ Module.register("weatherforecast",{
}
//Log.log(this.forecast);
- this.show(this.config.animationSpeed, {lockString:this.identifier});
+ this.show(this.config.animationSpeed, { lockString: this.identifier });
this.loaded = true;
this.updateDom(this.config.animationSpeed);
},
@@ -388,7 +382,7 @@ Module.register("weatherforecast",{
*
* argument delay number - Milliseconds before next update. If empty, this.config.updateInterval is used.
*/
- scheduleUpdate: function(delay) {
+ scheduleUpdate: function (delay) {
var nextLoad = this.config.updateInterval;
if (typeof delay !== "undefined" && delay >= 0) {
nextLoad = delay;
@@ -396,7 +390,7 @@ Module.register("weatherforecast",{
var self = this;
clearTimeout(this.updateTimer);
- this.updateTimer = setTimeout(function() {
+ this.updateTimer = setTimeout(function () {
self.updateWeather();
}, nextLoad);
},
@@ -405,15 +399,15 @@ Module.register("weatherforecast",{
* Converts m2 to beaufort (windspeed).
*
* see:
- * http://www.spc.noaa.gov/faq/tornado/beaufort.html
+ * https://www.spc.noaa.gov/faq/tornado/beaufort.html
* https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale
*
* argument ms number - Windspeed in m/s.
*
* return number - Windspeed in beaufort.
*/
- ms2Beaufort: function(ms) {
- var kmh = ms * 60 * 60 / 1000;
+ ms2Beaufort: function (ms) {
+ var kmh = (ms * 60 * 60) / 1000;
var speeds = [1, 5, 11, 19, 28, 38, 49, 61, 74, 88, 102, 117, 1000];
for (var beaufort in speeds) {
var speed = speeds[beaufort];
@@ -431,7 +425,7 @@ Module.register("weatherforecast",{
*
* return string - Rounded Temperature.
*/
- roundValue: function(temperature) {
+ roundValue: function (temperature) {
var decimals = this.config.roundTemp ? 0 : 1;
return parseFloat(temperature).toFixed(decimals);
},
@@ -443,29 +437,31 @@ Module.register("weatherforecast",{
* That object has a property "3h" which contains the amount of rain since the previous forecast in the list.
* This code finds all forecasts that is for the same day and sums the amount of rain and returns that.
*/
- processRain: function(forecast, allForecasts) {
+ processRain: function (forecast, allForecasts) {
//If the amount of rain actually is a number, return it
if (!isNaN(forecast.rain)) {
return forecast.rain;
}
//Find all forecasts that is for the same day
- var checkDateTime = (!!forecast.dt_txt) ? moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(forecast.dt, "X");
- var daysForecasts = allForecasts.filter(function(item) {
- var itemDateTime = (!!item.dt_txt) ? moment(item.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(item.dt, "X");
+ var checkDateTime = forecast.dt_txt ? moment(forecast.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(forecast.dt, "X");
+ var daysForecasts = allForecasts.filter(function (item) {
+ var itemDateTime = item.dt_txt ? moment(item.dt_txt, "YYYY-MM-DD hh:mm:ss") : moment(item.dt, "X");
return itemDateTime.isSame(checkDateTime, "day") && item.rain instanceof Object;
});
//If no rain this day return undefined so it wont be displayed for this day
- if (daysForecasts.length == 0) {
+ if (daysForecasts.length === 0) {
return undefined;
}
//Summarize all the rain from the matching days
- return daysForecasts.map(function(item) {
- return Object.values(item.rain)[0];
- }).reduce(function(a, b) {
- return a + b;
- }, 0);
+ return daysForecasts
+ .map(function (item) {
+ return Object.values(item.rain)[0];
+ })
+ .reduce(function (a, b) {
+ return a + b;
+ }, 0);
}
});
diff --git a/package-lock.json b/package-lock.json
index 319f0d90..428fd1fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "magicmirror",
- "version": "2.11.0",
+ "version": "2.12.0-develop",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -8,7 +8,6 @@
"version": "7.8.3",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
"integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
- "dev": true,
"requires": {
"@babel/highlight": "^7.8.3"
}
@@ -47,20 +46,14 @@
}
},
"json5": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz",
- "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+ "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
"dev": true,
"requires": {
"minimist": "^1.2.5"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- },
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -70,12 +63,12 @@
}
},
"@babel/generator": {
- "version": "7.9.4",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz",
- "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
+ "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.9.0",
+ "@babel/types": "^7.9.5",
"jsesc": "^2.5.1",
"lodash": "^4.17.13",
"source-map": "^0.5.0"
@@ -90,14 +83,14 @@
}
},
"@babel/helper-function-name": {
- "version": "7.8.3",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
- "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+ "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
"dev": true,
"requires": {
"@babel/helper-get-function-arity": "^7.8.3",
"@babel/template": "^7.8.3",
- "@babel/types": "^7.8.3"
+ "@babel/types": "^7.9.5"
}
},
"@babel/helper-get-function-arity": {
@@ -183,9 +176,9 @@
}
},
"@babel/helper-validator-identifier": {
- "version": "7.9.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
- "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+ "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
"dev": true
},
"@babel/helpers": {
@@ -203,7 +196,6 @@
"version": "7.8.3",
"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
"integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
- "dev": true,
"requires": {
"chalk": "^2.0.0",
"esutils": "^2.0.2",
@@ -214,7 +206,6 @@
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
"requires": {
"color-convert": "^1.9.0"
}
@@ -223,7 +214,6 @@
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
@@ -234,7 +224,6 @@
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
"requires": {
"has-flag": "^3.0.0"
}
@@ -276,17 +265,17 @@
}
},
"@babel/traverse": {
- "version": "7.9.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz",
- "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
+ "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.8.3",
- "@babel/generator": "^7.9.0",
- "@babel/helper-function-name": "^7.8.3",
+ "@babel/generator": "^7.9.5",
+ "@babel/helper-function-name": "^7.9.5",
"@babel/helper-split-export-declaration": "^7.8.3",
"@babel/parser": "^7.9.0",
- "@babel/types": "^7.9.0",
+ "@babel/types": "^7.9.5",
"debug": "^4.1.0",
"globals": "^11.1.0",
"lodash": "^4.17.13"
@@ -310,12 +299,12 @@
}
},
"@babel/types": {
- "version": "7.9.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
- "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
+ "version": "7.9.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+ "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.9.0",
+ "@babel/helper-validator-identifier": "^7.9.5",
"lodash": "^4.17.13",
"to-fast-properties": "^2.0.0"
}
@@ -381,10 +370,34 @@
}
}
},
+ "@stylelint/postcss-css-in-js": {
+ "version": "0.37.1",
+ "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.1.tgz",
+ "integrity": "sha512-UMf2Rni3JGKi3ZwYRGMYJ5ipOA5ENJSKMtYA/pE1ZLURwdh7B5+z2r73RmWvub+N0UuH1Lo+TGfCgYwPvqpXNw==",
+ "dev": true,
+ "requires": {
+ "@babel/core": ">=7.9.0"
+ }
+ },
+ "@stylelint/postcss-markdown": {
+ "version": "0.36.1",
+ "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.1.tgz",
+ "integrity": "sha512-iDxMBWk9nB2BPi1VFQ+Dc5+XpvODBHw2n3tYpaBZuEAFQlbtF9If0Qh5LTTwSi/XwdbJ2jt+0dis3i8omyggpw==",
+ "dev": true,
+ "requires": {
+ "remark": "^12.0.0",
+ "unist-util-find-all-after": "^3.0.1"
+ }
+ },
"@types/color-name": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
- "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+ "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
+ },
+ "@types/minimatch": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
"dev": true
},
"@types/minimist": {
@@ -393,12 +406,6 @@
"integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
"dev": true
},
- "@types/node": {
- "version": "13.9.8",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.8.tgz",
- "integrity": "sha512-1WgO8hsyHynlx7nhP1kr0OFzsgKz5XDQL+Lfc3b1Q3qIln/n8cKD4m09NJ0+P1Rq7Zgnc7N0+SsMnoD1rEb0kA==",
- "dev": true
- },
"@types/normalize-package-data": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
@@ -417,38 +424,12 @@
"integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
"dev": true
},
- "@types/vfile": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/@types/vfile/-/vfile-3.0.2.tgz",
- "integrity": "sha512-b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw==",
- "dev": true,
- "requires": {
- "@types/node": "*",
- "@types/unist": "*",
- "@types/vfile-message": "*"
- }
- },
- "@types/vfile-message": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-2.0.0.tgz",
- "integrity": "sha512-GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==",
- "dev": true,
- "requires": {
- "vfile-message": "*"
- }
- },
"abab": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
"integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
"dev": true
},
- "abbrev": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
- "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
- "dev": true
- },
"accepts": {
"version": "1.3.7",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
@@ -459,10 +440,9 @@
}
},
"acorn": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
- "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
- "dev": true
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+ "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg=="
},
"acorn-globals": {
"version": "4.3.4",
@@ -475,18 +455,17 @@
},
"dependencies": {
"acorn": {
- "version": "6.4.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
- "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+ "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
"dev": true
}
}
},
"acorn-jsx": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
- "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
- "dev": true
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+ "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="
},
"acorn-walk": {
"version": "6.2.0",
@@ -526,12 +505,18 @@
"dev": true
},
"ansi-escapes": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
- "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==",
- "dev": true,
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+ "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
"requires": {
- "type-fest": "^0.8.1"
+ "type-fest": "^0.11.0"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+ "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="
+ }
}
},
"ansi-regex": {
@@ -552,14 +537,6 @@
"requires": {
"normalize-path": "^3.0.0",
"picomatch": "^2.0.4"
- },
- "dependencies": {
- "normalize-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
- "dev": true
- }
}
},
"apache-crypt": {
@@ -581,7 +558,6 @@
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
- "dev": true,
"requires": {
"sprintf-js": "~1.0.2"
},
@@ -589,11 +565,16 @@
"sprintf-js": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
- "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
- "dev": true
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
}
}
},
+ "array-differ": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
+ "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
+ "dev": true
+ },
"array-equal": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
@@ -649,14 +630,7 @@
"astral-regex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
- "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
- "dev": true
- },
- "async": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
- "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
- "dev": true
+ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
},
"async-limiter": {
"version": "1.0.1",
@@ -675,13 +649,13 @@
"dev": true
},
"autoprefixer": {
- "version": "9.7.5",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.5.tgz",
- "integrity": "sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==",
+ "version": "9.7.6",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz",
+ "integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==",
"dev": true,
"requires": {
- "browserslist": "^4.11.0",
- "caniuse-lite": "^1.0.30001036",
+ "browserslist": "^4.11.1",
+ "caniuse-lite": "^1.0.30001039",
"chalk": "^2.4.2",
"normalize-range": "^0.1.2",
"num2fraction": "^1.2.2",
@@ -773,8 +747,7 @@
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
- "dev": true
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
},
"base64-arraybuffer": {
"version": "0.1.5",
@@ -885,7 +858,6 @@
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -913,13 +885,13 @@
"dev": true
},
"browserslist": {
- "version": "4.11.1",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz",
- "integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==",
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
+ "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
"dev": true,
"requires": {
- "caniuse-lite": "^1.0.30001038",
- "electron-to-chromium": "^1.3.390",
+ "caniuse-lite": "^1.0.30001043",
+ "electron-to-chromium": "^1.3.413",
"node-releases": "^1.1.53",
"pkg-up": "^2.0.0"
}
@@ -959,8 +931,7 @@
"buffer-crc32": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
- "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
- "dev": true
+ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
},
"buffer-equal-constant-time": {
"version": "1.0.1",
@@ -992,8 +963,7 @@
"callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
- "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
- "dev": true
+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
},
"camelcase": {
"version": "2.1.1",
@@ -1015,9 +985,9 @@
"integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
},
"caniuse-lite": {
- "version": "1.0.30001038",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz",
- "integrity": "sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==",
+ "version": "1.0.30001045",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001045.tgz",
+ "integrity": "sha512-Y8o2Iz1KPcD6FjySbk1sPpvJqchgxk/iow0DABpGyzA1UeQAuxh63Xh0Enj5/BrsYbXtCN32JmR4ZxQTCQ6E6A==",
"dev": true
},
"caseless": {
@@ -1093,8 +1063,7 @@
"chardet": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
- "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
- "dev": true
+ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
},
"check-error": {
"version": "1.0.2",
@@ -1116,16 +1085,14 @@
"is-glob": "~4.0.1",
"normalize-path": "~3.0.0",
"readdirp": "~3.2.0"
- },
- "dependencies": {
- "normalize-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
- "dev": true
- }
}
},
+ "ci-info": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+ "dev": true
+ },
"clarinet": {
"version": "0.12.4",
"resolved": "https://registry.npmjs.org/clarinet/-/clarinet-0.12.4.tgz",
@@ -1135,7 +1102,6 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
- "dev": true,
"requires": {
"restore-cursor": "^3.1.0"
}
@@ -1143,8 +1109,7 @@
"cli-width": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
- "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
- "dev": true
+ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
},
"cliui": {
"version": "4.1.0",
@@ -1204,12 +1169,6 @@
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
},
- "coffeescript": {
- "version": "1.10.0",
- "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.10.0.tgz",
- "integrity": "sha1-56qDAZF+9iGzXYo580jc3R234z4=",
- "dev": true
- },
"collapse-white-space": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
@@ -1220,7 +1179,6 @@
"version": "1.9.3",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
- "dev": true,
"requires": {
"color-name": "1.1.3"
}
@@ -1228,8 +1186,7 @@
"color-name": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
- "dev": true
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
},
"colors": {
"version": "1.4.0",
@@ -1250,6 +1207,12 @@
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
},
+ "compare-versions": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+ "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
+ "dev": true
+ },
"component-bind": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
@@ -1268,8 +1231,7 @@
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
- "dev": true
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"concat-stream": {
"version": "1.6.2",
@@ -1288,9 +1250,9 @@
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
},
"readable-stream": {
- "version": "2.3.6",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
@@ -1435,7 +1397,6 @@
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
- "dev": true,
"requires": {
"nice-try": "^1.0.4",
"path-key": "^2.0.1",
@@ -1618,15 +1579,6 @@
}
}
},
- "date-time": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/date-time/-/date-time-1.1.0.tgz",
- "integrity": "sha1-GIdtC9pMGf5w3Tv0sDTygbEqQLY=",
- "dev": true,
- "requires": {
- "time-zone": "^0.1.0"
- }
- },
"dateformat": {
"version": "1.0.12",
"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
@@ -1682,8 +1634,7 @@
"deep-is": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
- "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
- "dev": true
+ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
},
"define-properties": {
"version": "1.1.3",
@@ -1755,7 +1706,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
- "dev": true,
"requires": {
"esutils": "^2.0.2"
}
@@ -1775,6 +1725,12 @@
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
"integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
"dev": true
+ },
+ "entities": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+ "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+ "dev": true
}
}
},
@@ -1899,16 +1855,15 @@
}
},
"electron-to-chromium": {
- "version": "1.3.392",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.392.tgz",
- "integrity": "sha512-/hsgeVdReDsyTBE0aU9FRdh1wnNPrX3xlz3t61F+CJPOT+Umfi9DXHsCX85TEgWZQqlow0Rw44/4/jbU2Sqgkg==",
+ "version": "1.3.414",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.414.tgz",
+ "integrity": "sha512-UfxhIvED++qLwWrAq9uYVcqF8FdeV9sU2S7qhiHYFODxzXRrd1GZRl/PjITHsTEejgibcWDraD8TQqoHb1aCBQ==",
"dev": true
},
"emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
- "dev": true
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"encodeurl": {
"version": "1.0.2",
@@ -2001,9 +1956,9 @@
}
},
"entities": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
- "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+ "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
"dev": true
},
"env-paths": {
@@ -2020,9 +1975,9 @@
}
},
"es-abstract": {
- "version": "1.17.3",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.3.tgz",
- "integrity": "sha512-AwiVPKf3sKGMoWtFw0J7Y4MTZ4Iek67k4COWOwHqS8B9TOZ71DCfcoBmdamy8Y6mj4MDz0+VNUpC2HKHFHA3pg==",
+ "version": "1.17.5",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+ "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
"dev": true,
"requires": {
"es-to-primitive": "^1.2.1",
@@ -2107,7 +2062,6 @@
"version": "6.8.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
"integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
- "dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
"ajv": "^6.10.0",
@@ -2151,14 +2105,12 @@
"ansi-regex": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
},
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
"requires": {
"color-convert": "^1.9.0"
}
@@ -2167,7 +2119,6 @@
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
@@ -2178,7 +2129,6 @@
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
- "dev": true,
"requires": {
"ms": "^2.1.1"
}
@@ -2186,40 +2136,61 @@
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
- "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
- "dev": true
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
},
"strip-ansi": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
"requires": {
"ansi-regex": "^4.1.0"
}
},
"strip-json-comments": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
- "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
- "dev": true
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
+ "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="
},
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
"requires": {
"has-flag": "^3.0.0"
}
}
}
},
+ "eslint-config-prettier": {
+ "version": "6.11.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz",
+ "integrity": "sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==",
+ "dev": true,
+ "requires": {
+ "get-stdin": "^6.0.0"
+ },
+ "dependencies": {
+ "get-stdin": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
+ "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
+ "dev": true
+ }
+ }
+ },
+ "eslint-plugin-prettier": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz",
+ "integrity": "sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==",
+ "dev": true,
+ "requires": {
+ "prettier-linter-helpers": "^1.0.0"
+ }
+ },
"eslint-scope": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
"integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
- "dev": true,
"requires": {
"esrecurse": "^4.1.0",
"estraverse": "^4.1.1"
@@ -2229,7 +2200,6 @@
"version": "1.4.3",
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
"integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
- "dev": true,
"requires": {
"eslint-visitor-keys": "^1.1.0"
}
@@ -2237,40 +2207,42 @@
"eslint-visitor-keys": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
- "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
- "dev": true
+ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
},
"espree": {
- "version": "6.1.2",
- "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz",
- "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==",
- "dev": true,
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
+ "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
"requires": {
- "acorn": "^7.1.0",
- "acorn-jsx": "^5.1.0",
+ "acorn": "^7.1.1",
+ "acorn-jsx": "^5.2.0",
"eslint-visitor-keys": "^1.1.0"
}
},
"esprima": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
- "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
- "dev": true
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
},
"esquery": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
- "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
- "dev": true,
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz",
+ "integrity": "sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==",
"requires": {
- "estraverse": "^4.0.0"
+ "estraverse": "^5.0.0"
+ },
+ "dependencies": {
+ "estraverse": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz",
+ "integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A=="
+ }
}
},
"esrecurse": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
- "dev": true,
"requires": {
"estraverse": "^4.1.0"
}
@@ -2278,26 +2250,18 @@
"estraverse": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
- "dev": true
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
},
"esutils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
- "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
- "dev": true
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
},
"etag": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
},
- "eventemitter2": {
- "version": "0.4.14",
- "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
- "integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
- "dev": true
- },
"eventyoshi": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/eventyoshi/-/eventyoshi-0.2.1.tgz",
@@ -2327,12 +2291,6 @@
"clone-regexp": "^2.1.0"
}
},
- "exit": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
- "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
- "dev": true
- },
"expand-tilde": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
@@ -2438,7 +2396,6 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
- "dev": true,
"requires": {
"chardet": "^0.7.0",
"iconv-lite": "^0.4.24",
@@ -2449,7 +2406,6 @@
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
- "dev": true,
"requires": {
"safer-buffer": ">= 2.1.2 < 3"
}
@@ -2457,14 +2413,14 @@
}
},
"extract-zip": {
- "version": "1.6.7",
- "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
- "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+ "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
"requires": {
- "concat-stream": "1.6.2",
- "debug": "2.6.9",
- "mkdirp": "0.5.1",
- "yauzl": "2.4.1"
+ "concat-stream": "^1.6.2",
+ "debug": "^2.6.9",
+ "mkdirp": "^0.5.4",
+ "yauzl": "^2.10.0"
},
"dependencies": {
"debug": {
@@ -2492,6 +2448,12 @@
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
},
+ "fast-diff": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+ "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+ "dev": true
+ },
"fast-glob": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz",
@@ -2514,22 +2476,21 @@
"fast-levenshtein": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
- "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
- "dev": true
+ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
},
"fastq": {
- "version": "1.6.1",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz",
- "integrity": "sha512-mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw==",
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz",
+ "integrity": "sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==",
"dev": true,
"requires": {
"reusify": "^1.0.4"
}
},
"fd-slicer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
- "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+ "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
"requires": {
"pend": "~1.2.0"
}
@@ -2550,10 +2511,9 @@
}
},
"figures": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz",
- "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==",
- "dev": true,
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+ "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
"requires": {
"escape-string-regexp": "^1.0.5"
}
@@ -2562,7 +2522,6 @@
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
- "dev": true,
"requires": {
"flat-cache": "^2.0.1"
}
@@ -2614,28 +2573,13 @@
"pinkie-promise": "^2.0.0"
}
},
- "findup-sync": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
- "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+ "find-versions": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz",
+ "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
"dev": true,
"requires": {
- "glob": "~5.0.0"
- },
- "dependencies": {
- "glob": {
- "version": "5.0.15",
- "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
- "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
- "dev": true,
- "requires": {
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "2 || 3",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- }
- }
+ "semver-regex": "^2.0.0"
}
},
"flat": {
@@ -2651,7 +2595,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
- "dev": true,
"requires": {
"flatted": "^2.0.0",
"rimraf": "2.6.3",
@@ -2661,8 +2604,7 @@
"flatted": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
- "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
- "dev": true
+ "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
},
"forever-agent": {
"version": "0.6.1",
@@ -2719,13 +2661,12 @@
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
- "dev": true
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"fsevents": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
- "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+ "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
"dev": true,
"optional": true
},
@@ -2738,8 +2679,7 @@
"functional-red-black-tree": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
- "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
- "dev": true
+ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
},
"gaze": {
"version": "1.1.3",
@@ -2782,12 +2722,6 @@
"pump": "^3.0.0"
}
},
- "getobject": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz",
- "integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=",
- "dev": true
- },
"getpass": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -2808,15 +2742,15 @@
}
},
"glob": {
- "version": "7.0.6",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
- "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+ "version": "7.1.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+ "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
- "minimatch": "^3.0.2",
+ "minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
@@ -2825,7 +2759,6 @@
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
"integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
- "dev": true,
"requires": {
"is-glob": "^4.0.1"
}
@@ -2851,10 +2784,9 @@
}
},
"globals": {
- "version": "12.3.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
- "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
- "dev": true,
+ "version": "12.4.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+ "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
"requires": {
"type-fest": "^0.8.1"
}
@@ -2921,14 +2853,6 @@
"dev": true,
"requires": {
"minimist": "^1.2.5"
- },
- "dependencies": {
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
- }
}
},
"graceful-fs": {
@@ -2948,263 +2872,6 @@
"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
"dev": true
},
- "grunt": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz",
- "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==",
- "dev": true,
- "requires": {
- "coffeescript": "~1.10.0",
- "dateformat": "~1.0.12",
- "eventemitter2": "~0.4.13",
- "exit": "~0.1.1",
- "findup-sync": "~0.3.0",
- "glob": "~7.0.0",
- "grunt-cli": "~1.2.0",
- "grunt-known-options": "~1.1.0",
- "grunt-legacy-log": "~2.0.0",
- "grunt-legacy-util": "~1.1.1",
- "iconv-lite": "~0.4.13",
- "js-yaml": "~3.13.0",
- "minimatch": "~3.0.2",
- "mkdirp": "~0.5.1",
- "nopt": "~3.0.6",
- "path-is-absolute": "~1.0.0",
- "rimraf": "~2.6.2"
- },
- "dependencies": {
- "grunt-cli": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz",
- "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=",
- "dev": true,
- "requires": {
- "findup-sync": "~0.3.0",
- "grunt-known-options": "~1.1.0",
- "nopt": "~3.0.6",
- "resolve": "~1.1.0"
- }
- },
- "iconv-lite": {
- "version": "0.4.24",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
- "dev": true,
- "requires": {
- "safer-buffer": ">= 2.1.2 < 3"
- }
- },
- "resolve": {
- "version": "1.1.7",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
- "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
- "dev": true
- }
- }
- },
- "grunt-eslint": {
- "version": "22.0.0",
- "resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-22.0.0.tgz",
- "integrity": "sha512-I7vIU4x/mb20fmA6TAmLx6Wzn7mfs8ZXeuk7LbP2ujKVFV7KZmJ3qXUyqe2wnD+v/74Rs5uYOZrLL8EoBmlG9Q==",
- "dev": true,
- "requires": {
- "chalk": "^2.1.0",
- "eslint": "^6.0.1"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
- }
- },
- "grunt-jsonlint": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/grunt-jsonlint/-/grunt-jsonlint-2.1.2.tgz",
- "integrity": "sha512-I80WQf6SaBA4Qpi+GYyah+sHIm3o34ETTawDKM9LDEE97vztZeKjGexuD4OG7wasFL5pLI0xTsc8Vm16/Z60QA==",
- "dev": true,
- "requires": {
- "@prantlf/jsonlint": "10.2.0"
- }
- },
- "grunt-known-options": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",
- "integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==",
- "dev": true
- },
- "grunt-legacy-log": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-2.0.0.tgz",
- "integrity": "sha512-1m3+5QvDYfR1ltr8hjiaiNjddxGdQWcH0rw1iKKiQnF0+xtgTazirSTGu68RchPyh1OBng1bBUjLmX8q9NpoCw==",
- "dev": true,
- "requires": {
- "colors": "~1.1.2",
- "grunt-legacy-log-utils": "~2.0.0",
- "hooker": "~0.2.3",
- "lodash": "~4.17.5"
- },
- "dependencies": {
- "colors": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
- "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
- "dev": true
- }
- }
- },
- "grunt-legacy-log-utils": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.0.1.tgz",
- "integrity": "sha512-o7uHyO/J+i2tXG8r2bZNlVk20vlIFJ9IEYyHMCQGfWYru8Jv3wTqKZzvV30YW9rWEjq0eP3cflQ1qWojIe9VFA==",
- "dev": true,
- "requires": {
- "chalk": "~2.4.1",
- "lodash": "~4.17.10"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
- }
- },
- "grunt-legacy-util": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.1.1.tgz",
- "integrity": "sha512-9zyA29w/fBe6BIfjGENndwoe1Uy31BIXxTH3s8mga0Z5Bz2Sp4UCjkeyv2tI449ymkx3x26B+46FV4fXEddl5A==",
- "dev": true,
- "requires": {
- "async": "~1.5.2",
- "exit": "~0.1.1",
- "getobject": "~0.1.0",
- "hooker": "~0.2.3",
- "lodash": "~4.17.10",
- "underscore.string": "~3.3.4",
- "which": "~1.3.0"
- }
- },
- "grunt-markdownlint": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/grunt-markdownlint/-/grunt-markdownlint-2.9.0.tgz",
- "integrity": "sha512-jLzTzNVZN/u2iblV2j+2xfJGG+Mv8NMl5CAOWNQftV7SOHnstwR/tiZPac8ZTmJFqwAqCwafIvu9wP2naAS8Og==",
- "dev": true,
- "requires": {
- "markdownlint": "^0.19.0"
- }
- },
- "grunt-stylelint": {
- "version": "0.14.0",
- "resolved": "https://registry.npmjs.org/grunt-stylelint/-/grunt-stylelint-0.14.0.tgz",
- "integrity": "sha512-4gi/Yw9djHEdRlikKvFjy2wkHlD1YVzlJOePUPlYm1PIpGi3PMVJoc7Eon6RVSjdRcj3NcYHbeNA0EzplXzp7w==",
- "dev": true,
- "requires": {
- "chalk": "^2.4.2"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
- "requires": {
- "color-convert": "^1.9.0"
- }
- },
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- }
- },
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
- }
- },
- "grunt-yamllint": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/grunt-yamllint/-/grunt-yamllint-0.3.0.tgz",
- "integrity": "sha1-EAP3n5uluSMVedOOr8M/awmNdPM=",
- "dev": true,
- "requires": {
- "async": "^2.1.5",
- "chalk": "^1.1.3",
- "js-yaml": "^3.8.1"
- },
- "dependencies": {
- "async": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
- "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
- "dev": true,
- "requires": {
- "lodash": "^4.17.14"
- }
- }
- }
- },
"har-schema": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -3265,8 +2932,7 @@
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
- "dev": true
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"has-symbols": {
"version": "1.0.1",
@@ -3339,12 +3005,6 @@
"parse-passwd": "^1.0.0"
}
},
- "hooker": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
- "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
- "dev": true
- },
"hosted-git-info": {
"version": "2.8.5",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
@@ -3399,12 +3059,6 @@
"readable-stream": "^3.1.1"
},
"dependencies": {
- "entities": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
- "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
- "dev": true
- },
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -3505,6 +3159,76 @@
"debug": "^3.1.0"
}
},
+ "husky": {
+ "version": "4.2.5",
+ "resolved": "https://registry.npmjs.org/husky/-/husky-4.2.5.tgz",
+ "integrity": "sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==",
+ "dev": true,
+ "requires": {
+ "chalk": "^4.0.0",
+ "ci-info": "^2.0.0",
+ "compare-versions": "^3.6.0",
+ "cosmiconfig": "^6.0.0",
+ "find-versions": "^3.2.0",
+ "opencollective-postinstall": "^2.0.2",
+ "pkg-dir": "^4.2.0",
+ "please-upgrade-node": "^3.2.0",
+ "slash": "^3.0.0",
+ "which-pm-runs": "^1.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+ "dev": true,
+ "requires": {
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+ "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ }
+ }
+ },
"hyperlinker": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz",
@@ -3533,14 +3257,12 @@
"ignore": {
"version": "4.0.6",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
- "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
- "dev": true
+ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
},
"import-fresh": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
"integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
- "dev": true,
"requires": {
"parent-module": "^1.0.0",
"resolve-from": "^4.0.0"
@@ -3555,8 +3277,7 @@
"imurmurhash": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
- "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
- "dev": true
+ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
},
"indent-string": {
"version": "2.1.0",
@@ -3581,7 +3302,6 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
- "dev": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@@ -3598,104 +3318,103 @@
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
},
"inquirer": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.3.tgz",
- "integrity": "sha512-+OiOVeVydu4hnCGLCSX+wedovR/Yzskv9BFqUNNKq9uU2qg7LCcCo3R86S2E7WLo0y/x2pnEZfZe1CoYnORUAw==",
- "dev": true,
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+ "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
"requires": {
"ansi-escapes": "^4.2.1",
- "chalk": "^2.4.2",
+ "chalk": "^3.0.0",
"cli-cursor": "^3.1.0",
"cli-width": "^2.0.0",
"external-editor": "^3.0.3",
"figures": "^3.0.0",
"lodash": "^4.17.15",
"mute-stream": "0.0.8",
- "run-async": "^2.2.0",
+ "run-async": "^2.4.0",
"rxjs": "^6.5.3",
"string-width": "^4.1.0",
- "strip-ansi": "^5.1.0",
+ "strip-ansi": "^6.0.0",
"through": "^2.3.6"
},
"dependencies": {
"ansi-regex": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
- "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
- "dev": true
+ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
},
"ansi-styles": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
- "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"requires": {
- "color-convert": "^1.9.0"
+ "@types/color-name": "^1.1.1",
+ "color-convert": "^2.0.1"
}
},
"chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+ "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
}
},
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+ },
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+ },
+ "run-async": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz",
+ "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==",
+ "requires": {
+ "is-promise": "^2.1.0"
+ }
},
"string-width": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
- "dev": true,
"requires": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.0"
- },
- "dependencies": {
- "strip-ansi": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
- "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
- "dev": true,
- "requires": {
- "ansi-regex": "^5.0.0"
- }
- }
}
},
"strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
"requires": {
- "ansi-regex": "^4.1.0"
- },
- "dependencies": {
- "ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true
- }
+ "ansi-regex": "^5.0.0"
}
},
"supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+ "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"requires": {
- "has-flag": "^3.0.0"
+ "has-flag": "^4.0.0"
}
}
}
@@ -3790,8 +3509,7 @@
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
- "dev": true
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
},
"is-finite": {
"version": "1.0.2",
@@ -3813,7 +3531,6 @@
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
- "dev": true,
"requires": {
"is-extglob": "^2.1.1"
}
@@ -3831,16 +3548,15 @@
"dev": true
},
"is-plain-obj": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
- "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+ "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
"dev": true
},
"is-promise": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
- "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
- "dev": true
+ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
},
"is-regex": {
"version": "1.0.5",
@@ -3902,8 +3618,7 @@
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
- "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
- "dev": true
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
"isstream": {
"version": "0.1.2",
@@ -3913,14 +3628,12 @@
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
- "dev": true
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
},
"js-yaml": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
- "dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
@@ -4049,8 +3762,7 @@
"json-stable-stringify-without-jsonify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
- "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
- "dev": true
+ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
},
"json-stringify-safe": {
"version": "5.0.1",
@@ -4214,7 +3926,6 @@
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
- "dev": true,
"requires": {
"prelude-ls": "~1.1.2",
"type-check": "~0.3.2"
@@ -4226,15 +3937,6 @@
"integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
"dev": true
},
- "linkify-it": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
- "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
- "dev": true,
- "requires": {
- "uc.micro": "^1.0.1"
- }
- },
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -4423,32 +4125,13 @@
"integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
"dev": true
},
- "markdown-it": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz",
- "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==",
- "dev": true,
- "requires": {
- "argparse": "^1.0.7",
- "entities": "~2.0.0",
- "linkify-it": "^2.0.0",
- "mdurl": "^1.0.1",
- "uc.micro": "^1.0.5"
- }
- },
"markdown-table": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz",
- "integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==",
- "dev": true
- },
- "markdownlint": {
- "version": "0.19.0",
- "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.19.0.tgz",
- "integrity": "sha512-+MsWOnYVUH4klcKM7iRx5cno9FQMDAb6FC6mWlZkeXPwIaK6Z5Vd9VkXkykPidRqmLHU2wI+MNyfUMnUCBw3pQ==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
+ "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
"dev": true,
"requires": {
- "markdown-it": "10.0.0"
+ "repeat-string": "^1.0.0"
}
},
"mathml-tag-names": {
@@ -4458,20 +4141,14 @@
"dev": true
},
"mdast-util-compact": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz",
- "integrity": "sha512-3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
+ "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
"dev": true,
"requires": {
- "unist-util-visit": "^1.1.0"
+ "unist-util-visit": "^2.0.0"
}
},
- "mdurl": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
- "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
- "dev": true
- },
"media-typer": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -4515,6 +4192,12 @@
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
},
+ "merge-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+ "dev": true
+ },
"merge2": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
@@ -4557,8 +4240,7 @@
"mimic-fn": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
- "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
- "dev": true
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
},
"min-indent": {
"version": "1.0.0",
@@ -4570,15 +4252,14 @@
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
- "dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
},
"minimist-options": {
"version": "4.0.2",
@@ -4588,27 +4269,28 @@
"requires": {
"arrify": "^1.0.1",
"is-plain-obj": "^1.1.0"
- }
- },
- "mkdirp": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
- "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
- "requires": {
- "minimist": "0.0.8"
},
"dependencies": {
- "minimist": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+ "is-plain-obj": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+ "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+ "dev": true
}
}
},
+ "mkdirp": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+ "requires": {
+ "minimist": "^1.2.5"
+ }
+ },
"mocha": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.0.0.tgz",
- "integrity": "sha512-CirsOPbO3jU86YKjjMzFLcXIb5YiGLUrjrXFHoJ3e2z9vWiaZVCZQ2+gtRGMPWF+nFhN6AWwLM/juzAQ6KRkbA==",
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz",
+ "integrity": "sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==",
"dev": true,
"requires": {
"ansi-colors": "3.2.3",
@@ -4622,9 +4304,9 @@
"growl": "1.10.5",
"he": "1.2.0",
"js-yaml": "3.13.1",
- "log-symbols": "2.2.0",
+ "log-symbols": "3.0.0",
"minimatch": "3.0.4",
- "mkdirp": "0.5.1",
+ "mkdirp": "0.5.5",
"ms": "2.1.1",
"node-environment-flags": "1.0.6",
"object.assign": "4.1.0",
@@ -4632,8 +4314,8 @@
"supports-color": "6.0.0",
"which": "1.3.1",
"wide-align": "1.1.3",
- "yargs": "13.3.0",
- "yargs-parser": "13.1.1",
+ "yargs": "13.3.2",
+ "yargs-parser": "13.1.2",
"yargs-unparser": "1.6.0"
},
"dependencies": {
@@ -4658,28 +4340,6 @@
"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"dev": true
},
- "chalk": {
- "version": "2.4.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
- "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
- "dev": true,
- "requires": {
- "ansi-styles": "^3.2.1",
- "escape-string-regexp": "^1.0.5",
- "supports-color": "^5.3.0"
- },
- "dependencies": {
- "supports-color": {
- "version": "5.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
- "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
- "dev": true,
- "requires": {
- "has-flag": "^3.0.0"
- }
- }
- }
- },
"cliui": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -4712,20 +4372,6 @@
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
"dev": true
},
- "glob": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
- "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
- "dev": true,
- "requires": {
- "fs.realpath": "^1.0.0",
- "inflight": "^1.0.4",
- "inherits": "2",
- "minimatch": "^3.0.4",
- "once": "^1.3.0",
- "path-is-absolute": "^1.0.0"
- }
- },
"he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -4748,15 +4394,6 @@
"path-exists": "^3.0.0"
}
},
- "log-symbols": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
- "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
- "dev": true,
- "requires": {
- "chalk": "^2.0.1"
- }
- },
"ms": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -4764,9 +4401,9 @@
"dev": true
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -4846,9 +4483,9 @@
"dev": true
},
"yargs": {
- "version": "13.3.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
- "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+ "version": "13.3.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
"dev": true,
"requires": {
"cliui": "^5.0.0",
@@ -4860,13 +4497,13 @@
"string-width": "^3.0.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
- "yargs-parser": "^13.1.1"
+ "yargs-parser": "^13.1.2"
}
},
"yargs-parser": {
- "version": "13.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
- "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+ "version": "13.1.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+ "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -4876,9 +4513,9 @@
}
},
"mocha-each": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/mocha-each/-/mocha-each-1.2.0.tgz",
- "integrity": "sha512-WVNx7Rovf7ebZq5XSlhXqenuyN3xS1InqKYvdR544/mQkMoSfTLhT5iehXyK0xCvxx90QIltU6KojKh3Ptz7mA==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/mocha-each/-/mocha-each-2.0.1.tgz",
+ "integrity": "sha512-0ZgWY5ajbnROXkfyaDb+0RAYzDBH3QVow/1zJiyl7lYMRnj1Nid8RDP2+/2TTajB5n4vr21v35MjB72GjFFj2g==",
"dev": true,
"requires": {
"sprintf-js": "^1.0.3"
@@ -4940,6 +4577,21 @@
"integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
"dev": true
},
+ "minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+ "dev": true
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "dev": true,
+ "requires": {
+ "minimist": "0.0.8"
+ }
+ },
"mocha": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
@@ -4986,22 +4638,47 @@
"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
},
+ "mri": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.5.tgz",
+ "integrity": "sha512-d2RKzMD4JNyHMbnbWnznPaa8vbdlq/4pNZ3IgdaGrVbBhebBsGUUE/6qorTMYNS6TwuH3ilfOlD2bf4Igh8CKg==",
+ "dev": true
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
+ "multimatch": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz",
+ "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==",
+ "dev": true,
+ "requires": {
+ "@types/minimatch": "^3.0.3",
+ "array-differ": "^3.0.0",
+ "array-union": "^2.1.0",
+ "arrify": "^2.0.1",
+ "minimatch": "^3.0.4"
+ },
+ "dependencies": {
+ "arrify": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+ "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+ "dev": true
+ }
+ }
+ },
"mute-stream": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
- "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
- "dev": true
+ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
},
"natural-compare": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
- "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
- "dev": true
+ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
},
"negotiator": {
"version": "0.6.2",
@@ -5011,8 +4688,7 @@
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
- "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
- "dev": true
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
},
"nocache": {
"version": "2.1.0",
@@ -5047,15 +4723,6 @@
"integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
"dev": true
},
- "nopt": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
- "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
- "dev": true,
- "requires": {
- "abbrev": "1"
- }
- },
"normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -5067,6 +4734,12 @@
"validate-npm-package-license": "^3.0.1"
}
},
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true
+ },
"normalize-range": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
@@ -5208,7 +4881,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
- "dev": true,
"requires": {
"wrappy": "1"
}
@@ -5217,11 +4889,16 @@
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
"integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
- "dev": true,
"requires": {
"mimic-fn": "^2.1.0"
}
},
+ "opencollective-postinstall": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
+ "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==",
+ "dev": true
+ },
"optimist": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
@@ -5244,7 +4921,6 @@
"version": "0.8.3",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
- "dev": true,
"requires": {
"deep-is": "~0.1.3",
"fast-levenshtein": "~2.0.6",
@@ -5278,8 +4954,7 @@
"os-tmpdir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
- "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
- "dev": true
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
},
"p-defer": {
"version": "1.0.0",
@@ -5327,7 +5002,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
- "dev": true,
"requires": {
"callsites": "^3.0.0"
}
@@ -5339,9 +5013,9 @@
"dev": true
},
"parse-entities": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz",
- "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+ "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
"dev": true,
"requires": {
"character-entities": "^1.0.0",
@@ -5394,12 +5068,6 @@
}
}
},
- "parse-ms": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz",
- "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=",
- "dev": true
- },
"parse-passwd": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
@@ -5444,14 +5112,12 @@
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
- "dev": true
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
},
"path-key": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
- "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
- "dev": true
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
},
"path-parse": {
"version": "1.0.6",
@@ -5490,9 +5156,9 @@
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
},
"picomatch": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
- "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==",
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+ "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
"dev": true
},
"pify": {
@@ -5519,6 +5185,66 @@
"integrity": "sha1-DPd1eml38b9/ajIge3CeN3OI6HQ=",
"dev": true
},
+ "pkg-dir": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+ "dev": true,
+ "requires": {
+ "find-up": "^4.0.0"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ }
+ }
+ },
"pkg-up": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
@@ -5539,11 +5265,14 @@
}
}
},
- "plur": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz",
- "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=",
- "dev": true
+ "please-upgrade-node": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+ "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
+ "dev": true,
+ "requires": {
+ "semver-compare": "^1.0.0"
+ }
},
"pn": {
"version": "1.1.0",
@@ -5613,15 +5342,6 @@
"htmlparser2": "^3.10.0"
}
},
- "postcss-jsx": {
- "version": "0.36.4",
- "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.4.tgz",
- "integrity": "sha512-jwO/7qWUvYuWYnpOb0+4bIIgJt7003pgU3P6nETBLaOyBXuTD55ho21xnals5nBrlpTIFodyd3/jBi6UO3dHvA==",
- "dev": true,
- "requires": {
- "@babel/core": ">=7.2.2"
- }
- },
"postcss-less": {
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
@@ -5631,16 +5351,6 @@
"postcss": "^7.0.14"
}
},
- "postcss-markdown": {
- "version": "0.36.0",
- "resolved": "https://registry.npmjs.org/postcss-markdown/-/postcss-markdown-0.36.0.tgz",
- "integrity": "sha512-rl7fs1r/LNSB2bWRhyZ+lM/0bwKv9fhl38/06gF6mKMo/NPnp55+K1dSTosSVjFZc0e1ppBlu+WT91ba0PMBfQ==",
- "dev": true,
- "requires": {
- "remark": "^10.0.1",
- "unist-util-find-all-after": "^1.0.2"
- }
- },
"postcss-media-query-parser": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
@@ -5715,12 +5425,12 @@
}
},
"postcss-sass": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.2.tgz",
- "integrity": "sha512-hcRgnd91OQ6Ot9R90PE/khUDCJHG8Uxxd3F7Y0+9VHjBiJgNv7sK5FxyHMCBtoLmmkzVbSj3M3OlqUfLJpq0CQ==",
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
+ "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
"dev": true,
"requires": {
- "gonzales-pe": "^4.2.4",
+ "gonzales-pe": "^4.3.0",
"postcss": "^7.0.21"
}
},
@@ -5759,9 +5469,23 @@
"prelude-ls": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
- "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+ },
+ "prettier": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
+ "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
"dev": true
},
+ "prettier-linter-helpers": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+ "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+ "dev": true,
+ "requires": {
+ "fast-diff": "^1.1.2"
+ }
+ },
"pretty-bytes": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
@@ -5771,15 +5495,192 @@
"meow": "^3.1.0"
}
},
- "pretty-ms": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-2.1.0.tgz",
- "integrity": "sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw=",
+ "pretty-quick": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-2.0.1.tgz",
+ "integrity": "sha512-y7bJt77XadjUr+P1uKqZxFWLddvj3SKY6EU4BuQtMxmmEFSMpbN132pUWdSG1g1mtUfO0noBvn7wBf0BVeomHg==",
"dev": true,
"requires": {
- "is-finite": "^1.0.1",
- "parse-ms": "^1.0.0",
- "plur": "^1.0.0"
+ "chalk": "^2.4.2",
+ "execa": "^2.1.0",
+ "find-up": "^4.1.0",
+ "ignore": "^5.1.4",
+ "mri": "^1.1.4",
+ "multimatch": "^4.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "^1.9.0"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
+ }
+ },
+ "cross-spawn": {
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
+ "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
+ "dev": true,
+ "requires": {
+ "path-key": "^3.1.0",
+ "shebang-command": "^2.0.0",
+ "which": "^2.0.1"
+ }
+ },
+ "execa": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz",
+ "integrity": "sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "^7.0.0",
+ "get-stream": "^5.0.0",
+ "is-stream": "^2.0.0",
+ "merge-stream": "^2.0.0",
+ "npm-run-path": "^3.0.0",
+ "onetime": "^5.1.0",
+ "p-finally": "^2.0.0",
+ "signal-exit": "^3.0.2",
+ "strip-final-newline": "^2.0.0"
+ }
+ },
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "get-stream": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+ "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+ "dev": true,
+ "requires": {
+ "pump": "^3.0.0"
+ }
+ },
+ "ignore": {
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
+ "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+ "dev": true
+ },
+ "is-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+ "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+ "dev": true
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
+ "npm-run-path": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz",
+ "integrity": "sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==",
+ "dev": true,
+ "requires": {
+ "path-key": "^3.0.0"
+ }
+ },
+ "p-finally": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+ "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
+ "dev": true
+ },
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ },
+ "path-key": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+ "dev": true
+ },
+ "shebang-command": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+ "dev": true,
+ "requires": {
+ "shebang-regex": "^3.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ },
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ }
}
},
"process-nextick-args": {
@@ -5790,8 +5691,7 @@
"progress": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
- "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
- "dev": true
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
},
"progress-stream": {
"version": "1.2.0",
@@ -5975,40 +5875,40 @@
"regexpp": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
- "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
- "dev": true
+ "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
},
"remark": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/remark/-/remark-10.0.1.tgz",
- "integrity": "sha512-E6lMuoLIy2TyiokHprMjcWNJ5UxfGQjaMSMhV+f4idM625UjjK4j798+gPs5mfjzDE6vL0oFKVeZM6gZVSVrzQ==",
+ "version": "12.0.0",
+ "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.0.tgz",
+ "integrity": "sha512-oX4lMIS0csgk8AEbzY0h2jdR0ngiCHOpwwpxjmRa5TqAkeknY+tkhjRJGZqnCmvyuWh55/0SW5WY3R3nn3PH9A==",
"dev": true,
"requires": {
- "remark-parse": "^6.0.0",
- "remark-stringify": "^6.0.0",
- "unified": "^7.0.0"
+ "remark-parse": "^8.0.0",
+ "remark-stringify": "^8.0.0",
+ "unified": "^9.0.0"
}
},
"remark-parse": {
- "version": "6.0.3",
- "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz",
- "integrity": "sha512-QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg==",
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.1.tgz",
+ "integrity": "sha512-Ye/5W57tdQZWsfkuVyRq9SUWRgECHnDsMuyUMzdSKpTbNPkZeGtoYfsrkeSi4+Xyl0mhcPPddHITXPcCPHrl3w==",
"dev": true,
"requires": {
+ "ccount": "^1.0.0",
"collapse-white-space": "^1.0.2",
"is-alphabetical": "^1.0.0",
"is-decimal": "^1.0.0",
"is-whitespace-character": "^1.0.0",
"is-word-character": "^1.0.0",
"markdown-escapes": "^1.0.0",
- "parse-entities": "^1.1.0",
+ "parse-entities": "^2.0.0",
"repeat-string": "^1.5.4",
"state-toggle": "^1.0.0",
"trim": "0.0.1",
"trim-trailing-lines": "^1.0.0",
"unherit": "^1.0.4",
- "unist-util-remove-position": "^1.0.0",
- "vfile-location": "^2.0.0",
+ "unist-util-remove-position": "^2.0.0",
+ "vfile-location": "^3.0.0",
"xtend": "^4.0.1"
},
"dependencies": {
@@ -6021,9 +5921,9 @@
}
},
"remark-stringify": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-6.0.4.tgz",
- "integrity": "sha512-eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.0.0.tgz",
+ "integrity": "sha512-cABVYVloFH+2ZI5bdqzoOmemcz/ZuhQSH6W6ZNYnLojAUUn3xtX7u+6BpnYp35qHoGr2NFBsERV14t4vCIeW8w==",
"dev": true,
"requires": {
"ccount": "^1.0.0",
@@ -6032,12 +5932,12 @@
"is-whitespace-character": "^1.0.0",
"longest-streak": "^2.0.1",
"markdown-escapes": "^1.0.0",
- "markdown-table": "^1.1.0",
- "mdast-util-compact": "^1.0.0",
- "parse-entities": "^1.0.2",
+ "markdown-table": "^2.0.0",
+ "mdast-util-compact": "^2.0.0",
+ "parse-entities": "^2.0.0",
"repeat-string": "^1.5.4",
"state-toggle": "^1.0.0",
- "stringify-entities": "^1.0.1",
+ "stringify-entities": "^3.0.0",
"unherit": "^1.0.4",
"xtend": "^4.0.1"
},
@@ -6152,8 +6052,7 @@
"resolve-from": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
- "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
- "dev": true
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
},
"resolve-url": {
"version": "0.2.1",
@@ -6165,7 +6064,6 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
- "dev": true,
"requires": {
"onetime": "^5.1.0",
"signal-exit": "^3.0.2"
@@ -6193,7 +6091,6 @@
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
- "dev": true,
"requires": {
"glob": "^7.1.3"
},
@@ -6202,7 +6099,6 @@
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
- "dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -6259,10 +6155,9 @@
}
},
"rxjs": {
- "version": "6.5.4",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
- "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
- "dev": true,
+ "version": "6.5.5",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
+ "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
"requires": {
"tslib": "^1.9.0"
}
@@ -6287,6 +6182,18 @@
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
},
+ "semver-compare": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+ "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
+ "dev": true
+ },
+ "semver-regex": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
+ "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
+ "dev": true
+ },
"send": {
"version": "0.17.1",
"resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
@@ -6355,7 +6262,6 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
- "dev": true,
"requires": {
"shebang-regex": "^1.0.0"
}
@@ -6363,8 +6269,7 @@
"shebang-regex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
- "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
- "dev": true
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
},
"signal-exit": {
"version": "3.0.2",
@@ -6407,7 +6312,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
- "dev": true,
"requires": {
"ansi-styles": "^3.2.0",
"astral-regex": "^1.0.0",
@@ -6418,7 +6322,6 @@
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
- "dev": true,
"requires": {
"color-convert": "^1.9.0"
}
@@ -6426,8 +6329,7 @@
"is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
}
}
},
@@ -7063,24 +6965,46 @@
"strip-ansi": "^3.0.0"
}
},
- "string.prototype.trimleft": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
- "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+ "string.prototype.trimend": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+ "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
- "function-bind": "^1.1.1"
+ "es-abstract": "^1.17.5"
+ }
+ },
+ "string.prototype.trimleft": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+ "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.17.5",
+ "string.prototype.trimstart": "^1.0.0"
}
},
"string.prototype.trimright": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
- "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+ "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
"dev": true,
"requires": {
"define-properties": "^1.1.3",
- "function-bind": "^1.1.1"
+ "es-abstract": "^1.17.5",
+ "string.prototype.trimend": "^1.0.0"
+ }
+ },
+ "string.prototype.trimstart": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+ "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.17.5"
}
},
"string_decoder": {
@@ -7089,14 +7013,15 @@
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
},
"stringify-entities": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz",
- "integrity": "sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.0.tgz",
+ "integrity": "sha512-h7NJJIssprqlyjHT2eQt2W1F+MCcNmwPGlKb0bWEdET/3N44QN3QbUF/ueKCgAssyKRZ3Br9rQ7FcXjHr0qLHw==",
"dev": true,
"requires": {
"character-entities-html4": "^1.0.0",
"character-entities-legacy": "^1.0.0",
"is-alphanumerical": "^1.0.0",
+ "is-decimal": "^1.0.2",
"is-hexadecimal": "^1.0.0"
}
},
@@ -7122,6 +7047,12 @@
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
"dev": true
},
+ "strip-final-newline": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+ "dev": true
+ },
"strip-indent": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
@@ -7142,14 +7073,16 @@
"dev": true
},
"stylelint": {
- "version": "13.2.1",
- "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.2.1.tgz",
- "integrity": "sha512-461ZV4KpUe7pEHHgMOsH4kkjF7qsjkCIMJYOf7QQC4cvgPUJ0z4Nj+ah5fvKl1rzqBqc5EZa6P0nna4CGoJX+A==",
+ "version": "13.3.3",
+ "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.3.3.tgz",
+ "integrity": "sha512-j8Oio2T1YNiJc6iXDaPYd74Jg4zOa1bByNm/g9/Nvnq4tDPsIjMi46jhRZyPPktGPwjJ5FwcmCqIRlH6PVP8mA==",
"dev": true,
"requires": {
- "autoprefixer": "^9.7.4",
+ "@stylelint/postcss-css-in-js": "^0.37.1",
+ "@stylelint/postcss-markdown": "^0.36.1",
+ "autoprefixer": "^9.7.6",
"balanced-match": "^1.0.0",
- "chalk": "^3.0.0",
+ "chalk": "^4.0.0",
"cosmiconfig": "^6.0.0",
"debug": "^4.1.1",
"execall": "^2.0.0",
@@ -7167,19 +7100,17 @@
"lodash": "^4.17.15",
"log-symbols": "^3.0.0",
"mathml-tag-names": "^2.1.3",
- "meow": "^6.0.1",
+ "meow": "^6.1.0",
"micromatch": "^4.0.2",
"normalize-selector": "^0.2.0",
"postcss": "^7.0.27",
"postcss-html": "^0.36.0",
- "postcss-jsx": "^0.36.4",
"postcss-less": "^3.1.4",
- "postcss-markdown": "^0.36.0",
"postcss-media-query-parser": "^0.2.3",
"postcss-reporter": "^6.0.1",
"postcss-resolve-nested-selector": "^0.1.1",
- "postcss-safe-parser": "^4.0.1",
- "postcss-sass": "^0.4.2",
+ "postcss-safe-parser": "^4.0.2",
+ "postcss-sass": "^0.4.4",
"postcss-scss": "^2.0.0",
"postcss-selector-parser": "^6.0.2",
"postcss-syntax": "^0.36.2",
@@ -7220,9 +7151,9 @@
"dev": true
},
"camelcase-keys": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.1.tgz",
- "integrity": "sha512-BPCNVH56RVIxQQIXskp5tLQXUNGQ6sXr7iCv1FHDt81xBOQ/1r6H8SPxf19InVP6DexWar4s87q9thfuk8X9HA==",
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
"dev": true,
"requires": {
"camelcase": "^5.3.1",
@@ -7231,9 +7162,9 @@
}
},
"chalk": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
- "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+ "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
@@ -7339,9 +7270,9 @@
}
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -7472,9 +7403,9 @@
"dev": true
},
"yargs-parser": {
- "version": "18.1.2",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
- "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -7483,6 +7414,12 @@
}
}
},
+ "stylelint-config-prettier": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-8.0.1.tgz",
+ "integrity": "sha512-RcjNW7MUaNVqONhJH4+rtlAE3ow/9SsAM0YWV0Lgu3dbTKdWTa/pQXRdFWgoHWpzUKn+9oBKR5x8JdH+20wmgw==",
+ "dev": true
+ },
"stylelint-config-recommended": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz",
@@ -7498,6 +7435,15 @@
"stylelint-config-recommended": "^3.0.0"
}
},
+ "stylelint-prettier": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/stylelint-prettier/-/stylelint-prettier-1.1.2.tgz",
+ "integrity": "sha512-8QZ+EtBpMCXYB6cY0hNE3aCDKMySIx4Q8/malLaqgU/KXXa6Cj2KK8ulG1AJvUMD5XSSP8rOotqaCzR/BW6qAA==",
+ "dev": true,
+ "requires": {
+ "prettier-linter-helpers": "^1.0.0"
+ }
+ },
"sugarss": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
@@ -7586,7 +7532,6 @@
"version": "5.4.6",
"resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
"integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
- "dev": true,
"requires": {
"ajv": "^6.10.2",
"lodash": "^4.17.14",
@@ -7597,26 +7542,22 @@
"ansi-regex": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
},
"emoji-regex": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
- "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
- "dev": true
+ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
},
"is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
- "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
- "dev": true
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
},
"string-width": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "dev": true,
"requires": {
"emoji-regex": "^7.0.1",
"is-fullwidth-code-point": "^2.0.0",
@@ -7627,7 +7568,6 @@
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "dev": true,
"requires": {
"ansi-regex": "^4.1.0"
}
@@ -7637,8 +7577,7 @@
"text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
- "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
- "dev": true
+ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
},
"throttleit": {
"version": "0.0.2",
@@ -7648,8 +7587,7 @@
"through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
- "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
- "dev": true
+ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"through2": {
"version": "0.2.3",
@@ -7660,44 +7598,10 @@
"xtend": "~2.1.1"
}
},
- "time-grunt": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-2.0.0.tgz",
- "integrity": "sha512-iQD2AeDYCAJrsPC/eUsfYZD9UT7TuBOmUIgFV5zeTQgRk6yLJKoc3aYR0gusJ0m+bG13B6qrDZ0SwPLe0/htHw==",
- "dev": true,
- "requires": {
- "chalk": "^1.0.0",
- "date-time": "^1.1.0",
- "figures": "^1.0.0",
- "hooker": "^0.2.3",
- "number-is-nan": "^1.0.0",
- "pretty-ms": "^2.1.0",
- "text-table": "^0.2.0"
- },
- "dependencies": {
- "figures": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
- "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
- "dev": true,
- "requires": {
- "escape-string-regexp": "^1.0.5",
- "object-assign": "^4.1.0"
- }
- }
- }
- },
- "time-zone": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-0.1.0.tgz",
- "integrity": "sha1-Sncotqwo2w4Aj1FAQ/1VW9VXO0Y=",
- "dev": true
- },
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
- "dev": true,
"requires": {
"os-tmpdir": "~1.0.2"
}
@@ -7803,7 +7707,6 @@
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
- "dev": true,
"requires": {
"prelude-ls": "~1.1.2"
}
@@ -7817,8 +7720,7 @@
"type-fest": {
"version": "0.8.1",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
- "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
- "dev": true
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
},
"type-is": {
"version": "1.6.18",
@@ -7843,22 +7745,6 @@
"is-typedarray": "^1.0.0"
}
},
- "uc.micro": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
- "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
- "dev": true
- },
- "underscore.string": {
- "version": "3.3.5",
- "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
- "integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
- "dev": true,
- "requires": {
- "sprintf-js": "^1.0.3",
- "util-deprecate": "^1.0.2"
- }
- },
"unherit": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
@@ -7878,19 +7764,17 @@
}
},
"unified": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/unified/-/unified-7.1.0.tgz",
- "integrity": "sha512-lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw==",
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/unified/-/unified-9.0.0.tgz",
+ "integrity": "sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==",
"dev": true,
"requires": {
- "@types/unist": "^2.0.0",
- "@types/vfile": "^3.0.0",
"bail": "^1.0.0",
"extend": "^3.0.0",
- "is-plain-obj": "^1.1.0",
+ "is-buffer": "^2.0.0",
+ "is-plain-obj": "^2.0.0",
"trough": "^1.0.0",
- "vfile": "^3.0.0",
- "x-is-string": "^0.1.0"
+ "vfile": "^4.0.0"
}
},
"uniq": {
@@ -7900,27 +7784,27 @@
"dev": true
},
"unist-util-find-all-after": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.5.tgz",
- "integrity": "sha512-lWgIc3rrTMTlK1Y0hEuL+k+ApzFk78h+lsaa2gHf63Gp5Ww+mt11huDniuaoq1H+XMK2lIIjjPkncxXcDp3QDw==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz",
+ "integrity": "sha512-0GICgc++sRJesLwEYDjFVJPJttBpVQaTNgc6Jw0Jhzvfs+jtKePEMu+uD+PqkRUrAvGQqwhpDwLGWo1PK8PDEw==",
"dev": true,
"requires": {
- "unist-util-is": "^3.0.0"
+ "unist-util-is": "^4.0.0"
}
},
"unist-util-is": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
- "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
+ "integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==",
"dev": true
},
"unist-util-remove-position": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz",
- "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
+ "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
"dev": true,
"requires": {
- "unist-util-visit": "^1.1.0"
+ "unist-util-visit": "^2.0.0"
}
},
"unist-util-stringify-position": {
@@ -7933,21 +7817,24 @@
}
},
"unist-util-visit": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
- "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.2.tgz",
+ "integrity": "sha512-HoHNhGnKj6y+Sq+7ASo2zpVdfdRifhTgX2KTU3B/sO/TTlZchp7E3S4vjRzDJ7L60KmrCPsQkVK3lEF3cz36XQ==",
"dev": true,
"requires": {
- "unist-util-visit-parents": "^2.0.0"
+ "@types/unist": "^2.0.0",
+ "unist-util-is": "^4.0.0",
+ "unist-util-visit-parents": "^3.0.0"
}
},
"unist-util-visit-parents": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
- "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.0.2.tgz",
+ "integrity": "sha512-yJEfuZtzFpQmg1OSCyS9M5NJRrln/9FbYosH3iW0MG402QbdbaB8ZESwUv9RO6nRfLAKvWcMxCwdLWOov36x/g==",
"dev": true,
"requires": {
- "unist-util-is": "^3.0.0"
+ "@types/unist": "^2.0.0",
+ "unist-util-is": "^4.0.0"
}
},
"universal-user-agent": {
@@ -8031,8 +7918,7 @@
"v8-compile-cache": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
- "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
- "dev": true
+ "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="
},
"valid-url": {
"version": "1.0.9",
@@ -8064,38 +7950,22 @@
}
},
"vfile": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/vfile/-/vfile-3.0.1.tgz",
- "integrity": "sha512-y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.0.tgz",
+ "integrity": "sha512-BaTPalregj++64xbGK6uIlsurN3BCRNM/P2Pg8HezlGzKd1O9PrwIac6bd9Pdx2uTb0QHoioZ+rXKolbVXEgJg==",
"dev": true,
"requires": {
+ "@types/unist": "^2.0.0",
"is-buffer": "^2.0.0",
"replace-ext": "1.0.0",
- "unist-util-stringify-position": "^1.0.0",
- "vfile-message": "^1.0.0"
- },
- "dependencies": {
- "unist-util-stringify-position": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
- "integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==",
- "dev": true
- },
- "vfile-message": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-1.1.1.tgz",
- "integrity": "sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==",
- "dev": true,
- "requires": {
- "unist-util-stringify-position": "^1.1.1"
- }
- }
+ "unist-util-stringify-position": "^2.0.0",
+ "vfile-message": "^2.0.0"
}
},
"vfile-location": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz",
- "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.0.1.tgz",
+ "integrity": "sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==",
"dev": true
},
"vfile-message": {
@@ -8188,7 +8058,6 @@
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
- "dev": true,
"requires": {
"isexe": "^2.0.0"
}
@@ -8199,6 +8068,12 @@
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
+ "which-pm-runs": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
+ "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
+ "dev": true
+ },
"wide-align": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
@@ -8220,8 +8095,7 @@
"word-wrap": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
- "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
- "dev": true
+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
},
"wordwrap": {
"version": "0.0.3",
@@ -8242,14 +8116,12 @@
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
- "dev": true
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"write": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
- "dev": true,
"requires": {
"mkdirp": "^0.5.1"
}
@@ -8271,12 +8143,6 @@
"resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz",
"integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A=="
},
- "x-is-string": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/x-is-string/-/x-is-string-0.1.0.tgz",
- "integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=",
- "dev": true
- },
"x-xss-protection": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz",
@@ -8308,12 +8174,12 @@
"dev": true
},
"yaml": {
- "version": "1.8.3",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.8.3.tgz",
- "integrity": "sha512-X/v7VDnK+sxbQ2Imq4Jt2PRUsRsP7UcpSl3Llg6+NRRqWLIvxkMFYtH1FmvwNGYRKKPa+EPA4qDBlI9WVG1UKw==",
+ "version": "1.9.2",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz",
+ "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==",
"dev": true,
"requires": {
- "@babel/runtime": "^7.8.7"
+ "@babel/runtime": "^7.9.2"
}
},
"yargs": {
@@ -8476,9 +8342,9 @@
}
},
"p-limit": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
- "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -8549,9 +8415,9 @@
"dev": true
},
"yargs": {
- "version": "13.3.0",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
- "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+ "version": "13.3.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
"dev": true,
"requires": {
"cliui": "^5.0.0",
@@ -8563,13 +8429,13 @@
"string-width": "^3.0.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
- "yargs-parser": "^13.1.1"
+ "yargs-parser": "^13.1.2"
}
},
"yargs-parser": {
- "version": "13.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
- "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+ "version": "13.1.2",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+ "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
"dev": true,
"requires": {
"camelcase": "^5.0.0",
@@ -8579,11 +8445,12 @@
}
},
"yauzl": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
- "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+ "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
"requires": {
- "fd-slicer": "~1.0.1"
+ "buffer-crc32": "~0.2.3",
+ "fd-slicer": "~1.1.0"
}
},
"yeast": {
diff --git a/package.json b/package.json
index 317969ee..f568d73c 100644
--- a/package.json
+++ b/package.json
@@ -1,83 +1,94 @@
{
- "name": "magicmirror",
- "version": "2.11.0",
- "description": "The open source modular smart mirror platform.",
- "main": "js/electron.js",
- "scripts": {
- "start": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js",
- "server": "node ./serveronly",
- "install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error",
- "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error",
- "postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
- "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
- "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
- "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
- "test:lint": "grunt --env=test",
- "config:check": "node tests/configs/check_config.js",
- "lint": "grunt --env=lint"
- },
- "repository": {
- "type": "git",
- "url": "git+https://github.com/MichMich/MagicMirror.git"
- },
- "keywords": [
- "magic mirror",
- "smart mirror",
- "mirror UI",
- "modular"
- ],
- "author": "Michael Teeuw",
- "contributors": [
- "https://github.com/MichMich/MagicMirror/graphs/contributors"
- ],
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/MichMich/MagicMirror/issues"
- },
- "homepage": "https://magicmirror.builders",
- "devDependencies": {
- "chai": "^4.1.2",
- "chai-as-promised": "^7.1.1",
- "current-week-number": "^1.0.7",
- "danger": "^3.1.3",
- "grunt": "latest",
- "grunt-eslint": "latest",
- "grunt-jsonlint": "latest",
- "grunt-markdownlint": "latest",
- "grunt-stylelint": "latest",
- "grunt-yamllint": "latest",
- "http-auth": "^3.2.3",
- "jsdom": "^11.6.2",
- "mocha": "^7.0.0",
- "mocha-each": "^1.1.0",
- "mocha-logger": "^1.0.6",
- "spectron": "^8.0.0",
- "stylelint": "latest",
- "stylelint-config-standard": "latest",
- "time-grunt": "latest"
- },
- "optionalDependencies": {
- "electron": "^6.1.7"
- },
- "dependencies": {
- "colors": "^1.1.2",
- "console-stamp": "^0.2.9",
- "express": "^4.16.2",
- "express-ipfilter": "^1.0.1",
- "feedme": "latest",
- "helmet": "^3.21.2",
- "iconv-lite": "latest",
- "lodash": "^4.17.15",
- "module-alias": "^2.2.2",
- "moment": "latest",
- "request": "^2.88.0",
- "rrule": "^2.6.2",
- "rrule-alt": "^2.2.8",
- "simple-git": "^1.85.0",
- "socket.io": "^2.1.1",
- "valid-url": "latest"
- },
- "_moduleAliases": {
- "node_helper": "js/node_helper.js"
- }
+ "name": "magicmirror",
+ "version": "2.12.0-develop",
+ "description": "The open source modular smart mirror platform.",
+ "main": "js/electron.js",
+ "scripts": {
+ "start": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js",
+ "server": "node ./serveronly",
+ "install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error",
+ "install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error",
+ "postinstall": "npm run install-fonts && echo \"MagicMirror installation finished successfully! \n\"",
+ "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
+ "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
+ "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
+ "test:prettier": "prettier --check **/*.{js,css,json,md,yml}",
+ "test:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
+ "test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
+ "config:check": "node js/check_config.js",
+ "lint:prettier": "prettier --write **/*.{js,css,json,md,yml}",
+ "lint:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
+ "lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/MichMich/MagicMirror.git"
+ },
+ "keywords": [
+ "magic mirror",
+ "smart mirror",
+ "mirror UI",
+ "modular"
+ ],
+ "author": "Michael Teeuw",
+ "contributors": [
+ "https://github.com/MichMich/MagicMirror/graphs/contributors"
+ ],
+ "license": "MIT",
+ "bugs": {
+ "url": "https://github.com/MichMich/MagicMirror/issues"
+ },
+ "homepage": "https://magicmirror.builders",
+ "devDependencies": {
+ "@prantlf/jsonlint": "^10.2.0",
+ "chai": "^4.2.0",
+ "chai-as-promised": "^7.1.1",
+ "current-week-number": "^1.0.7",
+ "danger": "^3.1.3",
+ "eslint-config-prettier": "^6.11.0",
+ "eslint-plugin-prettier": "^3.1.3",
+ "http-auth": "^3.2.3",
+ "husky": "^4.2.5",
+ "jsdom": "^11.6.2",
+ "mocha": "^7.1.2",
+ "mocha-each": "^2.0.1",
+ "mocha-logger": "^1.0.6",
+ "prettier": "^2.0.5",
+ "pretty-quick": "^2.0.1",
+ "spectron": "^8.0.0",
+ "stylelint": "^13.3.3",
+ "stylelint-config-prettier": "^8.0.1",
+ "stylelint-config-standard": "^20.0.0",
+ "stylelint-prettier": "^1.1.2"
+ },
+ "optionalDependencies": {
+ "electron": "^6.1.7"
+ },
+ "dependencies": {
+ "colors": "^1.1.2",
+ "console-stamp": "^0.2.9",
+ "eslint": "^6.8.0",
+ "express": "^4.16.2",
+ "express-ipfilter": "^1.0.1",
+ "feedme": "latest",
+ "helmet": "^3.21.2",
+ "iconv-lite": "latest",
+ "lodash": "^4.17.15",
+ "module-alias": "^2.2.2",
+ "moment": "latest",
+ "request": "^2.88.0",
+ "rrule": "^2.6.2",
+ "rrule-alt": "^2.2.8",
+ "simple-git": "^1.85.0",
+ "socket.io": "^2.1.1",
+ "valid-url": "latest"
+ },
+ "_moduleAliases": {
+ "node_helper": "js/node_helper.js"
+ },
+ "husky": {
+ "hooks": {
+ "pre-commit": "pretty-quick --staged"
+ }
+ }
}
diff --git a/serveronly/index.js b/serveronly/index.js
index f7da58f5..44435ec2 100644
--- a/serveronly/index.js
+++ b/serveronly/index.js
@@ -1,5 +1,5 @@
var app = require("../js/app.js");
-app.start(function(config) {
+app.start(function (config) {
var bindAddress = config.address ? config.address : "localhost";
var httpType = config.useHttps ? "https" : "http";
console.log("\nReady to go! Please point your browser to: " + httpType + "://" + bindAddress + ":" + config.port);
diff --git a/tests/configs/data/StripComments.json b/tests/configs/data/StripComments.json
index 62d5d618..e9d1c403 100644
--- a/tests/configs/data/StripComments.json
+++ b/tests/configs/data/StripComments.json
@@ -1,13 +1,13 @@
{
- // Escaped
- "FOO\"BAR": "Today",
+ // Escaped
+ "FOO\"BAR": "Today",
- /*
- * The following lines
- * represent cardinal directions
- */
- "N": "N",
- "E": "E",
- "S": "S",
- "W": "W"
+ /*
+ * The following lines
+ * represent cardinal directions
+ */
+ "N": "N",
+ "E": "E",
+ "S": "S",
+ "W": "W"
}
diff --git a/tests/configs/data/TranslationTest.json b/tests/configs/data/TranslationTest.json
index bbb13845..8a24a16f 100644
--- a/tests/configs/data/TranslationTest.json
+++ b/tests/configs/data/TranslationTest.json
@@ -1,33 +1,33 @@
{
- "LOADING": "Loading …",
+ "LOADING": "Loading …",
- "TODAY": "Today",
- "TOMORROW": "Tomorrow",
- "DAYAFTERTOMORROW": "In 2 days",
- "RUNNING": "Ends in",
- "EMPTY": "No upcoming events.",
+ "TODAY": "Today",
+ "TOMORROW": "Tomorrow",
+ "DAYAFTERTOMORROW": "In 2 days",
+ "RUNNING": "Ends in",
+ "EMPTY": "No upcoming events.",
- "WEEK": "Week {weekNumber}",
+ "WEEK": "Week {weekNumber}",
- "N": "N",
- "NNE": "NNE",
- "NE": "NE",
- "ENE": "ENE",
- "E": "E",
- "ESE": "ESE",
- "SE": "SE",
- "SSE": "SSE",
- "S": "S",
- "SSW": "SSW",
- "SW": "SW",
- "WSW": "WSW",
- "W": "W",
- "WNW": "WNW",
- "NW": "NW",
- "NNW": "NNW",
+ "N": "N",
+ "NNE": "NNE",
+ "NE": "NE",
+ "ENE": "ENE",
+ "E": "E",
+ "ESE": "ESE",
+ "SE": "SE",
+ "SSE": "SSE",
+ "S": "S",
+ "SSW": "SSW",
+ "SW": "SW",
+ "WSW": "WSW",
+ "W": "W",
+ "WNW": "WNW",
+ "NW": "NW",
+ "NNW": "NNW",
- "UPDATE_NOTIFICATION": "MagicMirror² update available.",
- "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.",
- "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.",
- "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch."
+ "UPDATE_NOTIFICATION": "MagicMirror² update available.",
+ "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.",
+ "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.",
+ "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch."
}
diff --git a/tests/configs/data/en.json b/tests/configs/data/en.json
index bbb13845..8a24a16f 100644
--- a/tests/configs/data/en.json
+++ b/tests/configs/data/en.json
@@ -1,33 +1,33 @@
{
- "LOADING": "Loading …",
+ "LOADING": "Loading …",
- "TODAY": "Today",
- "TOMORROW": "Tomorrow",
- "DAYAFTERTOMORROW": "In 2 days",
- "RUNNING": "Ends in",
- "EMPTY": "No upcoming events.",
+ "TODAY": "Today",
+ "TOMORROW": "Tomorrow",
+ "DAYAFTERTOMORROW": "In 2 days",
+ "RUNNING": "Ends in",
+ "EMPTY": "No upcoming events.",
- "WEEK": "Week {weekNumber}",
+ "WEEK": "Week {weekNumber}",
- "N": "N",
- "NNE": "NNE",
- "NE": "NE",
- "ENE": "ENE",
- "E": "E",
- "ESE": "ESE",
- "SE": "SE",
- "SSE": "SSE",
- "S": "S",
- "SSW": "SSW",
- "SW": "SW",
- "WSW": "WSW",
- "W": "W",
- "WNW": "WNW",
- "NW": "NW",
- "NNW": "NNW",
+ "N": "N",
+ "NNE": "NNE",
+ "NE": "NE",
+ "ENE": "ENE",
+ "E": "E",
+ "ESE": "ESE",
+ "SE": "SE",
+ "SSE": "SSE",
+ "S": "S",
+ "SSW": "SSW",
+ "SW": "SW",
+ "WSW": "WSW",
+ "W": "W",
+ "WNW": "WNW",
+ "NW": "NW",
+ "NNW": "NNW",
- "UPDATE_NOTIFICATION": "MagicMirror² update available.",
- "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.",
- "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.",
- "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch."
+ "UPDATE_NOTIFICATION": "MagicMirror² update available.",
+ "UPDATE_NOTIFICATION_MODULE": "Update available for MODULE_NAME module.",
+ "UPDATE_INFO_SINGLE": "The current installation is COMMIT_COUNT commit behind on the BRANCH_NAME branch.",
+ "UPDATE_INFO_MULTIPLE": "The current installation is COMMIT_COUNT commits behind on the BRANCH_NAME branch."
}
diff --git a/tests/configs/data/feed_test_rodrigoramirez.xml b/tests/configs/data/feed_test_rodrigoramirez.xml
index e4d3730f..dbce18e9 100644
--- a/tests/configs/data/feed_test_rodrigoramirez.xml
+++ b/tests/configs/data/feed_test_rodrigoramirez.xml
@@ -79,19 +79,19 @@
Ninguna, pero ninguna maquina arrancó, se quedaban en ese mensaje. Fue de esos instantes en que sudas helado … 
Con un poco de investigación fue a parar al archivo ~/.VirtualBox/VBoxSVC.log que indicaba
-$ tail -f ~/.VirtualBox/VBoxSVC.log
- 00:08:32.932717 nspr-7 Failed to open "/dev/vboxdrvu", errno=13, rc=VERR_VM_DRIVER_NOT_ACCESSIBLE
+$ tail -f ~/.VirtualBox/VBoxSVC.log
+ 00:08:32.932717 nspr-7 Failed to open "/dev/vboxdrvu", errno=13, rc=VERR_VM_DRIVER_NOT_ACCESSIBLE
00:08:33.555836 nspr-6 Failed to open "/dev/vboxdrvu", errno=13, rc=VERR_VM_DRIVER_NOT_ACCESSIBLE
Fui… algo de donde agarrarse. Mirando un poco mas se trataba de problemas con los permisos al vboxdrvu, mirando indicaba que tenía 0600.
-$ ls -lh /dev/vboxdrvu
+$ ls -lh /dev/vboxdrvu
crw------- 1 root root 10, 56 Sep 10 12:47 /dev/vboxdrvu
El tema es que deben estar en 0666, le cambias los permisos y eso soluciona el problema 
-
-$ sudo chmod 0666 /dev/vboxdrvu
-$ ls -lh /dev/vboxdrvu
+
+$ sudo chmod 0666 /dev/vboxdrvu
+$ ls -lh /dev/vboxdrvu
crw-rw-rw- 1 root root 10, 56 Sep 10 12:47 /dev/vboxdrvu
La entrada Problema VirtualBox “starting virtual machine” … aparece primero en Rodrigo Ramírez Norambuena.
]]>
@@ -236,17 +236,17 @@ $ ls -lh /dev/vboxdrvu
El problema para mi es que algunos sistemas de maquinas virtuales no asignan por defecto un espacio para la Swap, lo que te lleva a que el sistema pueda tener crash durante la ejecución.
Para comprobar la asignación de memoria, al ejecutar el comando free nos debería mostrar como algo similar a lo siguiente
-$ free -m
- total used free shared buffers cached
-Mem: 494 488 6 1 54 75
--/+ buffers/cache: 357 136
+$ free -m
+ total used free shared buffers cached
+Mem: 494 488 6 1 54 75
+-/+ buffers/cache: 357 136
Swap: 0 0 0
En la zona de swap indica que no asignada, valor 0.
Para asignar swap al sistema se debe un archivo en disco para que sea utilizado como espacio de intercambio, en este caso lo vamos crear uno de 3GB en la raíz del sistema
fallocate -l 3G /swapfile
Comprobamos que ha sido creado
-$ ls -lh /swapfile
--rw-r--r-- 1 root root 3.0G Jul 11 13:10 /swapfile
+$ ls -lh /swapfile
+-rw-r--r-- 1 root root 3.0G Jul 11 13:10 /swapfile
Habilitación del archivo Swap
Ahora nos toca habilitar el archivo creado. Para eso le asignaremos los permisos
@@ -256,10 +256,10 @@ Swap: 0 0 0
Para habilitar y asignarla eso como memoria swap al sistema usamos
swapon /swapfile
Ya con esto podrémos ver en nuestro sistema la memoria asignada para swap
-$ free -m
- total used free shared buffers cached
-Mem: 494 486 7 1 51 77
--/+ buffers/cache: 358 136
+$ free -m
+ total used free shared buffers cached
+Mem: 494 486 7 1 51 77
+-/+ buffers/cache: 358 136
Swap: 3071 0 3071
Para que al reiniciar el sistema esto se mantenga, debemos agregar la siguiente línea al archivo /etc/fstab
@@ -323,7 +323,7 @@ Swap: 3071 0 3071
Días atrás estuve participando en el evento llamado Nerdearla en Buenos Aires. El ambiente era genial si eres de esas personas que desde niño sintio curiosidad por ver como funcionan las cosas, donde desarmabas para volver armar lo juguetes. Habían muchas cosas interesantes tanto en las presentaciones, co-working y workshop que se hubieron. Si te […]
La entrada Nerdearla 2016, WebRTC Glue aparece primero en Rodrigo Ramírez Norambuena.
]]>
- Días atrás estuve participando en el evento llamado Nerdearla en Buenos Aires. El ambiente era genial si eres de esas personas que desde niño sintio curiosidad por ver como funcionan las cosas, donde desarmabas para volver armar lo juguetes.
+ Días atrás estuve participando en el evento llamado Nerdearla en Buenos Aires. El ambiente era genial si eres de esas personas que desde niño sintio curiosidad por ver como funcionan las cosas, donde desarmabas para volver armar lo juguetes.
Habían muchas cosas interesantes tanto en las presentaciones, co-working y workshop que se hubieron. Si te lo perdiste te recomiendo que estés pendiente para el proximo año.
Te podias encontrar con una nuestra como esta
@@ -357,7 +357,7 @@ Swap: 3071 0 3071
- http://rodrigoramirez.com/?p=1206
+ https://rodrigoramirez.com/?p=1206
El Panel monitor callcenter para colas de Asterisk ya cuenta con una nueva versión, la 0.9.0 Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.9.0 Esta versión versión nos preocupamos de realizar mejoras y refactorizaciones en el codigo para dar un mejor rendimiento, como también de la compatibilidad con la versión 11 de […]
La entrada QPanel 0.9.0 aparece primero en Rodrigo Ramírez Norambuena.
]]>
@@ -394,7 +394,7 @@ Swap: 3071 0 3071
- http://rodrigoramirez.com/?p=1172
+ https://rodrigoramirez.com/?p=1172
Dejo esto por acá ya que es algo que siempre me olvido como es. El tema es enviar un email mediante el comando mail en un servidor con Linux. Si usas mail a secas te va pidiendo los datos para crear el correo, principalmente el body del correo. Para automatizar esto a través de un […]
La entrada Mandar un email desde la shell aparece primero en Rodrigo Ramírez Norambuena.
]]>
diff --git a/tests/configs/empty_ipWhiteList.js b/tests/configs/empty_ipWhiteList.js
index 232836c3..991ca8e5 100644
--- a/tests/configs/empty_ipWhiteList.js
+++ b/tests/configs/empty_ipWhiteList.js
@@ -13,13 +13,14 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
- modules: [
- ]
+ modules: []
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/env.js b/tests/configs/env.js
index ef244c39..998c1b8d 100644
--- a/tests/configs/env.js
+++ b/tests/configs/env.js
@@ -13,13 +13,14 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
- modules: [
- ]
+ modules: []
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/calendar/auth-default.js b/tests/configs/modules/calendar/auth-default.js
index 3fee5015..19259119 100644
--- a/tests/configs/modules/calendar/auth-default.js
+++ b/tests/configs/modules/calendar/auth-default.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -38,4 +38,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/calendar/basic-auth.js b/tests/configs/modules/calendar/basic-auth.js
index 1b210102..cd6a0695 100644
--- a/tests/configs/modules/calendar/basic-auth.js
+++ b/tests/configs/modules/calendar/basic-auth.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -39,4 +39,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/calendar/default.js b/tests/configs/modules/calendar/default.js
index 3f70d930..9fecc1f9 100644
--- a/tests/configs/modules/calendar/default.js
+++ b/tests/configs/modules/calendar/default.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -34,4 +34,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/calendar/fail-basic-auth.js b/tests/configs/modules/calendar/fail-basic-auth.js
index ad22046a..922c3cdb 100644
--- a/tests/configs/modules/calendar/fail-basic-auth.js
+++ b/tests/configs/modules/calendar/fail-basic-auth.js
@@ -15,8 +15,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -41,4 +41,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/calendar/old-basic-auth.js b/tests/configs/modules/calendar/old-basic-auth.js
index 76e2df3a..b580be92 100644
--- a/tests/configs/modules/calendar/old-basic-auth.js
+++ b/tests/configs/modules/calendar/old-basic-auth.js
@@ -1,5 +1,5 @@
/* Magic Mirror Test config default calendar
- * with authenticacion old config
+ * with authentication old config
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -36,4 +36,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js
index 31f9e4ea..d938fc5d 100644
--- a/tests/configs/modules/clock/clock_12hr.js
+++ b/tests/configs/modules/clock/clock_12hr.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -26,4 +26,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js
index e5dd89f6..cd47d14b 100644
--- a/tests/configs/modules/clock/clock_24hr.js
+++ b/tests/configs/modules/clock/clock_24hr.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -26,4 +26,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js
index 91bbebba..5e2a1d3f 100644
--- a/tests/configs/modules/clock/clock_displaySeconds_false.js
+++ b/tests/configs/modules/clock/clock_displaySeconds_false.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -29,4 +29,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js
index e7ee7d0a..a001f6bc 100644
--- a/tests/configs/modules/clock/clock_showPeriodUpper.js
+++ b/tests/configs/modules/clock/clock_showPeriodUpper.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -29,4 +29,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js
index 8a5f305a..dc36d7d4 100644
--- a/tests/configs/modules/clock/clock_showWeek.js
+++ b/tests/configs/modules/clock/clock_showWeek.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -29,4 +29,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js
index d546e608..4b0f7f83 100644
--- a/tests/configs/modules/clock/es/clock_12hr.js
+++ b/tests/configs/modules/clock/es/clock_12hr.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -26,4 +26,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js
index abdf7a44..ae5b2e24 100644
--- a/tests/configs/modules/clock/es/clock_24hr.js
+++ b/tests/configs/modules/clock/es/clock_24hr.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -26,4 +26,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js
index 6bb396db..7aac8efe 100644
--- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js
+++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -29,4 +29,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js
index 29550f04..1c20388d 100644
--- a/tests/configs/modules/clock/es/clock_showWeek.js
+++ b/tests/configs/modules/clock/es/clock_showWeek.js
@@ -1,7 +1,4 @@
-
-/* Magic Mirror
- *
- * Test config for default clock module
+/* Magic Mirror Test config for default clock module
* Language es for showWeek feature
*
* By Rodrigo Ramírez Norambuena
@@ -19,8 +16,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -35,4 +32,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/compliments/compliments_anytime.js b/tests/configs/modules/compliments/compliments_anytime.js
index 1d2818bc..9b0ab340 100644
--- a/tests/configs/modules/compliments/compliments_anytime.js
+++ b/tests/configs/modules/compliments/compliments_anytime.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -27,7 +27,6 @@ var config = {
afternoon: [],
evening: [],
anytime: ["Anytime here"]
-
}
}
}
@@ -35,4 +34,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/compliments/compliments_date.js b/tests/configs/modules/compliments/compliments_date.js
index 7ea984b1..91975410 100644
--- a/tests/configs/modules/compliments/compliments_date.js
+++ b/tests/configs/modules/compliments/compliments_date.js
@@ -14,8 +14,8 @@ let config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -28,9 +28,7 @@ let config = {
morning: [],
afternoon: [],
evening: [],
- "....-01-01": [
- "Happy new year!"
- ]
+ "....-01-01": ["Happy new year!"]
}
}
}
@@ -38,4 +36,6 @@ let config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/compliments/compliments_only_anytime.js b/tests/configs/modules/compliments/compliments_only_anytime.js
index f0189652..47c22480 100644
--- a/tests/configs/modules/compliments/compliments_only_anytime.js
+++ b/tests/configs/modules/compliments/compliments_only_anytime.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -24,7 +24,6 @@ var config = {
config: {
compliments: {
anytime: ["Anytime here"]
-
}
}
}
@@ -32,4 +31,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js
index b4443567..09766227 100644
--- a/tests/configs/modules/compliments/compliments_parts_day.js
+++ b/tests/configs/modules/compliments/compliments_parts_day.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -23,15 +23,9 @@ var config = {
position: "middle_center",
config: {
compliments: {
- morning: [
- "Hi", "Good Morning", "Morning test"
- ],
- afternoon: [
- "Hello", "Good Afternoon", "Afternoon test"
- ],
- evening: [
- "Hello There", "Good Evening", "Evening test"
- ]
+ morning: ["Hi", "Good Morning", "Morning test"],
+ afternoon: ["Hello", "Good Afternoon", "Afternoon test"],
+ evening: ["Hello There", "Good Evening", "Evening test"]
}
}
}
@@ -39,4 +33,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/helloworld/helloworld.js b/tests/configs/modules/helloworld/helloworld.js
index 6b617cf2..17603be1 100644
--- a/tests/configs/modules/helloworld/helloworld.js
+++ b/tests/configs/modules/helloworld/helloworld.js
@@ -13,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -29,4 +29,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/helloworld/helloworld_default.js b/tests/configs/modules/helloworld/helloworld_default.js
index 710000f0..1218ec80 100644
--- a/tests/configs/modules/helloworld/helloworld_default.js
+++ b/tests/configs/modules/helloworld/helloworld_default.js
@@ -1,6 +1,4 @@
-/* Magic Mirror
- *
- * Test config sample module hello world default config
+/* Magic Mirror Test config sample module hello world default config
*
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
@@ -15,8 +13,8 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -28,4 +26,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js
index 5cb9d311..3da874cf 100644
--- a/tests/configs/modules/newsfeed/default.js
+++ b/tests/configs/modules/newsfeed/default.js
@@ -13,13 +13,12 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
{
-
module: "newsfeed",
position: "bottom_bar",
config: {
@@ -27,7 +26,7 @@ var config = {
{
title: "Rodrigo Ramirez Blog",
url: "http://localhost:8080/tests/configs/data/feed_test_rodrigoramirez.xml"
- },
+ }
]
}
}
@@ -35,4 +34,6 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js
index d56fab91..bbb07da8 100644
--- a/tests/configs/modules/positions.js
+++ b/tests/configs/modules/positions.js
@@ -9,24 +9,22 @@
var config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
- ipWhitelist: [],
language: "en",
timeFormat: 24,
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
+
modules:
// Using exotic content. This is why dont accept go to JSON configuration file
- (function() {
- var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third",
- "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right",
- "bottom_bar", "fullscreen_above", "fullscreen_below"];
+ (function () {
+ var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third", "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right", "bottom_bar", "fullscreen_above", "fullscreen_below"];
var modules = Array();
- for (idx in positions) {
+ for (var idx in positions) {
modules.push({
module: "helloworld",
position: positions[idx],
@@ -36,7 +34,9 @@ var config = {
});
}
return modules;
- })(),
+ })()
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js
index d52a7962..57ce23e4 100644
--- a/tests/configs/modules/weather/currentweather_default.js
+++ b/tests/configs/modules/weather/currentweather_default.js
@@ -14,8 +14,8 @@ let config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -32,4 +32,6 @@ let config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js
index abea5bd1..2b5f9774 100644
--- a/tests/configs/modules/weather/currentweather_options.js
+++ b/tests/configs/modules/weather/currentweather_options.js
@@ -14,8 +14,8 @@ let config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -37,4 +37,6 @@ let config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js
index e7ad1dbc..f7303784 100644
--- a/tests/configs/modules/weather/currentweather_units.js
+++ b/tests/configs/modules/weather/currentweather_units.js
@@ -14,8 +14,8 @@ let config = {
units: "imperial",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -34,4 +34,6 @@ let config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js
index c87ca260..ad4aff76 100644
--- a/tests/configs/modules/weather/forecastweather_default.js
+++ b/tests/configs/modules/weather/forecastweather_default.js
@@ -14,8 +14,8 @@ let config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -34,4 +34,6 @@ let config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js
index 82e3da08..877c4ac6 100644
--- a/tests/configs/modules/weather/forecastweather_options.js
+++ b/tests/configs/modules/weather/forecastweather_options.js
@@ -14,8 +14,8 @@ let config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
modules: [
@@ -37,4 +37,6 @@ let config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/noIpWhiteList.js b/tests/configs/noIpWhiteList.js
index 79366e09..68c711e6 100644
--- a/tests/configs/noIpWhiteList.js
+++ b/tests/configs/noIpWhiteList.js
@@ -13,13 +13,14 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
- modules: [
- ]
+ modules: []
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/port_8090.js b/tests/configs/port_8090.js
index d1dc546f..433508df 100644
--- a/tests/configs/port_8090.js
+++ b/tests/configs/port_8090.js
@@ -13,13 +13,14 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
},
- modules: [
- ]
+ modules: []
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js
index 921e71d7..051b3509 100644
--- a/tests/configs/without_modules.js
+++ b/tests/configs/without_modules.js
@@ -13,11 +13,12 @@ var config = {
units: "metric",
electronOptions: {
webPreferences: {
- nodeIntegration: true,
- },
+ nodeIntegration: true
+ }
}
-
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = config;}
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/e2e/dev_console.js b/tests/e2e/dev_console.js
index 42f8ac99..4e5d1ca1 100644
--- a/tests/e2e/dev_console.js
+++ b/tests/e2e/dev_console.js
@@ -4,58 +4,59 @@ const expect = require("chai").expect;
const describe = global.describe;
const it = global.it;
-describe("Development console tests", function() {
- // This tests fail and crash another tests
+describe("Development console tests", function () {
+ // FIXME: This tests fail and crash another tests
// Suspect problem with window focus
- // FIXME
return false;
+ /* eslint-disable */
helpers.setupTimeout(this);
var app = null;
- before(function() {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/env.js";
});
- describe("Without 'dev' commandline argument", function() {
- before(function() {
+ describe("Without 'dev' commandline argument", function () {
+ before(function () {
return helpers
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- after(function() {
+ after(function () {
return helpers.stopApplication(app);
});
- it("should not open dev console when absent", function() {
+ it("should not open dev console when absent", function () {
return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(false);
});
});
- describe("With 'dev' commandline argument", function() {
- before(function() {
+ describe("With 'dev' commandline argument", function () {
+ before(function () {
return helpers
.startApplication({
args: ["js/electron.js", "dev"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- after(function() {
+ after(function () {
return helpers.stopApplication(app);
});
- it("should open dev console when provided", function() {
+ it("should open dev console when provided", function () {
return expect(app.browserWindow.isDevToolsOpened()).to.eventually.equal(true);
});
});
+ /* eslint-enable */
});
diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js
index 73784e96..7fef9f3c 100644
--- a/tests/e2e/env_spec.js
+++ b/tests/e2e/env_spec.js
@@ -7,59 +7,61 @@ const it = global.it;
const beforeEach = global.beforeEach;
const afterEach = global.afterEach;
-describe("Electron app environment", function() {
+describe("Electron app environment", function () {
helpers.setupTimeout(this);
var app = null;
- before(function() {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/env.js";
});
- beforeEach(function() {
+ beforeEach(function () {
return helpers
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- afterEach(function() {
+ afterEach(function () {
return helpers.stopApplication(app);
});
- it("should open a browserwindow", function() {
- return app.client
- .waitUntilWindowLoaded()
- // .browserWindow.focus()
- .getWindowCount()
- .should.eventually.equal(1)
- .browserWindow.isMinimized()
- .should.eventually.be.false.browserWindow.isDevToolsOpened()
- .should.eventually.be.false.browserWindow.isVisible()
- .should.eventually.be.true.browserWindow.isFocused()
- .should.eventually.be.true.browserWindow.getBounds()
- .should.eventually.have.property("width")
- .and.be.above(0)
- .browserWindow.getBounds()
- .should.eventually.have.property("height")
- .and.be.above(0)
- .browserWindow.getTitle()
- .should.eventually.equal("MagicMirror²");
+ it("should open a browserwindow", function () {
+ return (
+ app.client
+ .waitUntilWindowLoaded()
+ // .browserWindow.focus()
+ .getWindowCount()
+ .should.eventually.equal(1)
+ .browserWindow.isMinimized()
+ .should.eventually.be.false.browserWindow.isDevToolsOpened()
+ .should.eventually.be.false.browserWindow.isVisible()
+ .should.eventually.be.true.browserWindow.isFocused()
+ .should.eventually.be.true.browserWindow.getBounds()
+ .should.eventually.have.property("width")
+ .and.be.above(0)
+ .browserWindow.getBounds()
+ .should.eventually.have.property("height")
+ .and.be.above(0)
+ .browserWindow.getTitle()
+ .should.eventually.equal("MagicMirror²")
+ );
});
- it("get request from http://localhost:8080 should return 200", function(done) {
- request.get("http://localhost:8080", function(err, res, body) {
+ it("get request from http://localhost:8080 should return 200", function (done) {
+ request.get("http://localhost:8080", function (err, res, body) {
expect(res.statusCode).to.equal(200);
done();
});
});
- it("get request from http://localhost:8080/nothing should return 404", function(done) {
- request.get("http://localhost:8080/nothing", function(err, res, body) {
+ it("get request from http://localhost:8080/nothing should return 404", function (done) {
+ request.get("http://localhost:8080/nothing", function (err, res, body) {
expect(res.statusCode).to.equal(404);
done();
});
diff --git a/tests/e2e/fonts.js b/tests/e2e/fonts.js
index 7df36ad8..d6c69e50 100644
--- a/tests/e2e/fonts.js
+++ b/tests/e2e/fonts.js
@@ -5,9 +5,10 @@ const forEach = require("mocha-each");
const describe = global.describe;
-describe("All font files from roboto.css should be downloadable", function() {
+describe("All font files from roboto.css should be downloadable", function () {
helpers.setupTimeout(this);
+ var app;
var fontFiles = [];
// Statements below filters out all 'url' lines in the CSS file
var fileContent = require("fs").readFileSync(__dirname + "/../../fonts/roboto.css", "utf8");
@@ -20,7 +21,7 @@ describe("All font files from roboto.css should be downloadable", function() {
match = regex.exec(fileContent);
}
- before(function() {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/without_modules.js";
@@ -28,18 +29,18 @@ describe("All font files from roboto.css should be downloadable", function() {
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- after(function() {
+ after(function () {
return helpers.stopApplication(app);
});
forEach(fontFiles).it("should return 200 HTTP code for file '%s'", (fontFile, done) => {
var fontUrl = "http://localhost:8080/fonts/" + fontFile;
- request.get(fontUrl, function(err, res, body) {
+ request.get(fontUrl, function (err, res, body) {
expect(res.statusCode).to.equal(200);
done();
});
diff --git a/tests/e2e/global-setup.js b/tests/e2e/global-setup.js
index c4b170fe..cce9fc05 100644
--- a/tests/e2e/global-setup.js
+++ b/tests/e2e/global-setup.js
@@ -6,7 +6,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*
-*/
+ */
const Application = require("spectron").Application;
const assert = require("assert");
@@ -14,12 +14,12 @@ const chai = require("chai");
const chaiAsPromised = require("chai-as-promised");
const path = require("path");
-global.before(function() {
+global.before(function () {
chai.should();
chai.use(chaiAsPromised);
});
-exports.getElectronPath = function() {
+exports.getElectronPath = function () {
var electronPath = path.join(__dirname, "..", "..", "node_modules", ".bin", "electron");
if (process.platform === "win32") {
electronPath += ".cmd";
@@ -28,7 +28,7 @@ exports.getElectronPath = function() {
};
// Set timeout - if this is run within Travis, increase timeout
-exports.setupTimeout = function(test) {
+exports.setupTimeout = function (test) {
if (process.env.CI) {
test.timeout(30000);
} else {
@@ -36,26 +36,26 @@ exports.setupTimeout = function(test) {
}
};
-exports.startApplication = function(options) {
+exports.startApplication = function (options) {
options.path = exports.getElectronPath();
if (process.env.CI) {
options.startTimeout = 30000;
}
var app = new Application(options);
- return app.start().then(function() {
+ return app.start().then(function () {
assert.equal(app.isRunning(), true);
chaiAsPromised.transferPromiseness = app.transferPromiseness;
return app;
});
};
-exports.stopApplication = function(app) {
+exports.stopApplication = function (app) {
if (!app || !app.isRunning()) {
return;
}
- return app.stop().then(function() {
+ return app.stop().then(function () {
assert.equal(app.isRunning(), false);
});
};
diff --git a/tests/e2e/ipWhistlist_spec.js b/tests/e2e/ipWhistlist_spec.js
index c544465e..e22231b9 100644
--- a/tests/e2e/ipWhistlist_spec.js
+++ b/tests/e2e/ipWhistlist_spec.js
@@ -13,9 +13,13 @@ describe("ipWhitelist directive configuration", function () {
var app = null;
beforeEach(function () {
- return helpers.startApplication({
- args: ["js/electron.js"]
- }).then(function (startedApp) { app = startedApp; });
+ return helpers
+ .startApplication({
+ args: ["js/electron.js"]
+ })
+ .then(function (startedApp) {
+ app = startedApp;
+ });
});
afterEach(function () {
@@ -47,5 +51,4 @@ describe("ipWhitelist directive configuration", function () {
});
});
});
-
});
diff --git a/tests/e2e/modules/calendar_spec.js b/tests/e2e/modules/calendar_spec.js
index beeba148..7af78201 100644
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -6,96 +6,96 @@ const it = global.it;
const beforeEach = global.beforeEach;
const afterEach = global.afterEach;
-describe("Calendar module", function() {
+describe("Calendar module", function () {
helpers.setupTimeout(this);
var app = null;
- beforeEach(function() {
+ beforeEach(function () {
return helpers
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- afterEach(function() {
+ afterEach(function () {
return helpers.stopApplication(app);
});
- describe("Default configuration", function() {
- before(function() {
+ describe("Default configuration", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/default.js";
});
- it("Should return TestEvents", function() {
+ it("Should return TestEvents", function () {
return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
});
});
- describe("Basic auth", function() {
- before(function() {
+ describe("Basic auth", function () {
+ before(function () {
serverBasicAuth.listen(8010);
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/basic-auth.js";
});
- after(function(done) {
+ after(function (done) {
serverBasicAuth.close(done());
});
- it("Should return TestEvents", function() {
+ it("Should return TestEvents", function () {
return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
});
});
- describe("Basic auth by default", function() {
- before(function() {
+ describe("Basic auth by default", function () {
+ before(function () {
serverBasicAuth.listen(8011);
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/auth-default.js";
});
- after(function(done) {
+ after(function (done) {
serverBasicAuth.close(done());
});
- it("Should return TestEvents", function() {
+ it("Should return TestEvents", function () {
return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
});
});
- describe("Basic auth backward compatibility configuration: DEPRECATED", function() {
- before(function() {
+ describe("Basic auth backward compatibility configuration: DEPRECATED", function () {
+ before(function () {
serverBasicAuth.listen(8012);
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/old-basic-auth.js";
});
- after(function(done) {
+ after(function (done) {
serverBasicAuth.close(done());
});
- it("Should return TestEvents", function() {
+ it("Should return TestEvents", function () {
return app.client.waitUntilTextExists(".calendar", "TestEvent", 10000);
});
});
- describe("Fail Basic auth", function() {
- before(function() {
+ describe("Fail Basic auth", function () {
+ before(function () {
serverBasicAuth.listen(8020);
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/fail-basic-auth.js";
});
- after(function(done) {
+ after(function (done) {
serverBasicAuth.close(done());
});
- it("Should return No upcoming events", function() {
+ it("Should return No upcoming events", function () {
return app.client.waitUntilTextExists(".calendar", "No upcoming events.", 10000);
});
});
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index 7ad4ae64..6006aeb6 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -5,81 +5,80 @@ const it = global.it;
const beforeEach = global.beforeEach;
const afterEach = global.afterEach;
-describe("Clock set to spanish language module", function() {
+describe("Clock set to spanish language module", function () {
helpers.setupTimeout(this);
var app = null;
- beforeEach(function() {
+ beforeEach(function () {
return helpers
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- afterEach(function() {
+ afterEach(function () {
return helpers.stopApplication(app);
});
- describe("with default 24hr clock config", function() {
- before(function() {
+ describe("with default 24hr clock config", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_24hr.js";
});
- it("shows date with correct format", function() {
+ it("shows date with correct format", function () {
const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
});
- it("shows time in 24hr format", function() {
+ it("shows time in 24hr format", function () {
const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
});
});
- describe("with default 12hr clock config", function() {
- before(function() {
+ describe("with default 12hr clock config", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_12hr.js";
});
- it("shows date with correct format", function() {
+ it("shows date with correct format", function () {
const dateRegex = /^(?:lunes|martes|miércoles|jueves|viernes|sábado|domingo), \d{1,2} de (?:enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre) de \d{4}$/;
return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
});
- it("shows time in 12hr format", function() {
+ it("shows time in 12hr format", function () {
const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
});
});
- describe("with showPeriodUpper config enabled", function() {
- before(function() {
+ describe("with showPeriodUpper config enabled", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showPeriodUpper.js";
});
- it("shows 12hr time with upper case AM/PM", function() {
+ it("shows 12hr time with upper case AM/PM", function () {
const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
});
});
- describe("with showWeek config enabled", function() {
- before(function() {
+ describe("with showWeek config enabled", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showWeek.js";
});
- it("shows week with correct format", function() {
+ it("shows week with correct format", function () {
const weekRegex = /^Semana [0-9]{1,2}$/;
- return app.client.waitUntilWindowLoaded()
- .getText(".clock .week").should.eventually.match(weekRegex);
+ return app.client.waitUntilWindowLoaded().getText(".clock .week").should.eventually.match(weekRegex);
});
});
});
diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js
index be4ef0e3..372d61af 100644
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -5,95 +5,95 @@ const it = global.it;
const beforeEach = global.beforeEach;
const afterEach = global.afterEach;
-describe("Clock module", function() {
+describe("Clock module", function () {
helpers.setupTimeout(this);
var app = null;
- beforeEach(function() {
+ beforeEach(function () {
return helpers
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- afterEach(function() {
+ afterEach(function () {
return helpers.stopApplication(app);
});
- describe("with default 24hr clock config", function() {
- before(function() {
+ describe("with default 24hr clock config", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_24hr.js";
});
- it("shows date with correct format", function() {
+ it("shows date with correct format", function () {
const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
});
- it("shows time in 24hr format", function() {
+ it("shows time in 24hr format", function () {
const timeRegex = /^(?:2[0-3]|[01]\d):[0-5]\d[0-5]\d$/;
return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
});
});
- describe("with default 12hr clock config", function() {
- before(function() {
+ describe("with default 12hr clock config", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_12hr.js";
});
- it("shows date with correct format", function() {
+ it("shows date with correct format", function () {
const dateRegex = /^(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (?:January|February|March|April|May|June|July|August|September|October|November|December) \d{1,2}, \d{4}$/;
return app.client.waitUntilWindowLoaded().getText(".clock .date").should.eventually.match(dateRegex);
});
- it("shows time in 12hr format", function() {
+ it("shows time in 12hr format", function () {
const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[ap]m$/;
return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
});
});
- describe("with showPeriodUpper config enabled", function() {
- before(function() {
+ describe("with showPeriodUpper config enabled", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showPeriodUpper.js";
});
- it("shows 12hr time with upper case AM/PM", function() {
+ it("shows 12hr time with upper case AM/PM", function () {
const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[0-5]\d[AP]M$/;
return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
});
});
- describe("with displaySeconds config disabled", function() {
- before(function() {
+ describe("with displaySeconds config disabled", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_displaySeconds_false.js";
});
- it("shows 12hr time without seconds am/pm", function() {
+ it("shows 12hr time without seconds am/pm", function () {
const timeRegex = /^(?:1[0-2]|[1-9]):[0-5]\d[ap]m$/;
return app.client.waitUntilWindowLoaded().getText(".clock .time").should.eventually.match(timeRegex);
});
});
- describe("with showWeek config enabled", function() {
- before(function() {
+ describe("with showWeek config enabled", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/clock_showWeek.js";
});
- it("shows week with correct format", function() {
+ it("shows week with correct format", function () {
const weekRegex = /^Week [0-9]{1,2}$/;
return app.client.waitUntilWindowLoaded().getText(".clock .week").should.eventually.match(weekRegex);
});
- it("shows week with correct number of week of year", function() {
+ it("shows week with correct number of week of year", function () {
it("FIXME: if the day is a sunday this not match");
// const currentWeekNumber = require("current-week-number")();
// const weekToShow = "Week " + currentWeekNumber;
diff --git a/tests/e2e/modules/compliments_spec.js b/tests/e2e/modules/compliments_spec.js
index 97fd0ed9..841aae03 100644
--- a/tests/e2e/modules/compliments_spec.js
+++ b/tests/e2e/modules/compliments_spec.js
@@ -6,101 +6,119 @@ const it = global.it;
const beforeEach = global.beforeEach;
const afterEach = global.afterEach;
-describe("Compliments module", function() {
+describe("Compliments module", function () {
helpers.setupTimeout(this);
var app = null;
- beforeEach(function() {
+ beforeEach(function () {
return helpers
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- afterEach(function() {
+ afterEach(function () {
return helpers.stopApplication(app);
});
- describe("parts of days", function() {
- before(function() {
+ describe("parts of days", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_parts_day.js";
});
- it("if Morning compliments for that part of day", function() {
+ it("if Morning compliments for that part of day", function () {
var hour = new Date().getHours();
if (hour >= 3 && hour < 12) {
// if morning check
- return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
- expect(text).to.be.oneOf(["Hi", "Good Morning", "Morning test"]);
- });
+ return app.client
+ .waitUntilWindowLoaded()
+ .getText(".compliments")
+ .then(function (text) {
+ expect(text).to.be.oneOf(["Hi", "Good Morning", "Morning test"]);
+ });
}
});
- it("if Afternoon show Compliments for that part of day", function() {
+ it("if Afternoon show Compliments for that part of day", function () {
var hour = new Date().getHours();
if (hour >= 12 && hour < 17) {
// if morning check
- return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
- expect(text).to.be.oneOf(["Hello", "Good Afternoon", "Afternoon test"]);
- });
+ return app.client
+ .waitUntilWindowLoaded()
+ .getText(".compliments")
+ .then(function (text) {
+ expect(text).to.be.oneOf(["Hello", "Good Afternoon", "Afternoon test"]);
+ });
}
});
- it("if Evening show Compliments for that part of day", function() {
+ it("if Evening show Compliments for that part of day", function () {
var hour = new Date().getHours();
if (!(hour >= 3 && hour < 12) && !(hour >= 12 && hour < 17)) {
// if evening check
- return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
- expect(text).to.be.oneOf(["Hello There", "Good Evening", "Evening test"]);
- });
+ return app.client
+ .waitUntilWindowLoaded()
+ .getText(".compliments")
+ .then(function (text) {
+ expect(text).to.be.oneOf(["Hello There", "Good Evening", "Evening test"]);
+ });
}
});
});
- describe("Feature anytime in compliments module", function() {
- describe("Set anytime and empty compliments for morning, evening and afternoon ", function() {
- before(function() {
+ describe("Feature anytime in compliments module", function () {
+ describe("Set anytime and empty compliments for morning, evening and afternoon ", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_anytime.js";
});
- it("Show anytime because if configure empty parts of day compliments and set anytime compliments", function() {
- return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
- expect(text).to.be.oneOf(["Anytime here"]);
- });
+ it("Show anytime because if configure empty parts of day compliments and set anytime compliments", function () {
+ return app.client
+ .waitUntilWindowLoaded()
+ .getText(".compliments")
+ .then(function (text) {
+ expect(text).to.be.oneOf(["Anytime here"]);
+ });
});
});
- describe("Only anytime present in configuration compliments", function() {
- before(function() {
+ describe("Only anytime present in configuration compliments", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_only_anytime.js";
});
- it("Show anytime compliments", function() {
- return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
- expect(text).to.be.oneOf(["Anytime here"]);
- });
+ it("Show anytime compliments", function () {
+ return app.client
+ .waitUntilWindowLoaded()
+ .getText(".compliments")
+ .then(function (text) {
+ expect(text).to.be.oneOf(["Anytime here"]);
+ });
});
});
});
- describe("Feature date in compliments module", function() {
- describe("Set date and empty compliments for anytime, morning, evening and afternoon", function() {
- before(function() {
+ describe("Feature date in compliments module", function () {
+ describe("Set date and empty compliments for anytime, morning, evening and afternoon", function () {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/compliments/compliments_date.js";
});
- it("Show happy new year compliment on new years day", function() {
- return app.client.waitUntilWindowLoaded().getText(".compliments").then(function(text) {
- expect(text).to.be.oneOf(["Happy new year!"]);
- });
+ it("Show happy new year compliment on new years day", function () {
+ return app.client
+ .waitUntilWindowLoaded()
+ .getText(".compliments")
+ .then(function (text) {
+ expect(text).to.be.oneOf(["Happy new year!"]);
+ });
});
});
});
diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js
index a59e2ae4..e215b3aa 100644
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -5,46 +5,44 @@ const it = global.it;
const beforeEach = global.beforeEach;
const afterEach = global.afterEach;
-describe("Test helloworld module", function() {
+describe("Test helloworld module", function () {
helpers.setupTimeout(this);
var app = null;
- beforeEach(function() {
+ beforeEach(function () {
return helpers
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- afterEach(function() {
+ afterEach(function () {
return helpers.stopApplication(app);
});
describe("helloworld set config text", function () {
- before(function() {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/helloworld/helloworld.js";
});
it("Test message helloworld module", function () {
- return app.client.waitUntilWindowLoaded()
- .getText(".helloworld").should.eventually.equal("Test HelloWorld Module");
+ return app.client.waitUntilWindowLoaded().getText(".helloworld").should.eventually.equal("Test HelloWorld Module");
});
});
describe("helloworld default config text", function () {
- before(function() {
+ before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/helloworld/helloworld_default.js";
});
it("Test message helloworld module", function () {
- return app.client.waitUntilWindowLoaded()
- .getText(".helloworld").should.eventually.equal("Hello World!");
+ return app.client.waitUntilWindowLoaded().getText(".helloworld").should.eventually.equal("Hello World!");
});
});
});
diff --git a/tests/e2e/modules/mocks/index.js b/tests/e2e/modules/mocks/index.js
index afd061c6..c7082638 100644
--- a/tests/e2e/modules/mocks/index.js
+++ b/tests/e2e/modules/mocks/index.js
@@ -1,4 +1,4 @@
const generateWeather = require("./weather_current");
const generateWeatherForecast = require("./weather_forecast");
-module.exports = {generateWeather, generateWeatherForecast};
+module.exports = { generateWeather, generateWeatherForecast };
diff --git a/tests/e2e/modules/mocks/weather_current.js b/tests/e2e/modules/mocks/weather_current.js
index 807ee559..a0c3401d 100644
--- a/tests/e2e/modules/mocks/weather_current.js
+++ b/tests/e2e/modules/mocks/weather_current.js
@@ -1,54 +1,60 @@
const _ = require("lodash");
function generateWeather(extendedData = {}) {
- return JSON.stringify(_.merge({}, {
- coord:{
- lon: 11.58,
- lat: 48.14
- },
- weather:[
+ return JSON.stringify(
+ _.merge(
+ {},
{
- id: 615,
- main: "Snow",
- description: "light rain and snow",
- icon: "13d"
+ coord: {
+ lon: 11.58,
+ lat: 48.14
+ },
+ weather: [
+ {
+ id: 615,
+ main: "Snow",
+ description: "light rain and snow",
+ icon: "13d"
+ },
+ {
+ id: 500,
+ main: "Rain",
+ description: "light rain",
+ icon: "10d"
+ }
+ ],
+ base: "stations",
+ main: {
+ temp: 1.49,
+ pressure: 1005,
+ humidity: 93.7,
+ temp_min: 1,
+ temp_max: 2
+ },
+ visibility: 7000,
+ wind: {
+ speed: 11.8,
+ deg: 250
+ },
+ clouds: {
+ all: 75
+ },
+ dt: 1547387400,
+ sys: {
+ type: 1,
+ id: 1267,
+ message: 0.0031,
+ country: "DE",
+ sunrise: 1547362817,
+ sunset: 1547394301
+ },
+ id: 2867714,
+ name: "Munich",
+ cod: 200
},
- {
- id: 500,
- main: "Rain",
- description: "light rain",
- icon: "10d"
- }
- ],
- base: "stations",
- main:{
- temp: 1.49,
- pressure: 1005,
- humidity: 93.7,
- temp_min: 1,
- temp_max: 2
- },
- visibility: 7000,
- wind:{
- speed: 11.8,
- deg: 250
- },
- clouds:{
- all: 75
- },
- dt: 1547387400,
- sys:{
- type: 1,
- id: 1267,
- message: 0.0031,
- country: "DE",
- sunrise: 1547362817,
- sunset: 1547394301
- },
- id: 2867714,
- name: "Munich",
- cod: 200
- }, extendedData));
+ extendedData
+ )
+ );
}
module.exports = generateWeather;
diff --git a/tests/e2e/modules/mocks/weather_forecast.js b/tests/e2e/modules/mocks/weather_forecast.js
index 9e74262f..eaf2e375 100644
--- a/tests/e2e/modules/mocks/weather_forecast.js
+++ b/tests/e2e/modules/mocks/weather_forecast.js
@@ -1,97 +1,111 @@
const _ = require("lodash");
function generateWeatherForecast(extendedData = {}) {
- return JSON.stringify(_.merge({}, {
- "city": {
- "id": 2867714,
- "name": "Munich",
- "coord": {"lon": 11.5754, "lat": 48.1371},
- "country": "DE",
- "population": 1260391,
- "timezone": 7200
- },
- "cod": "200",
- "message": 0.9653487,
- "cnt": 7,
- "list": [{
- "dt": 1568372400,
- "sunrise": 1568350044,
- "sunset": 1568395948,
- "temp": {"day": 24.44, "min": 15.35, "max": 24.44, "night": 15.35, "eve": 18, "morn": 23.03},
- "pressure": 1031.65,
- "humidity": 70,
- "weather": [{"id": 801, "main": "Clouds", "description": "few clouds", "icon": "02d"}],
- "speed": 3.35,
- "deg": 314,
- "clouds": 21
- }, {
- "dt": 1568458800,
- "sunrise": 1568436525,
- "sunset": 1568482223,
- "temp": {"day": 20.81, "min": 13.56, "max": 21.02, "night": 13.56, "eve": 16.6, "morn": 15.88},
- "pressure": 1028.81,
- "humidity": 72,
- "weather": [{"id": 500, "main": "Rain", "description": "light rain", "icon": "10d"}],
- "speed": 2.21,
- "deg": 81,
- "clouds": 100
- }, {
- "dt": 1568545200,
- "sunrise": 1568523007,
- "sunset": 1568568497,
- "temp": {"day": 22.65, "min": 13.76, "max": 22.88, "night": 15.27, "eve": 17.45, "morn": 13.76},
- "pressure": 1023.75,
- "humidity": 64,
- "weather": [{"id": 800, "main": "Clear", "description": "sky is clear", "icon": "01d"}],
- "speed": 1.15,
- "deg": 7,
- "clouds": 0
- }, {
- "dt": 1568631600,
- "sunrise": 1568609489,
- "sunset": 1568654771,
- "temp": {"day": 23.45, "min": 13.95, "max": 23.45, "night": 13.95, "eve": 17.75, "morn": 15.21},
- "pressure": 1020.41,
- "humidity": 64,
- "weather": [{"id": 800, "main": "Clear", "description": "sky is clear", "icon": "01d"}],
- "speed": 3.07,
- "deg": 298,
- "clouds": 7
- }, {
- "dt": 1568718000,
- "sunrise": 1568695970,
- "sunset": 1568741045,
- "temp": {"day": 20.55, "min": 10.95, "max": 20.55, "night": 10.95, "eve": 14.82, "morn": 13.24},
- "pressure": 1019.4,
- "humidity": 66,
- "weather": [{"id": 800, "main": "Clear", "description": "sky is clear", "icon": "01d"}],
- "speed": 2.8,
- "deg": 333,
- "clouds": 2
- }, {
- "dt": 1568804400,
- "sunrise": 1568782452,
- "sunset": 1568827319,
- "temp": {"day": 18.15, "min": 7.75, "max": 18.15, "night": 7.75, "eve": 12.45, "morn": 9.41},
- "pressure": 1017.56,
- "humidity": 52,
- "weather": [{"id": 800, "main": "Clear", "description": "sky is clear", "icon": "01d"}],
- "speed": 2.92,
- "deg": 34,
- "clouds": 0
- }, {
- "dt": 1568890800,
- "sunrise": 1568868934,
- "sunset": 1568913593,
- "temp": {"day": 14.85, "min": 5.56, "max": 15.05, "night": 5.56, "eve": 9.56, "morn": 6.25},
- "pressure": 1022.7,
- "humidity": 59,
- "weather": [{"id": 800, "main": "Clear", "description": "sky is clear", "icon": "01d"}],
- "speed": 2.89,
- "deg": 51,
- "clouds": 1
- }]
- }, extendedData));
+ return JSON.stringify(
+ _.merge(
+ {},
+ {
+ city: {
+ id: 2867714,
+ name: "Munich",
+ coord: { lon: 11.5754, lat: 48.1371 },
+ country: "DE",
+ population: 1260391,
+ timezone: 7200
+ },
+ cod: "200",
+ message: 0.9653487,
+ cnt: 7,
+ list: [
+ {
+ dt: 1568372400,
+ sunrise: 1568350044,
+ sunset: 1568395948,
+ temp: { day: 24.44, min: 15.35, max: 24.44, night: 15.35, eve: 18, morn: 23.03 },
+ pressure: 1031.65,
+ humidity: 70,
+ weather: [{ id: 801, main: "Clouds", description: "few clouds", icon: "02d" }],
+ speed: 3.35,
+ deg: 314,
+ clouds: 21
+ },
+ {
+ dt: 1568458800,
+ sunrise: 1568436525,
+ sunset: 1568482223,
+ temp: { day: 20.81, min: 13.56, max: 21.02, night: 13.56, eve: 16.6, morn: 15.88 },
+ pressure: 1028.81,
+ humidity: 72,
+ weather: [{ id: 500, main: "Rain", description: "light rain", icon: "10d" }],
+ speed: 2.21,
+ deg: 81,
+ clouds: 100
+ },
+ {
+ dt: 1568545200,
+ sunrise: 1568523007,
+ sunset: 1568568497,
+ temp: { day: 22.65, min: 13.76, max: 22.88, night: 15.27, eve: 17.45, morn: 13.76 },
+ pressure: 1023.75,
+ humidity: 64,
+ weather: [{ id: 800, main: "Clear", description: "sky is clear", icon: "01d" }],
+ speed: 1.15,
+ deg: 7,
+ clouds: 0
+ },
+ {
+ dt: 1568631600,
+ sunrise: 1568609489,
+ sunset: 1568654771,
+ temp: { day: 23.45, min: 13.95, max: 23.45, night: 13.95, eve: 17.75, morn: 15.21 },
+ pressure: 1020.41,
+ humidity: 64,
+ weather: [{ id: 800, main: "Clear", description: "sky is clear", icon: "01d" }],
+ speed: 3.07,
+ deg: 298,
+ clouds: 7
+ },
+ {
+ dt: 1568718000,
+ sunrise: 1568695970,
+ sunset: 1568741045,
+ temp: { day: 20.55, min: 10.95, max: 20.55, night: 10.95, eve: 14.82, morn: 13.24 },
+ pressure: 1019.4,
+ humidity: 66,
+ weather: [{ id: 800, main: "Clear", description: "sky is clear", icon: "01d" }],
+ speed: 2.8,
+ deg: 333,
+ clouds: 2
+ },
+ {
+ dt: 1568804400,
+ sunrise: 1568782452,
+ sunset: 1568827319,
+ temp: { day: 18.15, min: 7.75, max: 18.15, night: 7.75, eve: 12.45, morn: 9.41 },
+ pressure: 1017.56,
+ humidity: 52,
+ weather: [{ id: 800, main: "Clear", description: "sky is clear", icon: "01d" }],
+ speed: 2.92,
+ deg: 34,
+ clouds: 0
+ },
+ {
+ dt: 1568890800,
+ sunrise: 1568868934,
+ sunset: 1568913593,
+ temp: { day: 14.85, min: 5.56, max: 15.05, night: 5.56, eve: 9.56, morn: 6.25 },
+ pressure: 1022.7,
+ humidity: 59,
+ weather: [{ id: 800, main: "Clear", description: "sky is clear", icon: "01d" }],
+ speed: 2.89,
+ deg: 51,
+ clouds: 1
+ }
+ ]
+ },
+ extendedData
+ )
+ );
}
module.exports = generateWeatherForecast;
diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js
index 88cb8c3e..9c9ee2ca 100644
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -5,31 +5,31 @@ const it = global.it;
const beforeEach = global.beforeEach;
const afterEach = global.afterEach;
-describe("Newsfeed module", function() {
+describe("Newsfeed module", function () {
helpers.setupTimeout(this);
var app = null;
- beforeEach(function() {
+ beforeEach(function () {
return helpers
.startApplication({
args: ["js/electron.js"]
})
- .then(function(startedApp) {
+ .then(function (startedApp) {
app = startedApp;
});
});
- afterEach(function() {
+ afterEach(function () {
return helpers.stopApplication(app);
});
- describe("Default configuration", function() {
- before(function() {
+ describe("Default configuration", function () {
+ before(function () {
process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/default.js";
});
- it("show title newsfeed", function() {
+ it("show title newsfeed", function () {
return app.client.waitUntilTextExists(".newsfeed .small", "Rodrigo Ramirez Blog", 10000).should.be.fulfilled;
});
});
diff --git a/tests/e2e/modules/weather_spec.js b/tests/e2e/modules/weather_spec.js
index ea916e5e..d87a44cd 100644
--- a/tests/e2e/modules/weather_spec.js
+++ b/tests/e2e/modules/weather_spec.js
@@ -6,10 +6,9 @@ const wdajaxstub = require("webdriverajaxstub");
const helpers = require("../global-setup");
-const {generateWeather, generateWeatherForecast} = require("./mocks");
-
-describe("Weather module", function() {
+const { generateWeather, generateWeatherForecast } = require("./mocks");
+describe("Weather module", function () {
let app;
helpers.setupTimeout(this);
@@ -24,85 +23,85 @@ describe("Weather module", function() {
app.client.setupStub();
}
- afterEach(function() {
+ afterEach(function () {
return helpers.stopApplication(app);
});
- describe("Current weather", function() {
+ describe("Current weather", function () {
let template;
- before(function() {
+ before(function () {
template = fs.readFileSync(path.join(__dirname, "..", "..", "..", "modules", "default", "weather", "current.njk"), "utf8");
});
- describe("Default configuration", function() {
- before(function() {
+ describe("Default configuration", function () {
+ before(function () {
process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/currentweather_default.js";
});
- it("should render wind speed and wind direction", async function() {
+ it("should render wind speed and wind direction", async function () {
const weather = generateWeather();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
return app.client.waitUntilTextExists(".weather .normal.medium span:nth-child(2)", "6 WSW", 10000);
});
- it("should render sunrise", async function() {
+ it("should render sunrise", async function () {
const sunrise = moment().startOf("day").unix();
const sunset = moment().startOf("day").unix();
- const weather = generateWeather({sys: {sunrise, sunset}});
- await setup({template, data: weather});
+ const weather = generateWeather({ sys: { sunrise, sunset } });
+ await setup({ template, data: weather });
await app.client.waitForExist(".weather .normal.medium span.wi.dimmed.wi-sunrise", 10000);
return app.client.waitUntilTextExists(".weather .normal.medium span:nth-child(4)", "12:00 am", 10000);
});
- it("should render sunset", async function() {
+ it("should render sunset", async function () {
const sunrise = moment().startOf("day").unix();
const sunset = moment().endOf("day").unix();
- const weather = generateWeather({sys: {sunrise, sunset}});
- await setup({template, data: weather});
+ const weather = generateWeather({ sys: { sunrise, sunset } });
+ await setup({ template, data: weather });
await app.client.waitForExist(".weather .normal.medium span.wi.dimmed.wi-sunset", 10000);
return app.client.waitUntilTextExists(".weather .normal.medium span:nth-child(4)", "11:59 pm", 10000);
});
- it("should render temperature with icon", async function() {
+ it("should render temperature with icon", async function () {
const weather = generateWeather();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
await app.client.waitForExist(".weather .large.light span.wi.weathericon.wi-snow", 10000);
return app.client.waitUntilTextExists(".weather .large.light span.bright", "1.5°", 10000);
});
- it("should render feels like temperature", async function() {
+ it("should render feels like temperature", async function () {
const weather = generateWeather();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
return app.client.waitUntilTextExists(".weather .normal.medium span.dimmed", "Feels like -5.6°", 10000);
});
});
- describe("Configuration Options", function() {
- before(function() {
+ describe("Configuration Options", function () {
+ before(function () {
process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/currentweather_options.js";
});
- it("should render useBeaufort = false", async function() {
+ it("should render useBeaufort = false", async function () {
const weather = generateWeather();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
return app.client.waitUntilTextExists(".weather .normal.medium span:nth-child(2)", "12", 10000);
});
- it("should render showWindDirectionAsArrow = true", async function() {
+ it("should render showWindDirectionAsArrow = true", async function () {
const weather = generateWeather();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
await app.client.waitForExist(".weather .normal.medium sup i.fa-long-arrow-up", 10000);
const element = await app.client.getHTML(".weather .normal.medium sup i.fa-long-arrow-up");
@@ -110,17 +109,17 @@ describe("Weather module", function() {
expect(element).to.include("transform:rotate(250deg);");
});
- it("should render showHumidity = true", async function() {
+ it("should render showHumidity = true", async function () {
const weather = generateWeather();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
await app.client.waitUntilTextExists(".weather .normal.medium span:nth-child(3)", "93", 10000);
return app.client.waitForExist(".weather .normal.medium sup i.wi-humidity", 10000);
});
- it("should render degreeLabel = true", async function() {
+ it("should render degreeLabel = true", async function () {
const weather = generateWeather();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
await app.client.waitUntilTextExists(".weather .large.light span.bright", "1°C", 10000);
@@ -128,41 +127,41 @@ describe("Weather module", function() {
});
});
- describe("Current weather units", function() {
- before(function() {
+ describe("Current weather units", function () {
+ before(function () {
process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/currentweather_units.js";
});
- it("should render imperial units", async function() {
+ it("should render imperial units", async function () {
const weather = generateWeather({
- main:{
- temp: 1.49 * 9 / 5 + 32,
- temp_min: 1 * 9 / 5 + 32,
- temp_max: 2 * 9 / 5 + 32
+ main: {
+ temp: (1.49 * 9) / 5 + 32,
+ temp_min: (1 * 9) / 5 + 32,
+ temp_max: (2 * 9) / 5 + 32
},
- wind:{
+ wind: {
speed: 11.8 * 2.23694
- },
+ }
});
- await setup({template, data: weather});
+ await setup({ template, data: weather });
await app.client.waitUntilTextExists(".weather .normal.medium span:nth-child(2)", "6 WSW", 10000);
await app.client.waitUntilTextExists(".weather .large.light span.bright", "34,7°", 10000);
return app.client.waitUntilTextExists(".weather .normal.medium span.dimmed", "22,0°", 10000);
});
- it("should render decimalSymbol = ','", async function() {
+ it("should render decimalSymbol = ','", async function () {
const weather = generateWeather({
- main:{
- temp: 1.49 * 9 / 5 + 32,
- temp_min: 1 * 9 / 5 + 32,
- temp_max: 2 * 9 / 5 + 32
+ main: {
+ temp: (1.49 * 9) / 5 + 32,
+ temp_min: (1 * 9) / 5 + 32,
+ temp_max: (2 * 9) / 5 + 32
},
- wind:{
+ wind: {
speed: 11.8 * 2.23694
- },
+ }
});
- await setup({template, data: weather});
+ await setup({ template, data: weather });
await app.client.waitUntilTextExists(".weather .normal.medium span:nth-child(3)", "93,7", 10000);
await app.client.waitUntilTextExists(".weather .large.light span.bright", "34,7°", 10000);
@@ -171,21 +170,21 @@ describe("Weather module", function() {
});
});
- describe("Weather Forecast", function() {
+ describe("Weather Forecast", function () {
let template;
- before(function() {
+ before(function () {
template = fs.readFileSync(path.join(__dirname, "..", "..", "..", "modules", "default", "weather", "forecast.njk"), "utf8");
});
- describe("Default configuration", function() {
- before(function() {
+ describe("Default configuration", function () {
+ before(function () {
process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_default.js";
});
- it("should render days", async function() {
+ it("should render days", async function () {
const weather = generateWeatherForecast();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
const days = ["Fri", "Sat", "Sun", "Mon", "Tue"];
@@ -194,9 +193,9 @@ describe("Weather module", function() {
}
});
- it("should render icons", async function() {
+ it("should render icons", async function () {
const weather = generateWeatherForecast();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
const icons = ["day-cloudy", "rain", "day-sunny", "day-sunny", "day-sunny"];
@@ -205,9 +204,9 @@ describe("Weather module", function() {
}
});
- it("should render max temperatures", async function() {
+ it("should render max temperatures", async function () {
const weather = generateWeatherForecast();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
const temperatures = ["24.4°", "21.0°", "22.9°", "23.4°", "20.6°"];
@@ -216,9 +215,9 @@ describe("Weather module", function() {
}
});
- it("should render min temperatures", async function() {
+ it("should render min temperatures", async function () {
const weather = generateWeatherForecast();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
const temperatures = ["15.3°", "13.6°", "13.8°", "13.9°", "10.9°"];
@@ -227,9 +226,9 @@ describe("Weather module", function() {
}
});
- it("should render fading of rows", async function() {
+ it("should render fading of rows", async function () {
const weather = generateWeatherForecast();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
const opacities = [1, 1, 0.8, 0.5333333333333333, 0.2666666666666667];
@@ -242,21 +241,21 @@ describe("Weather module", function() {
});
});
- describe("Configuration Options", function() {
- before(function() {
+ describe("Configuration Options", function () {
+ before(function () {
process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_options.js";
});
- it("should render custom table class", async function() {
+ it("should render custom table class", async function () {
const weather = generateWeatherForecast();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
await app.client.waitForExist(".weather table.myTableClass", 10000);
});
- it("should render colored rows", async function() {
+ it("should render colored rows", async function () {
const weather = generateWeatherForecast();
- await setup({template, data: weather});
+ await setup({ template, data: weather });
await app.client.waitForExist(".weather table.myTableClass", 10000);
diff --git a/tests/e2e/modules_position_spec.js b/tests/e2e/modules_position_spec.js
index 40399680..930acbfd 100644
--- a/tests/e2e/modules_position_spec.js
+++ b/tests/e2e/modules_position_spec.js
@@ -9,7 +9,6 @@ describe("Position of modules", function () {
var app = null;
describe("Using helloworld", function () {
-
after(function () {
return helpers.stopApplication(app);
});
@@ -17,23 +16,27 @@ describe("Position of modules", function () {
before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/positions.js";
- return helpers.startApplication({
- args: ["js/electron.js"]
- }).then(function (startedApp) { app = startedApp; });
+ return helpers
+ .startApplication({
+ args: ["js/electron.js"]
+ })
+ .then(function (startedApp) {
+ app = startedApp;
+ });
});
- var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third",
- "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right",
- "bottom_bar", "fullscreen_above", "fullscreen_below"];
+ var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third", "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right", "bottom_bar", "fullscreen_above", "fullscreen_below"];
var position;
var className;
- for (idx in positions) {
+ for (var idx in positions) {
position = positions[idx];
className = position.replace("_", ".");
it("show text in " + position, function () {
- return app.client.waitUntilWindowLoaded()
- .getText("." + className).should.eventually.equal("Text in " + position);
+ return app.client
+ .waitUntilWindowLoaded()
+ .getText("." + className)
+ .should.eventually.equal("Text in " + position);
});
}
});
diff --git a/tests/e2e/port_config.js b/tests/e2e/port_config.js
index 41f50e75..77889748 100644
--- a/tests/e2e/port_config.js
+++ b/tests/e2e/port_config.js
@@ -13,9 +13,13 @@ describe("port directive configuration", function () {
var app = null;
beforeEach(function () {
- return helpers.startApplication({
- args: ["js/electron.js"]
- }).then(function (startedApp) { app = startedApp; });
+ return helpers
+ .startApplication({
+ args: ["js/electron.js"]
+ })
+ .then(function (startedApp) {
+ app = startedApp;
+ });
});
afterEach(function () {
diff --git a/tests/e2e/translations_spec.js b/tests/e2e/translations_spec.js
index e589689e..cf039eb1 100644
--- a/tests/e2e/translations_spec.js
+++ b/tests/e2e/translations_spec.js
@@ -5,13 +5,13 @@ const expect = chai.expect;
const mlog = require("mocha-logger");
const translations = require("../../translations/translations.js");
const helmet = require("helmet");
-const {JSDOM} = require("jsdom");
+const { JSDOM } = require("jsdom");
const express = require("express");
-describe("Translations", function() {
+describe("Translations", function () {
let server;
- before(function() {
+ before(function () {
const app = express();
app.use(helmet());
app.use(function (req, res, next) {
@@ -23,12 +23,12 @@ describe("Translations", function() {
server = app.listen(3000);
});
- after(function() {
+ after(function () {
server.close();
});
- it("should have a translation file in the specified path", function() {
- for(let language in translations) {
+ it("should have a translation file in the specified path", function () {
+ for (let language in translations) {
const file = fs.statSync(translations[language]);
expect(file.isFile()).to.be.equal(true);
}
@@ -41,16 +41,18 @@ describe("Translations", function() {
}
};
- describe("Parsing language files through the Translator class", function() {
- for(let language in translations) {
- it(`should parse ${language}`, function(done) {
- const dom = new JSDOM(`\
- \
+ \
- \
+ \
- \
+ \
- \
+ \
- \
+ \
- \
+ \
- \
+ \
- \
+ \
- \
+
+ 
-**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](http://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
+**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](https://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
-MagicMirror² focuses on a modular plugin system and uses [Electron](http://electron.atom.io/) as an application wrapper. So no more web server or browser installs necessary!
+MagicMirror² focuses on a modular plugin system and uses [Electron](https://www.electronjs.org/) as an application wrapper. So no more web server or browser installs necessary!
## Documentation
+
For the full documentation including **[installation instructions](https://docs.magicmirror.builders/getting-started/installation.html)**, please visit our dedicated documentation website: [https://docs.magicmirror.builders](https://docs.magicmirror.builders).
## Links
+
- Website: [https://magicmirror.builders](https://magicmirror.builders)
- Documentation: [https://docs.magicmirror.builders](https://docs.magicmirror.builders)
- Forum: [https://forum.magicmirror.builders](https://forum.magicmirror.builders)
@@ -28,7 +30,6 @@ For the full documentation including **[installation instructions](https://docs.
Contributions of all kinds are welcome, not only in the form of code but also with regards bug reports and documentation. For the full contribution guidelines, check out: [https://docs.magicmirror.builders/getting-started/contributing.html](https://docs.magicmirror.builders/getting-started/contributing.html)
-
## Enjoying MagicMirror? Consider a donation!
MagicMirror² is opensource and free. That doesn't mean we don't need any money.
diff --git a/clientonly/index.js b/clientonly/index.js
index 6430b270..7d1c4fe3 100644
--- a/clientonly/index.js
+++ b/clientonly/index.js
@@ -18,6 +18,9 @@
["address", "port"].forEach((key) => {
config[key] = getCommandLineParameter(key, process.env[key.toUpperCase()]);
});
+
+ // determine if "--use-tls"-flag was provided
+ config["tls"] = process.argv.indexOf("--use-tls") > 0;
}
function getServerConfig(url) {
@@ -29,16 +32,16 @@
var configData = "";
// Gather incoming data
- response.on("data", function(chunk) {
+ response.on("data", function (chunk) {
configData += chunk;
});
// Resolve promise at the end of the HTTP/HTTPS stream
- response.on("end", function() {
+ response.on("end", function () {
resolve(JSON.parse(configData));
});
});
- request.on("error", function(error) {
+ request.on("error", function (error) {
reject(new Error(`Unable to read config from server (${url} (${error.message}`));
});
});
@@ -48,7 +51,7 @@
if (message !== undefined && typeof message === "string") {
console.log(message);
} else {
- console.log("Usage: 'node clientonly --address 192.168.1.10 --port 8080'");
+ console.log("Usage: 'node clientonly --address 192.168.1.10 --port 8080 [--use-tls]'");
}
process.exit(code);
}
@@ -56,16 +59,18 @@
getServerAddress();
(config.address && config.port) || fail();
+ var prefix = config.tls ? "https://" : "http://";
// Only start the client if a non-local server was provided
if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) {
- getServerConfig(`http://${config.address}:${config.port}/config/`)
+ getServerConfig(`${prefix}${config.address}:${config.port}/config/`)
.then(function (configReturn) {
// Pass along the server config via an environment variable
var env = Object.create(process.env);
var options = { env: env };
configReturn.address = config.address;
configReturn.port = config.port;
+ configReturn.tls = config.tls;
env.config = JSON.stringify(configReturn);
// Spawn electron application
@@ -91,7 +96,6 @@
console.log(`There something wrong. The clientonly is not running code ${code}`);
}
});
-
})
.catch(function (reason) {
fail(`Unable to connect to server: (${reason})`);
@@ -99,4 +103,4 @@
} else {
fail();
}
-}());
+})();
diff --git a/config/config.js.sample b/config/config.js.sample
index 414054da..40737039 100644
--- a/config/config.js.sample
+++ b/config/config.js.sample
@@ -1,6 +1,6 @@
/* Magic Mirror Config Sample
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*
* For more information on how you can configure this file
@@ -9,17 +9,19 @@
*/
var config = {
- address: "localhost", // Address to listen on, can be:
- // - "localhost", "127.0.0.1", "::1" to listen on loopback interface
- // - another specific IPv4/6 to listen on a specific interface
- // - "0.0.0.0", "::" to listen on any interface
- // Default, when address config is left out or empty, is "localhost"
+ address: "localhost", // Address to listen on, can be:
+ // - "localhost", "127.0.0.1", "::1" to listen on loopback interface
+ // - another specific IPv4/6 to listen on a specific interface
+ // - "0.0.0.0", "::" to listen on any interface
+ // Default, when address config is left out or empty, is "localhost"
port: 8080,
- ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
- // or add a specific IPv4 of 192.168.1.5 :
- // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
- // or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
- // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
+ basePath: "/", // The URL path where MagicMirror is hosted. If you are using a Reverse proxy
+ // you must set the sub path here. basePath must end with a /
+ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
+ // or add a specific IPv4 of 192.168.1.5 :
+ // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
+ // or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
+ // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
useHttps: false, // Support HTTPS or not, default "false" will use HTTP
httpsPrivateKey: "", // HTTPS private key path, only require when useHttps is true
@@ -29,10 +31,10 @@ var config = {
timeFormat: 24,
units: "metric",
// serverOnly: true/false/"local" ,
- // local for armv6l processors, default
- // starts serveronly and then starts chrome browser
- // false, default for all NON-armv6l devices
- // true, force serveronly mode, because you want to.. no UI on this device
+ // local for armv6l processors, default
+ // starts serveronly and then starts chrome browser
+ // false, default for all NON-armv6l devices
+ // true, force serveronly mode, because you want to.. no UI on this device
modules: [
{
@@ -88,7 +90,7 @@ var config = {
feeds: [
{
title: "New York Times",
- url: "http://www.nytimes.com/services/xml/rss/nyt/HomePage.xml"
+ url: "https://rss.nytimes.com/services/xml/rss/nyt/HomePage.xml"
}
],
showSourceTitle: true,
@@ -98,7 +100,6 @@ var config = {
}
},
]
-
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
diff --git a/css/main.css b/css/main.css
index 84f8c4d2..bca48f9e 100644
--- a/css/main.css
+++ b/css/main.css
@@ -177,10 +177,6 @@ sup {
.region.top.center,
.region.bottom.center {
left: 50%;
- -moz-transform: translateX(-50%);
- -o-transform: translateX(-50%);
- -webkit-transform: translateX(-50%);
- -ms-transform: translateX(-50%);
transform: translateX(-50%);
}
@@ -213,10 +209,6 @@ sup {
.region.middle.center {
width: 100%;
text-align: center;
- -moz-transform: translateY(-50%);
- -o-transform: translateY(-50%);
- -webkit-transform: translateY(-50%);
- -ms-transform: translateY(-50%);
transform: translateY(-50%);
}
diff --git a/fonts/package-lock.json b/fonts/package-lock.json
index c05e7b0d..960e793a 100644
--- a/fonts/package-lock.json
+++ b/fonts/package-lock.json
@@ -4,9 +4,9 @@
"lockfileVersion": 1,
"dependencies": {
"roboto-fontface": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.8.0.tgz",
- "integrity": "sha512-ZYzRkETgBrdEGzL5JSKimvjI2CX7ioyZCkX2BpcfyjqI+079W0wHAyj5W4rIZMcDSOHgLZtgz1IdDi/vU77KEQ=="
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz",
+ "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="
}
}
}
diff --git a/fonts/package.json b/fonts/package.json
index a4fb07de..7cea509b 100644
--- a/fonts/package.json
+++ b/fonts/package.json
@@ -1,15 +1,15 @@
{
- "name": "magicmirror-fonts",
- "description": "Package for fonts use by MagicMirror Core.",
- "repository": {
- "type": "git",
- "url": "git+https://github.com/MichMich/MagicMirror.git"
- },
- "license": "MIT",
- "bugs": {
- "url": "https://github.com/MichMich/MagicMirror/issues"
- },
- "dependencies": {
- "roboto-fontface": "^0.8.0"
- }
+ "name": "magicmirror-fonts",
+ "description": "Package for fonts use by MagicMirror Core.",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/MichMich/MagicMirror.git"
+ },
+ "license": "MIT",
+ "bugs": {
+ "url": "https://github.com/MichMich/MagicMirror/issues"
+ },
+ "dependencies": {
+ "roboto-fontface": "^0.10.0"
+ }
}
diff --git a/fonts/roboto.css b/fonts/roboto.css
index 11d3f41d..9bf4fbc9 100644
--- a/fonts/roboto.css
+++ b/fonts/roboto.css
@@ -2,94 +2,57 @@
font-family: Roboto;
font-style: normal;
font-weight: 100;
- src:
- local("Roboto Thin"),
- local("Roboto-Thin"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff2") format("woff2"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff") format("woff"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.ttf") format("truetype");
+ src: local("Roboto Thin"), local("Roboto-Thin"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff") format("woff");
}
@font-face {
font-family: "Roboto Condensed";
font-style: normal;
font-weight: 300;
- src:
- local("Roboto Condensed Light"),
- local("RobotoCondensed-Light"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff2") format("woff2"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff") format("woff"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.ttf") format("truetype");
+ src: local("Roboto Condensed Light"), local("RobotoCondensed-Light"), url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff") format("woff");
}
@font-face {
font-family: "Roboto Condensed";
font-style: normal;
font-weight: 400;
- src:
- local("Roboto Condensed"),
- local("RobotoCondensed-Regular"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff2") format("woff2"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff") format("woff"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.ttf") format("truetype");
+ src: local("Roboto Condensed"), local("RobotoCondensed-Regular"), url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff") format("woff");
}
@font-face {
font-family: "Roboto Condensed";
font-style: normal;
font-weight: 700;
- src:
- local("Roboto Condensed Bold"),
- local("RobotoCondensed-Bold"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff2") format("woff2"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff") format("woff"),
- url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.ttf") format("truetype");
+ src: local("Roboto Condensed Bold"), local("RobotoCondensed-Bold"), url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff") format("woff");
}
@font-face {
font-family: Roboto;
font-style: normal;
font-weight: 400;
- src:
- local("Roboto"),
- local("Roboto-Regular"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2") format("woff2"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff") format("woff"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.ttf") format("truetype");
+ src: local("Roboto"), local("Roboto-Regular"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff") format("woff");
}
@font-face {
font-family: Roboto;
font-style: normal;
font-weight: 500;
- src:
- local("Roboto Medium"),
- local("Roboto-Medium"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2") format("woff2"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff") format("woff"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.ttf") format("truetype");
+ src: local("Roboto Medium"), local("Roboto-Medium"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff") format("woff");
}
@font-face {
font-family: Roboto;
font-style: normal;
font-weight: 700;
- src:
- local("Roboto Bold"),
- local("Roboto-Bold"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2") format("woff2"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff") format("woff"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.ttf") format("truetype");
+ src: local("Roboto Bold"), local("Roboto-Bold"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff") format("woff");
}
@font-face {
font-family: Roboto;
font-style: normal;
font-weight: 300;
- src:
- local("Roboto Light"),
- local("Roboto-Light"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2") format("woff2"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff") format("woff"),
- url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.ttf") format("truetype");
+ src: local("Roboto Light"), local("Roboto-Light"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff") format("woff");
}
diff --git a/fonts/yarn.lock b/fonts/yarn.lock
deleted file mode 100644
index ccb550f3..00000000
--- a/fonts/yarn.lock
+++ /dev/null
@@ -1,7 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-roboto-fontface@^0.8.0:
- version "0.8.0"
- resolved "https://registry.yarnpkg.com/roboto-fontface/-/roboto-fontface-0.8.0.tgz#031a83c8f79932801a57d83bf743f37250163499"
diff --git a/js/app.js b/js/app.js
index b7c55ffa..fe811a95 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1,7 +1,7 @@
/* Magic Mirror
* The Core App (Server)
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
var fs = require("fs");
@@ -44,7 +44,7 @@ process.on("uncaughtException", function (err) {
/* App - The core app.
*/
-var App = function() {
+var App = function () {
var nodeHelpers = [];
/* loadConfig(callback)
@@ -53,15 +53,15 @@ var App = function() {
*
* argument callback function - The callback function.
*/
- var loadConfig = function(callback) {
+ var loadConfig = function (callback) {
console.log("Loading config ...");
var defaults = require(__dirname + "/defaults.js");
// For this check proposed to TestSuite
// https://forum.magicmirror.builders/topic/1456/test-suite-for-magicmirror/8
var configFilename = path.resolve(global.root_path + "/config/config.js");
- if (typeof(global.configuration_file) !== "undefined") {
- configFilename = path.resolve(global.configuration_file);
+ if (typeof global.configuration_file !== "undefined") {
+ configFilename = path.resolve(global.configuration_file);
}
try {
@@ -82,23 +82,19 @@ var App = function() {
}
};
- var checkDeprecatedOptions = function(userConfig) {
+ var checkDeprecatedOptions = function (userConfig) {
var deprecated = require(global.root_path + "/js/deprecated.js");
var deprecatedOptions = deprecated.configs;
var usedDeprecated = [];
- deprecatedOptions.forEach(function(option) {
+ deprecatedOptions.forEach(function (option) {
if (userConfig.hasOwnProperty(option)) {
usedDeprecated.push(option);
}
});
if (usedDeprecated.length > 0) {
- console.warn(Utils.colors.warn(
- "WARNING! Your config is using deprecated options: " +
- usedDeprecated.join(", ") +
- ". Check README and CHANGELOG for more up-to-date ways of getting the same functionality.")
- );
+ console.warn(Utils.colors.warn("WARNING! Your config is using deprecated options: " + usedDeprecated.join(", ") + ". Check README and CHANGELOG for more up-to-date ways of getting the same functionality."));
}
};
@@ -107,8 +103,7 @@ var App = function() {
*
* argument module string - The name of the module (including subpath).
*/
- var loadModule = function(module, callback) {
-
+ var loadModule = function (module, callback) {
var elements = module.split("/");
var moduleName = elements[elements.length - 1];
var moduleFolder = __dirname + "/../modules/" + module;
@@ -156,13 +151,13 @@ var App = function() {
*
* argument module string - The name of the module (including subpath).
*/
- var loadModules = function(modules, callback) {
+ var loadModules = function (modules, callback) {
console.log("Loading module helpers ...");
- var loadNextModule = function() {
+ var loadNextModule = function () {
if (modules.length > 0) {
var nextModule = modules[0];
- loadModule(nextModule, function() {
+ loadModule(nextModule, function () {
modules = modules.slice(1);
loadNextModule();
});
@@ -205,9 +200,8 @@ var App = function() {
*
* argument callback function - The callback function.
*/
- this.start = function(callback) {
-
- loadConfig(function(c) {
+ this.start = function (callback) {
+ loadConfig(function (c) {
config = c;
var modules = [];
@@ -219,8 +213,8 @@ var App = function() {
}
}
- loadModules(modules, function() {
- var server = new Server(config, function(app, io) {
+ loadModules(modules, function () {
+ var server = new Server(config, function (app, io) {
console.log("Server started ...");
for (var h in nodeHelpers) {
@@ -245,7 +239,7 @@ var App = function() {
* This calls each node_helper's STOP() function, if it exists.
* Added to fix #1056
*/
- this.stop = function() {
+ this.stop = function () {
for (var h in nodeHelpers) {
var nodeHelper = nodeHelpers[h];
if (typeof nodeHelper.stop === "function") {
@@ -262,7 +256,9 @@ var App = function() {
*/
process.on("SIGINT", () => {
console.log("[SIGINT] Received. Shutting down server...");
- setTimeout(() => { process.exit(0); }, 3000); // Force quit after 3 seconds
+ setTimeout(() => {
+ process.exit(0);
+ }, 3000); // Force quit after 3 seconds
this.stop();
process.exit(0);
});
@@ -271,7 +267,9 @@ var App = function() {
*/
process.on("SIGTERM", () => {
console.log("[SIGTERM] Received. Shutting down server...");
- setTimeout(() => { process.exit(0); }, 3000); // Force quit after 3 seconds
+ setTimeout(() => {
+ process.exit(0);
+ }, 3000); // Force quit after 3 seconds
this.stop();
process.exit(0);
});
diff --git a/tests/configs/check_config.js b/js/check_config.js
similarity index 71%
rename from tests/configs/check_config.js
rename to js/check_config.js
index 917b6d32..f713657b 100644
--- a/tests/configs/check_config.js
+++ b/js/check_config.js
@@ -11,11 +11,13 @@
const Linter = require("eslint").Linter;
const linter = new Linter();
-const config = require(__dirname + "/../../.eslintrc.json");
-var path = require("path");
-var fs = require("fs");
-var Utils = require(__dirname + "/../../js/utils.js");
+const path = require("path");
+const fs = require("fs");
+
+const rootPath = path.resolve(__dirname + "/../");
+const config = require(rootPath + "/.eslintrc.json");
+const Utils = require(rootPath + "/js/utils.js");
/* getConfigFile()
* Return string with path of configuration file
@@ -23,8 +25,7 @@ var Utils = require(__dirname + "/../../js/utils.js");
*/
function getConfigFile() {
// FIXME: This function should be in core. Do you want refactor me ;) ?, be good!
- rootPath = path.resolve(__dirname + "/../../");
- var configFileName = path.resolve(rootPath + "/config/config.js");
+ let configFileName = path.resolve(rootPath + "/config/config.js");
if (process.env.MM_CONFIG_FILE) {
configFileName = path.resolve(process.env.MM_CONFIG_FILE);
}
@@ -32,7 +33,7 @@ function getConfigFile() {
}
function checkConfigFile() {
- var configFileName = getConfigFile();
+ const configFileName = getConfigFile();
// Check if file is present
if (fs.existsSync(configFileName) === false) {
console.error(Utils.colors.error("File not found: "), configFileName);
@@ -49,24 +50,22 @@ function checkConfigFile() {
// Validate syntax of the configuration file.
// In case the there errors show messages and
// return
- console.info(Utils.colors.info("Checking file... ", configFileName));
+ console.info(Utils.colors.info("Checking file... "), configFileName);
// I'm not sure if all ever is utf-8
fs.readFile(configFileName, "utf-8", function (err, data) {
- if (err) { throw err; }
+ if (err) {
+ throw err;
+ }
const messages = linter.verify(data, config);
if (messages.length === 0) {
console.log("Your configuration file doesn't contain syntax errors :)");
return true;
} else {
- errors = messages;
- for (var idx in errors) {
- error = errors[idx];
+ messages.forEach((error) => {
console.log("Line", error.line, "col", error.column, error.message);
- }
+ });
}
});
}
-if (process.env.NODE_ENV !== "test") {
- checkConfigFile();
-}
+checkConfigFile();
diff --git a/js/class.js b/js/class.js
index 39cd2962..f52ac405 100644
--- a/js/class.js
+++ b/js/class.js
@@ -1,15 +1,22 @@
+/* global Class, xyz */
+
/* Simple JavaScript Inheritance
- * By John Resig http://ejohn.org/
+ * By John Resig https://johnresig.com/
+ *
+ * Inspired by base2 and Prototype
+ *
* MIT Licensed.
*/
-
-// Inspired by base2 and Prototype
(function () {
var initializing = false;
- var fnTest = /xyz/.test(function () { xyz; }) ? /\b_super\b/ : /.*/;
+ var fnTest = /xyz/.test(function () {
+ xyz;
+ })
+ ? /\b_super\b/
+ : /.*/;
// The base Class implementation (does nothing)
- this.Class = function () { };
+ this.Class = function () {};
// Create a new Class that inherits from this class
Class.extend = function (prop) {
@@ -22,30 +29,32 @@
initializing = false;
// Make a copy of all prototype properties, to prevent reference issues.
- for (var name in prototype) {
- prototype[name] = cloneObject(prototype[name]);
+ for (var p in prototype) {
+ prototype[p] = cloneObject(prototype[p]);
}
// Copy the properties over onto the new prototype
for (var name in prop) {
// Check if we're overwriting an existing function
- prototype[name] = typeof prop[name] === "function" &&
- typeof _super[name] === "function" && fnTest.test(prop[name]) ? (function (name, fn) {
- return function () {
- var tmp = this._super;
+ prototype[name] =
+ typeof prop[name] === "function" && typeof _super[name] === "function" && fnTest.test(prop[name])
+ ? (function (name, fn) {
+ return function () {
+ var tmp = this._super;
- // Add a new ._super() method that is the same method
- // but on the super-class
- this._super = _super[name];
+ // Add a new ._super() method that is the same method
+ // but on the super-class
+ this._super = _super[name];
- // The method only need to be bound temporarily, so we
- // remove it when we're done executing
- var ret = fn.apply(this, arguments);
- this._super = tmp;
+ // The method only need to be bound temporarily, so we
+ // remove it when we're done executing
+ var ret = fn.apply(this, arguments);
+ this._super = tmp;
- return ret;
- };
- })(name, prop[name]) : prop[name];
+ return ret;
+ };
+ })(name, prop[name])
+ : prop[name];
}
// The dummy class constructor
diff --git a/js/defaults.js b/js/defaults.js
index 08c4d945..c1a53396 100644
--- a/js/defaults.js
+++ b/js/defaults.js
@@ -1,20 +1,20 @@
-/* exported defaults */
+/* global mmPort */
/* Magic Mirror
- * Config Defauls
+ * Config Defaults
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
-
-var port = 8080;
var address = "localhost";
-if (typeof(mmPort) !== "undefined") {
+var port = 8080;
+if (typeof mmPort !== "undefined") {
port = mmPort;
}
var defaults = {
address: address,
port: port,
+ basePath: "/",
kioskmode: false,
electronOptions: {},
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
@@ -68,14 +68,16 @@ var defaults = {
config: {
text: "www.michaelteeuw.nl"
}
- },
+ }
],
paths: {
modules: "modules",
vendor: "vendor"
- },
+ }
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = defaults;}
+if (typeof module !== "undefined") {
+ module.exports = defaults;
+}
diff --git a/js/deprecated.js b/js/deprecated.js
index 96f081cd..4f56b41d 100644
--- a/js/deprecated.js
+++ b/js/deprecated.js
@@ -1,14 +1,16 @@
/* Magic Mirror Deprecated Config Options List
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*
* Olex S. original idea this deprecated option
*/
var deprecated = {
- configs: ["kioskmode"],
+ configs: ["kioskmode"]
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = deprecated;}
+if (typeof module !== "undefined") {
+ module.exports = deprecated;
+}
diff --git a/js/electron.js b/js/electron.js
index f7615b1c..71eed9b8 100644
--- a/js/electron.js
+++ b/js/electron.js
@@ -45,8 +45,16 @@ function createWindow() {
// and load the index.html of the app.
// If config.address is not defined or is an empty string (listening on all interfaces), connect to localhost
+
+ var prefix;
+ if (config["tls"] !== null && config["tls"]) {
+ prefix = "https://";
+ } else {
+ prefix = "http://";
+ }
+
var address = (config.address === void 0) | (config.address === "") ? (config.address = "localhost") : config.address;
- mainWindow.loadURL(`http://${address}:${config.port}`);
+ mainWindow.loadURL(`${prefix}${address}:${config.port}`);
// Open the DevTools if run with "npm start dev"
if (process.argv.includes("dev")) {
@@ -54,21 +62,21 @@ function createWindow() {
}
// Set responders for window events.
- mainWindow.on("closed", function() {
+ mainWindow.on("closed", function () {
mainWindow = null;
});
if (config.kioskmode) {
- mainWindow.on("blur", function() {
+ mainWindow.on("blur", function () {
mainWindow.focus();
});
- mainWindow.on("leave-full-screen", function() {
+ mainWindow.on("leave-full-screen", function () {
mainWindow.setFullScreen(true);
});
- mainWindow.on("resize", function() {
- setTimeout(function() {
+ mainWindow.on("resize", function () {
+ setTimeout(function () {
mainWindow.reload();
}, 1000);
});
@@ -77,17 +85,17 @@ function createWindow() {
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
-app.on("ready", function() {
+app.on("ready", function () {
console.log("Launching application.");
createWindow();
});
// Quit when all windows are closed.
-app.on("window-all-closed", function() {
+app.on("window-all-closed", function () {
createWindow();
});
-app.on("activate", function() {
+app.on("activate", function () {
// On OS X it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (mainWindow === null) {
@@ -104,7 +112,9 @@ app.on("activate", function() {
app.on("before-quit", (event) => {
console.log("Shutting down server...");
event.preventDefault();
- setTimeout(() => { process.exit(0); }, 3000); // Force-quit after 3 seconds.
+ setTimeout(() => {
+ process.exit(0);
+ }, 3000); // Force-quit after 3 seconds.
core.stop();
process.exit(0);
});
@@ -112,7 +122,7 @@ app.on("before-quit", (event) => {
// Start the core application if server is run on localhost
// This starts all node helpers and starts the webserver.
if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) > -1) {
- core.start(function(c) {
+ core.start(function (c) {
config = c;
});
}
diff --git a/js/loader.js b/js/loader.js
index 6db46ad5..50e7176d 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -1,13 +1,12 @@
-/* global config, vendor, MM, Log, Module */
+/* global defaultModules, vendor */
+
/* Magic Mirror
* Module and File loaders.
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
-
-var Loader = (function() {
-
+var Loader = (function () {
/* Create helper variables */
var loadedModuleFiles = [];
@@ -19,14 +18,13 @@ var Loader = (function() {
/* loadModules()
* Loops thru all modules and requests load for every module.
*/
- var loadModules = function() {
-
+ var loadModules = function () {
var moduleData = getModuleData();
- var loadNextModule = function() {
+ var loadNextModule = function () {
if (moduleData.length > 0) {
var nextModule = moduleData[0];
- loadModule(nextModule, function() {
+ loadModule(nextModule, function () {
moduleData = moduleData.slice(1);
loadNextModule();
});
@@ -35,11 +33,10 @@ var Loader = (function() {
// This is done after all the modules so we can
// overwrite all the defined styles.
- loadFile(config.customCss, function() {
+ loadFile(config.customCss, function () {
// custom.css loaded. Start all modules.
startModules();
});
-
}
};
@@ -49,7 +46,7 @@ var Loader = (function() {
/* startModules()
* Loops thru all modules and requests start for every module.
*/
- var startModules = function() {
+ var startModules = function () {
for (var m in moduleObjects) {
var module = moduleObjects[m];
module.start();
@@ -64,7 +61,7 @@ var Loader = (function() {
*
* return array - module data as configured in config
*/
- var getAllModules = function() {
+ var getAllModules = function () {
return config.modules;
};
@@ -73,7 +70,7 @@ var Loader = (function() {
*
* return array - Module information.
*/
- var getModuleData = function() {
+ var getModuleData = function () {
var modules = getAllModules();
var moduleFiles = [];
@@ -97,12 +94,12 @@ var Loader = (function() {
index: m,
identifier: "module_" + m + "_" + module,
name: moduleName,
- path: moduleFolder + "/" ,
+ path: moduleFolder + "/",
file: moduleName + ".js",
position: moduleData.position,
header: moduleData.header,
config: moduleData.config,
- classes: (typeof moduleData.classes !== "undefined") ? moduleData.classes + " " + module : module
+ classes: typeof moduleData.classes !== "undefined" ? moduleData.classes + " " + module : module
});
}
@@ -115,13 +112,13 @@ var Loader = (function() {
* argument callback function - Function called when done.
* argument module object - Information about the module we want to load.
*/
- var loadModule = function(module, callback) {
+ var loadModule = function (module, callback) {
var url = module.path + "/" + module.file;
- var afterLoad = function() {
+ var afterLoad = function () {
var moduleObject = Module.create(module.name);
if (moduleObject) {
- bootstrapModule(module, moduleObject, function() {
+ bootstrapModule(module, moduleObject, function () {
callback();
});
} else {
@@ -132,7 +129,7 @@ var Loader = (function() {
if (loadedModuleFiles.indexOf(url) !== -1) {
afterLoad();
} else {
- loadFile(url, function() {
+ loadFile(url, function () {
loadedModuleFiles.push(url);
afterLoad();
});
@@ -146,16 +143,16 @@ var Loader = (function() {
* argument mObj object - Modules instance.
* argument callback function - Function called when done.
*/
- var bootstrapModule = function(module, mObj, callback) {
+ var bootstrapModule = function (module, mObj, callback) {
Log.info("Bootstrapping module: " + module.name);
mObj.setData(module);
- mObj.loadScripts(function() {
+ mObj.loadScripts(function () {
Log.log("Scripts loaded for: " + module.name);
- mObj.loadStyles(function() {
+ mObj.loadStyles(function () {
Log.log("Styles loaded for: " + module.name);
- mObj.loadTranslations(function() {
+ mObj.loadTranslations(function () {
Log.log("Translations loaded for: " + module.name);
moduleObjects.push(mObj);
callback();
@@ -170,52 +167,58 @@ var Loader = (function() {
* argument fileName string - Path of the file we want to load.
* argument callback function - Function called when done.
*/
- var loadFile = function(fileName, callback) {
-
+ var loadFile = function (fileName, callback) {
var extension = fileName.slice((Math.max(0, fileName.lastIndexOf(".")) || Infinity) + 1);
switch (extension.toLowerCase()) {
- case "js":
- Log.log("Load script: " + fileName);
- var script = document.createElement("script");
- script.type = "text/javascript";
- script.src = fileName;
- script.onload = function() {
- if (typeof callback === "function") {callback();}
- };
- script.onerror = function() {
- console.error("Error on loading script:", fileName);
- if (typeof callback === "function") {callback();}
- };
+ case "js":
+ Log.log("Load script: " + fileName);
+ var script = document.createElement("script");
+ script.type = "text/javascript";
+ script.src = fileName;
+ script.onload = function () {
+ if (typeof callback === "function") {
+ callback();
+ }
+ };
+ script.onerror = function () {
+ console.error("Error on loading script:", fileName);
+ if (typeof callback === "function") {
+ callback();
+ }
+ };
- document.getElementsByTagName("body")[0].appendChild(script);
- break;
- case "css":
- Log.log("Load stylesheet: " + fileName);
- var stylesheet = document.createElement("link");
- stylesheet.rel = "stylesheet";
- stylesheet.type = "text/css";
- stylesheet.href = fileName;
- stylesheet.onload = function() {
- if (typeof callback === "function") {callback();}
- };
- stylesheet.onerror = function() {
- console.error("Error on loading stylesheet:", fileName);
- if (typeof callback === "function") {callback();}
- };
+ document.getElementsByTagName("body")[0].appendChild(script);
+ break;
+ case "css":
+ Log.log("Load stylesheet: " + fileName);
+ var stylesheet = document.createElement("link");
+ stylesheet.rel = "stylesheet";
+ stylesheet.type = "text/css";
+ stylesheet.href = fileName;
+ stylesheet.onload = function () {
+ if (typeof callback === "function") {
+ callback();
+ }
+ };
+ stylesheet.onerror = function () {
+ console.error("Error on loading stylesheet:", fileName);
+ if (typeof callback === "function") {
+ callback();
+ }
+ };
- document.getElementsByTagName("head")[0].appendChild(stylesheet);
- break;
+ document.getElementsByTagName("head")[0].appendChild(stylesheet);
+ break;
}
};
/* Public Methods */
return {
-
/* loadModules()
* Load all modules as defined in the config.
*/
- loadModules: function() {
+ loadModules: function () {
loadModules();
},
@@ -227,8 +230,7 @@ var Loader = (function() {
* argument module Module Object - the module that calls the loadFile function.
* argument callback function - Function called when done.
*/
- loadFile: function(fileName, module, callback) {
-
+ loadFile: function (fileName, module, callback) {
if (loadedFiles.indexOf(fileName.toLowerCase()) !== -1) {
Log.log("File already loaded: " + fileName);
callback();
diff --git a/js/logger.js b/js/logger.js
index 1392a72b..632cf117 100644
--- a/js/logger.js
+++ b/js/logger.js
@@ -1,20 +1,15 @@
-/* global console */
-/* exported Log */
-
/* Magic Mirror
* Logger
+ * This logger is very simple, but needs to be extended.
+ * This system can eventually be used to push the log messages to an external target.
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
-
-// This logger is very simple, but needs to be extended.
-// This system can eventually be used to push the log messages to an external target.
-
-var Log = (function() {
+const Log = (function () {
return {
info: Function.prototype.bind.call(console.info, console),
- log: Function.prototype.bind.call(console.log, console),
+ log: Function.prototype.bind.call(console.log, console),
error: Function.prototype.bind.call(console.error, console),
warn: Function.prototype.bind.call(console.warn, console),
group: Function.prototype.bind.call(console.group, console),
diff --git a/js/main.js b/js/main.js
index 465f1d45..07459f0f 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,14 +1,12 @@
-/* global Log, Loader, Module, config, defaults */
+/* global Loader, defaults, Translator */
/* Magic Mirror
* Main System
*
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
-
-var MM = (function() {
-
+var MM = (function () {
var modules = [];
/* Private Methods */
@@ -17,10 +15,10 @@ var MM = (function() {
* Create dom objects for all modules that
* are configured for a specific position.
*/
- var createDomObjects = function() {
+ var createDomObjects = function () {
var domCreationPromises = [];
- modules.forEach(function(module) {
+ modules.forEach(function (module) {
if (typeof module.data.position !== "string") {
return;
}
@@ -53,14 +51,16 @@ var MM = (function() {
var domCreationPromise = updateDom(module, 0);
domCreationPromises.push(domCreationPromise);
- domCreationPromise.then(function() {
- sendNotification("MODULE_DOM_CREATED", null, null, module);
- }).catch(Log.error);
+ domCreationPromise
+ .then(function () {
+ sendNotification("MODULE_DOM_CREATED", null, null, module);
+ })
+ .catch(Log.error);
});
updateWrapperStates();
- Promise.all(domCreationPromises).then(function() {
+ Promise.all(domCreationPromises).then(function () {
sendNotification("DOM_OBJECTS_CREATED");
});
};
@@ -70,8 +70,8 @@ var MM = (function() {
*
* argument position string - The name of the position.
*/
- var selectWrapper = function(position) {
- var classes = position.replace("_"," ");
+ var selectWrapper = function (position) {
+ var classes = position.replace("_", " ");
var parentWrapper = document.getElementsByClassName(classes);
if (parentWrapper.length > 0) {
var wrapper = parentWrapper[0].getElementsByClassName("container");
@@ -89,7 +89,7 @@ var MM = (function() {
* argument sender Module - The module that sent the notification.
* argument sendTo Module - The module to send the notification to. (optional)
*/
- var sendNotification = function(notification, payload, sender, sendTo) {
+ var sendNotification = function (notification, payload, sender, sendTo) {
for (var m in modules) {
var module = modules[m];
if (module !== sender && (!sendTo || module === sendTo)) {
@@ -106,8 +106,8 @@ var MM = (function() {
*
* return Promise - Resolved when the dom is fully updated.
*/
- var updateDom = function(module, speed) {
- return new Promise(function(resolve) {
+ var updateDom = function (module, speed) {
+ return new Promise(function (resolve) {
var newContentPromise = module.getDom();
var newHeader = module.getHeader();
@@ -116,11 +116,13 @@ var MM = (function() {
newContentPromise = Promise.resolve(newContentPromise);
}
- newContentPromise.then(function(newContent) {
- var updatePromise = updateDomWithContent(module, speed, newHeader, newContent);
+ newContentPromise
+ .then(function (newContent) {
+ var updatePromise = updateDomWithContent(module, speed, newHeader, newContent);
- updatePromise.then(resolve).catch(Log.error);
- }).catch(Log.error);
+ updatePromise.then(resolve).catch(Log.error);
+ })
+ .catch(Log.error);
});
};
@@ -134,8 +136,8 @@ var MM = (function() {
*
* return Promise - Resolved when the module dom has been updated.
*/
- var updateDomWithContent = function(module, speed, newHeader, newContent) {
- return new Promise(function(resolve) {
+ var updateDomWithContent = function (module, speed, newHeader, newContent) {
+ return new Promise(function (resolve) {
if (module.hidden || !speed) {
updateModuleContent(module, newHeader, newContent);
resolve();
@@ -153,7 +155,7 @@ var MM = (function() {
return;
}
- hideModule(module, speed / 2, function() {
+ hideModule(module, speed / 2, function () {
updateModuleContent(module, newHeader, newContent);
if (!module.hidden) {
showModule(module, speed / 2);
@@ -172,7 +174,7 @@ var MM = (function() {
*
* return bool - Does the module need an update?
*/
- var moduleNeedsUpdate = function(module, newHeader, newContent) {
+ var moduleNeedsUpdate = function (module, newHeader, newContent) {
var moduleWrapper = document.getElementById(module.identifier);
if (moduleWrapper === null) {
return false;
@@ -202,9 +204,11 @@ var MM = (function() {
* argument newHeader String - The new header that is generated.
* argument newContent Domobject - The new content that is generated.
*/
- var updateModuleContent = function(module, newHeader, newContent) {
+ var updateModuleContent = function (module, newHeader, newContent) {
var moduleWrapper = document.getElementById(module.identifier);
- if (moduleWrapper === null) {return;}
+ if (moduleWrapper === null) {
+ return;
+ }
var headerWrapper = moduleWrapper.getElementsByClassName("module-header");
var contentWrapper = moduleWrapper.getElementsByClassName("module-content");
@@ -222,7 +226,7 @@ var MM = (function() {
* argument speed Number - The speed of the hide animation.
* argument callback function - Called when the animation is done.
*/
- var hideModule = function(module, speed, callback, options) {
+ var hideModule = function (module, speed, callback, options) {
options = options || {};
// set lockString if set in options.
@@ -239,7 +243,7 @@ var MM = (function() {
moduleWrapper.style.opacity = 0;
clearTimeout(module.showHideTimer);
- module.showHideTimer = setTimeout(function() {
+ module.showHideTimer = setTimeout(function () {
// To not take up any space, we just make the position absolute.
// since it's fade out anyway, we can see it lay above or
// below other modules. This works way better than adjusting
@@ -248,11 +252,15 @@ var MM = (function() {
updateWrapperStates();
- if (typeof callback === "function") { callback(); }
+ if (typeof callback === "function") {
+ callback();
+ }
}, speed);
} else {
// invoke callback even if no content, issue 1308
- if (typeof callback === "function") { callback(); }
+ if (typeof callback === "function") {
+ callback();
+ }
}
};
@@ -263,13 +271,13 @@ var MM = (function() {
* argument speed Number - The speed of the show animation.
* argument callback function - Called when the animation is done.
*/
- var showModule = function(module, speed, callback, options) {
+ var showModule = function (module, speed, callback, options) {
options = options || {};
// remove lockString if set in options.
if (options.lockString) {
var index = module.lockStrings.indexOf(options.lockString);
- if ( index !== -1) {
+ if (index !== -1) {
module.lockStrings.splice(index, 1);
}
}
@@ -302,12 +310,16 @@ var MM = (function() {
moduleWrapper.style.opacity = 1;
clearTimeout(module.showHideTimer);
- module.showHideTimer = setTimeout(function() {
- if (typeof callback === "function") { callback(); }
+ module.showHideTimer = setTimeout(function () {
+ if (typeof callback === "function") {
+ callback();
+ }
}, speed);
} else {
// invoke callback
- if (typeof callback === "function") { callback(); }
+ if (typeof callback === "function") {
+ callback();
+ }
}
};
@@ -322,15 +334,15 @@ var MM = (function() {
* an ugly top margin. By using this function, the top bar will be hidden if the
* update notification is not visible.
*/
- var updateWrapperStates = function() {
+ var updateWrapperStates = function () {
var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third", "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right", "bottom_bar", "fullscreen_above", "fullscreen_below"];
- positions.forEach(function(position) {
+ positions.forEach(function (position) {
var wrapper = selectWrapper(position);
var moduleWrappers = wrapper.getElementsByClassName("module");
var showWrapper = false;
- Array.prototype.forEach.call(moduleWrappers, function(moduleWrapper) {
+ Array.prototype.forEach.call(moduleWrappers, function (moduleWrapper) {
if (moduleWrapper.style.position === "" || moduleWrapper.style.position === "static") {
showWrapper = true;
}
@@ -343,7 +355,9 @@ var MM = (function() {
/* loadConfig()
* Loads the core config and combines it with de system defaults.
*/
- var loadConfig = function() {
+ var loadConfig = function () {
+ // FIXME: Think about how to pass config around without breaking tests
+ /* eslint-disable */
if (typeof config === "undefined") {
config = defaults;
Log.error("Config file is missing! Please create a config file.");
@@ -351,6 +365,7 @@ var MM = (function() {
}
config = Object.assign({}, defaults, config);
+ /* eslint-enable */
};
/* setSelectionMethodsForModules()
@@ -358,8 +373,7 @@ var MM = (function() {
*
* argument modules array - Array of modules.
*/
- var setSelectionMethodsForModules = function(modules) {
-
+ var setSelectionMethodsForModules = function (modules) {
/* withClass(className)
* calls modulesByClass to filter modules with the specified classes.
*
@@ -367,7 +381,7 @@ var MM = (function() {
*
* return array - Filtered collection of modules.
*/
- var withClass = function(className) {
+ var withClass = function (className) {
return modulesByClass(className, true);
};
@@ -378,7 +392,7 @@ var MM = (function() {
*
* return array - Filtered collection of modules.
*/
- var exceptWithClass = function(className) {
+ var exceptWithClass = function (className) {
return modulesByClass(className, false);
};
@@ -390,13 +404,13 @@ var MM = (function() {
*
* return array - Filtered collection of modules.
*/
- var modulesByClass = function(className, include) {
+ var modulesByClass = function (className, include) {
var searchClasses = className;
if (typeof className === "string") {
searchClasses = className.split(" ");
}
- var newModules = modules.filter(function(module) {
+ var newModules = modules.filter(function (module) {
var classes = module.data.classes.toLowerCase().split(" ");
for (var c in searchClasses) {
@@ -420,8 +434,8 @@ var MM = (function() {
*
* return array - Filtered collection of modules.
*/
- var exceptModule = function(module) {
- var newModules = modules.filter(function(mod) {
+ var exceptModule = function (module) {
+ var newModules = modules.filter(function (mod) {
return mod.identifier !== module.identifier;
});
@@ -434,16 +448,24 @@ var MM = (function() {
*
* argument callback function - The function to execute with the module as an argument.
*/
- var enumerate = function(callback) {
- modules.map(function(module) {
+ var enumerate = function (callback) {
+ modules.map(function (module) {
callback(module);
});
};
- if (typeof modules.withClass === "undefined") { Object.defineProperty(modules, "withClass", {value: withClass, enumerable: false}); }
- if (typeof modules.exceptWithClass === "undefined") { Object.defineProperty(modules, "exceptWithClass", {value: exceptWithClass, enumerable: false}); }
- if (typeof modules.exceptModule === "undefined") { Object.defineProperty(modules, "exceptModule", {value: exceptModule, enumerable: false}); }
- if (typeof modules.enumerate === "undefined") { Object.defineProperty(modules, "enumerate", {value: enumerate, enumerable: false}); }
+ if (typeof modules.withClass === "undefined") {
+ Object.defineProperty(modules, "withClass", { value: withClass, enumerable: false });
+ }
+ if (typeof modules.exceptWithClass === "undefined") {
+ Object.defineProperty(modules, "exceptWithClass", { value: exceptWithClass, enumerable: false });
+ }
+ if (typeof modules.exceptModule === "undefined") {
+ Object.defineProperty(modules, "exceptModule", { value: exceptModule, enumerable: false });
+ }
+ if (typeof modules.enumerate === "undefined") {
+ Object.defineProperty(modules, "enumerate", { value: enumerate, enumerable: false });
+ }
};
return {
@@ -452,7 +474,7 @@ var MM = (function() {
/* init()
* Main init method.
*/
- init: function() {
+ init: function () {
Log.info("Initializing MagicMirror.");
loadConfig();
Translator.loadCoreTranslations(config.language);
@@ -464,7 +486,7 @@ var MM = (function() {
*
* argument moduleObjects array