+ {% if item.sourceTitle and config.showSourceTitle %}
+ {{ item.sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %}
+ {% endif %}
+ {% if config.showPublishDate %}
+ {{ item.publishDate }}:
+ {% endif %}
+
+ {% endif %}
+
+ {% if config.truncDescription %}
+ {{ item.description | truncate(config.lengthDescription) }}
+ {% else %}
+ {{ item.description }}
+ {% endif %}
+
+ {% endif %}
+
+ {% endfor %}
+
+ {% else %}
diff --git a/modules/default/newsfeed/newsfeedfetcher.js b/modules/default/newsfeed/newsfeedfetcher.js
index d4db511d..6dd8683a 100644
--- a/modules/default/newsfeed/newsfeedfetcher.js
+++ b/modules/default/newsfeed/newsfeedfetcher.js
@@ -6,6 +6,7 @@
*/
const Log = require("logger");
const FeedMe = require("feedme");
+const NodeHelper = require("node_helper");
const fetch = require("node-fetch");
const iconv = require("iconv-lite");
@@ -84,12 +85,13 @@ const NewsfeedFetcher = function (url, reloadInterval, encoding, logFeedWarnings
};
fetch(url, { headers: headers })
+ .then(NodeHelper.checkFetchStatus)
+ .then((response) => {
+ response.body.pipe(iconv.decodeStream(encoding)).pipe(parser);
+ })
.catch((error) => {
fetchFailedCallback(this, error);
scheduleTimer();
- })
- .then((res) => {
- res.body.pipe(iconv.decodeStream(encoding)).pipe(parser);
});
};
diff --git a/modules/default/newsfeed/node_helper.js b/modules/default/newsfeed/node_helper.js
index 6fd461a1..32656a9f 100644
--- a/modules/default/newsfeed/node_helper.js
+++ b/modules/default/newsfeed/node_helper.js
@@ -27,8 +27,8 @@ module.exports = NodeHelper.create({
* Creates a fetcher for a new feed if it doesn't exist yet.
* Otherwise it reuses the existing one.
*
- * @param {object} feed The feed object.
- * @param {object} config The configuration object.
+ * @param {object} feed The feed object
+ * @param {object} config The configuration object
*/
createFetcher: function (feed, config) {
const url = feed.url || "";
@@ -38,13 +38,14 @@ module.exports = NodeHelper.create({
try {
new URL(url);
} catch (error) {
- this.sendSocketNotification("INCORRECT_URL", { url: url });
+ Log.error("Newsfeed Error. Malformed newsfeed url: ", url, error);
+ this.sendSocketNotification("NEWSFEED_ERROR", { error_type: "MODULE_ERROR_MALFORMED_URL" });
return;
}
let fetcher;
if (typeof this.fetchers[url] === "undefined") {
- Log.log("Create new news fetcher for url: " + url + " - Interval: " + reloadInterval);
+ Log.log("Create new newsfetcher for url: " + url + " - Interval: " + reloadInterval);
fetcher = new NewsfeedFetcher(url, reloadInterval, encoding, config.logFeedWarnings);
fetcher.onReceive(() => {
@@ -52,15 +53,16 @@ module.exports = NodeHelper.create({
});
fetcher.onError((fetcher, error) => {
- this.sendSocketNotification("FETCH_ERROR", {
- url: fetcher.url(),
- error: error
+ Log.error("Newsfeed Error. Could not fetch newsfeed: ", url, error);
+ let error_type = NodeHelper.checkFetchError(error);
+ this.sendSocketNotification("NEWSFEED_ERROR", {
+ error_type
});
});
this.fetchers[url] = fetcher;
} else {
- Log.log("Use existing news fetcher for url: " + url);
+ Log.log("Use existing newsfetcher for url: " + url);
fetcher = this.fetchers[url];
fetcher.setReloadInterval(reloadInterval);
fetcher.broadcastItems();
diff --git a/modules/default/updatenotification/updatenotification.js b/modules/default/updatenotification/updatenotification.js
index c67205a7..7d416852 100644
--- a/modules/default/updatenotification/updatenotification.js
+++ b/modules/default/updatenotification/updatenotification.js
@@ -5,33 +5,35 @@
* MIT Licensed.
*/
Module.register("updatenotification", {
+ // Define module defaults
defaults: {
updateInterval: 10 * 60 * 1000, // every 10 minutes
refreshInterval: 24 * 60 * 60 * 1000, // one day
ignoreModules: [],
- timeout: 1000
+ timeout: 5000
},
suspended: false,
moduleList: {},
+ // Override start method.
start: function () {
- var self = this;
- Log.log("Start updatenotification");
+ Log.info("Starting module: " + this.name);
setInterval(() => {
- self.moduleList = {};
- self.updateDom(2);
- }, self.config.refreshInterval);
+ this.moduleList = {};
+ this.updateDom(2);
+ }, this.config.refreshInterval);
},
notificationReceived: function (notification, payload, sender) {
if (notification === "DOM_OBJECTS_CREATED") {
this.sendSocketNotification("CONFIG", this.config);
this.sendSocketNotification("MODULES", Module.definitions);
- //this.hide(0, { lockString: self.identifier });
+ //this.hide(0, { lockString: this.identifier });
}
},
+ // Override socket notification handler.
socketNotificationReceived: function (notification, payload) {
if (notification === "STATUS") {
this.updateUI(payload);
@@ -39,13 +41,12 @@ Module.register("updatenotification", {
},
updateUI: function (payload) {
- var self = this;
if (payload && payload.behind > 0) {
// if we haven't seen info for this module
if (this.moduleList[payload.module] === undefined) {
// save it
this.moduleList[payload.module] = payload;
- self.updateDom(2);
+ this.updateDom(2);
}
//self.show(1000, { lockString: self.identifier });
} else if (payload && payload.behind === 0) {
@@ -53,41 +54,41 @@ Module.register("updatenotification", {
if (this.moduleList[payload.module] !== undefined) {
// remove it
delete this.moduleList[payload.module];
- self.updateDom(2);
+ this.updateDom(2);
}
}
},
diffLink: function (module, text) {
- var localRef = module.hash;
- var remoteRef = module.tracking.replace(/.*\//, "");
+ const localRef = module.hash;
+ const remoteRef = module.tracking.replace(/.*\//, "");
return '
' + text + " ";
},
// Override dom generator.
getDom: function () {
- var wrapper = document.createElement("div");
+ const wrapper = document.createElement("div");
if (this.suspended === false) {
// process the hash of module info found
- for (var key of Object.keys(this.moduleList)) {
+ for (const key of Object.keys(this.moduleList)) {
let m = this.moduleList[key];
- var message = document.createElement("div");
+ const message = document.createElement("div");
message.className = "small bright";
- var icon = document.createElement("i");
+ const icon = document.createElement("i");
icon.className = "fa fa-exclamation-circle";
icon.innerHTML = " ";
message.appendChild(icon);
- var updateInfoKeyName = m.behind === 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE";
+ const updateInfoKeyName = m.behind === 1 ? "UPDATE_INFO_SINGLE" : "UPDATE_INFO_MULTIPLE";
- var subtextHtml = this.translate(updateInfoKeyName, {
+ let subtextHtml = this.translate(updateInfoKeyName, {
COMMIT_COUNT: m.behind,
BRANCH_NAME: m.current
});
- var text = document.createElement("span");
+ const text = document.createElement("span");
if (m.module === "default") {
text.innerHTML = this.translate("UPDATE_NOTIFICATION");
subtextHtml = this.diffLink(m, subtextHtml);
@@ -100,7 +101,7 @@ Module.register("updatenotification", {
wrapper.appendChild(message);
- var subtext = document.createElement("div");
+ const subtext = document.createElement("div");
subtext.innerHTML = subtextHtml;
subtext.className = "xsmall dimmed";
wrapper.appendChild(subtext);
diff --git a/modules/default/weather/forecast.njk b/modules/default/weather/forecast.njk
index 8fa04298..92a575cf 100644
--- a/modules/default/weather/forecast.njk
+++ b/modules/default/weather/forecast.njk
@@ -5,24 +5,30 @@
{% set forecast = forecast.slice(0, numSteps) %}
{% for f in forecast %}
- {% if (currentStep == 0) %}
+ {% if (currentStep == 0) and config.ignoreToday == false %}
{{ "TODAY" | translate }}
- {% elif (currentStep == 1) %}
+ {% elif (currentStep == 1) and config.ignoreToday == false %}
{{ "TOMORROW" | translate }}
{% else %}
{{ f.date.format('ddd') }}
{% endif %}
- {{ f.maxTemperature | roundValue | unit("temperature") }}
+ {{ f.maxTemperature | roundValue | unit("temperature") | decimalSymbol }}
- {{ f.minTemperature | roundValue | unit("temperature") }}
+ {{ f.minTemperature | roundValue | unit("temperature") | decimalSymbol }}
{% if config.showPrecipitationAmount %}
-
- {{ f.precipitation | unit("precip") }}
-
+ {% if f.precipitationUnits %}
+
+ {{ f.precipitation }}{{ f.precipitationUnits }}
+
+ {% else %}
+
+ {{ f.precipitation | unit("precip") }}
+
+ {% endif %}
{% endif %}
{% set currentStep = currentStep + 1 %}
diff --git a/modules/default/weather/hourly.njk b/modules/default/weather/hourly.njk
index 3950ece2..38832bdb 100644
--- a/modules/default/weather/hourly.njk
+++ b/modules/default/weather/hourly.njk
@@ -11,6 +11,10 @@
{{ hour.temperature | roundValue | unit("temperature") }}
{% if config.showPrecipitationAmount %}
+
+ {{ hour.precipitation }}{{ hour.precipitationUnits }}
+
+ {% else %}
{{ hour.precipitation | unit("precip") }}
diff --git a/modules/default/weather/providers/envcanada.js b/modules/default/weather/providers/envcanada.js
new file mode 100644
index 00000000..c48d26dc
--- /dev/null
+++ b/modules/default/weather/providers/envcanada.js
@@ -0,0 +1,664 @@
+/* global WeatherProvider, WeatherObject */
+
+/* Magic Mirror
+ * Module: Weather
+ * Provider: Environment Canada (EC)
+ *
+ * This class is a provider for Environment Canada MSC Datamart
+ * Note that this is only for Canadian locations and does not require an API key (access is anonymous)
+ *
+ * EC Documentation at following links:
+ * https://dd.weather.gc.ca/citypage_weather/schema/
+ * https://eccc-msc.github.io/open-data/msc-datamart/readme_en/
+ *
+ * This module supports Canadian locations only and requires 2 additional config parms:
+ *
+ * siteCode - the city/town unique identifier for which weather is to be displayed. Format is 's0000000'.
+ *
+ * provCode - the 2-character province code for the selected city/town.
+ *
+ * Example: for Toronto, Ontario, the following parms would be used
+ *
+ * siteCode: 's0000458',
+ * provCode: 'ON'
+ *
+ * To determine the siteCode and provCode values for a Canadian city/town, look at the Environment Canada document
+ * at https://dd.weather.gc.ca/citypage_weather/docs/site_list_en.csv (or site_list_fr.csv). There you will find a table
+ * with locations you can search under column B (English Names), with the corresponding siteCode under
+ * column A (Codes) and provCode under column C (Province).
+ *
+ * Original by Kevin Godin
+ *
+ * License to use Environment Canada (EC) data is detailed here:
+ * https://eccc-msc.github.io/open-data/licence/readme_en/
+ *
+ */
+
+WeatherProvider.register("envcanada", {
+ // Set the name of the provider for debugging and alerting purposes (eg. provide eye-catcher)
+ providerName: "Environment Canada",
+
+ // Set the default config properties that is specific to this provider
+ defaults: {
+ siteCode: "s1234567",
+ provCode: "ON"
+ },
+
+ //
+ // Set config values (equates to weather module config values). Also set values pertaining to caching of
+ // Today's temperature forecast (for use in the Forecast functions below)
+ //
+ setConfig: function (config) {
+ this.config = config;
+
+ this.todayTempCacheMin = 0;
+ this.todayTempCacheMax = 0;
+ this.todayCached = false;
+ this.cacheCurrentTemp = 999;
+ },
+
+ //
+ // Called when the weather provider is started
+ //
+ start: function () {
+ Log.info(`Weather provider: ${this.providerName} started.`);
+ this.setFetchedLocation(this.config.location);
+
+ // Ensure kmH are ignored since these are custom-handled by this Provider
+
+ this.config.useKmh = false;
+ },
+
+ //
+ // Override the fetchCurrentWeather method to query EC and construct a Current weather object
+ //
+ fetchCurrentWeather() {
+ this.fetchData(this.getUrl(), "GET")
+ .then((data) => {
+ if (!data) {
+ // Did not receive usable new data.
+ return;
+ }
+ const currentWeather = this.generateWeatherObjectFromCurrentWeather(data);
+
+ this.setCurrentWeather(currentWeather);
+ })
+ .catch(function (request) {
+ Log.error("Could not load EnvCanada site data ... ", request);
+ })
+ .finally(() => this.updateAvailable());
+ },
+
+ //
+ // Override the fetchWeatherForecast method to query EC and construct Forecast weather objects
+ //
+ fetchWeatherForecast() {
+ this.fetchData(this.getUrl(), "GET")
+ .then((data) => {
+ if (!data) {
+ // Did not receive usable new data.
+ return;
+ }
+ const forecastWeather = this.generateWeatherObjectsFromForecast(data);
+
+ this.setWeatherForecast(forecastWeather);
+ })
+ .catch(function (request) {
+ Log.error("Could not load EnvCanada forecast data ... ", request);
+ })
+ .finally(() => this.updateAvailable());
+ },
+
+ //
+ // Override the fetchWeatherHourly method to query EC and construct Forecast weather objects
+ //
+ fetchWeatherHourly() {
+ this.fetchData(this.getUrl(), "GET")
+ .then((data) => {
+ if (!data) {
+ // Did not receive usable new data.
+ return;
+ }
+ const hourlyWeather = this.generateWeatherObjectsFromHourly(data);
+
+ this.setWeatherHourly(hourlyWeather);
+ })
+ .catch(function (request) {
+ Log.error("Could not load EnvCanada hourly data ... ", request);
+ })
+ .finally(() => this.updateAvailable());
+ },
+
+ //
+ // Override fetchData function to handle XML document (base function assumes JSON)
+ //
+ 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 () {
+ if (this.readyState === 4) {
+ if (this.status === 200) {
+ resolve(this.responseXML);
+ } else {
+ reject(request);
+ }
+ }
+ };
+ request.send();
+ });
+ },
+
+ //////////////////////////////////////////////////////////////////////////////////
+ //
+ // Environment Canada methods - not part of the standard Provider methods
+ //
+ //////////////////////////////////////////////////////////////////////////////////
+
+ //
+ // Build the EC URL based on the Site Code and Province Code specified in the config parms. Note that the
+ // URL defaults to the Englsih version simply because there is no language dependancy in the data
+ // being accessed. This is only pertinent when using the EC data elements that contain a textual forecast.
+ //
+ // Also note that access is supported through a proxy service (thingproxy.freeboard.io) to mitigate
+ // CORS errors when accessing EC
+ //
+ getUrl() {
+ var path = "https://thingproxy.freeboard.io/fetch/https://dd.weather.gc.ca/citypage_weather/xml/" + this.config.provCode + "/" + this.config.siteCode + "_e.xml";
+
+ return path;
+ },
+
+ //
+ // Generate a WeatherObject based on current EC weather conditions
+ //
+
+ generateWeatherObjectFromCurrentWeather(ECdoc) {
+ const currentWeather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
+
+ // There are instances where EC will update weather data and current temperature will not be
+ // provided. While this is a defect in the EC systems, we need to accommodate to avoid a current temp
+ // of NaN being displayed. Therefore... whenever we get a valid current temp from EC, we will cache
+ // the value. Whenever EC data is missing current temp, we will provide the cached value
+ // instead. This is reasonable since the cached value will typically be accurate within the previous
+ // hour. The only time this does not work as expected is when MM is restarted and the first query to
+ // EC finds no current temp. In this scenario, MM will end up displaying a current temp of null;
+
+ if (ECdoc.querySelector("siteData currentConditions temperature").textContent) {
+ currentWeather.temperature = this.convertTemp(ECdoc.querySelector("siteData currentConditions temperature").textContent);
+ this.cacheCurrentTemp = currentWeather.temperature;
+ } else {
+ currentWeather.temperature = this.cacheCurrentTemp;
+ }
+
+ currentWeather.windSpeed = this.convertWind(ECdoc.querySelector("siteData currentConditions wind speed").textContent);
+
+ currentWeather.windDirection = ECdoc.querySelector("siteData currentConditions wind bearing").textContent;
+
+ currentWeather.humidity = ECdoc.querySelector("siteData currentConditions relativeHumidity").textContent;
+
+ // Ensure showPrecipitationAmount is forced to false. EC does not really provide POP for current day
+ // and this feature for the weather module (current only) is sort of broken in that it wants
+ // to say POP but will display precip as an accumulated amount vs. a percentage.
+
+ this.config.showPrecipitationAmount = false;
+
+ //
+ // If the module config wants to showFeelsLike... default to the current temperature.
+ // Check for EC wind chill and humidex values and overwrite the feelsLikeTemp value.
+ // This assumes that the EC current conditions will never contain both a wind chill
+ // and humidex temperature.
+ //
+
+ if (this.config.showFeelsLike) {
+ currentWeather.feelsLikeTemp = currentWeather.temperature;
+
+ if (ECdoc.querySelector("siteData currentConditions windChill")) {
+ currentWeather.feelsLikeTemp = this.convertTemp(ECdoc.querySelector("siteData currentConditions windChill").textContent);
+ }
+
+ if (ECdoc.querySelector("siteData currentConditions humidex")) {
+ currentWeather.feelsLikeTemp = this.convertTemp(ECdoc.querySelector("siteData currentConditions humidex").textContent);
+ }
+ }
+
+ //
+ // Need to map EC weather icon to MM weatherType values
+ //
+
+ currentWeather.weatherType = this.convertWeatherType(ECdoc.querySelector("siteData currentConditions iconCode").textContent);
+
+ //
+ // Capture the sunrise and sunset values from EC data
+ //
+
+ var sunList = ECdoc.querySelectorAll("siteData riseSet dateTime");
+
+ currentWeather.sunrise = moment(sunList[1].querySelector("timeStamp").textContent, "YYYYMMDDhhmmss");
+ currentWeather.sunset = moment(sunList[3].querySelector("timeStamp").textContent, "YYYYMMDDhhmmss");
+
+ return currentWeather;
+ },
+
+ //
+ // Generate an array of WeatherObjects based on EC weather forecast
+ //
+
+ generateWeatherObjectsFromForecast(ECdoc) {
+ // Declare an array to hold each day's forecast object
+
+ const days = [];
+
+ var weather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
+
+ var foreBaseDates = ECdoc.querySelectorAll("siteData forecastGroup dateTime");
+ var baseDate = foreBaseDates[1].querySelector("timeStamp").textContent;
+
+ weather.date = moment(baseDate, "YYYYMMDDhhmmss");
+
+ var foreGroup = ECdoc.querySelectorAll("siteData forecastGroup forecast");
+
+ // For simplicity, we will only accumulate precipitation and will not try to break out
+ // rain vs snow accumulations
+
+ weather.rain = null;
+ weather.snow = null;
+ weather.precipitation = null;
+
+ //
+ // The EC forecast is held in a 12-element array - Elements 0 to 11 - with each day encompassing
+ // 2 elements. the first element for a day details the Today (daytime) forecast while the second
+ // element details the Tonight (nightime) forecast. Element 0 is always for the current day.
+ //
+ // However... the forecast is somewhat 'rolling'.
+ //
+ // If the EC forecast is queried in the morning, then Element 0 will contain Current
+ // Today and Element 1 will contain Current Tonight. From there, the next 5 days of forecast will be
+ // contained in Elements 2/3, 4/5, 6/7, 8/9, and 10/11. This module will create a 6-day forecast using
+ // all of these Elements.
+ //
+ // But, if the EC forecast is queried in late afternoon, the Current Today forecast will be rolled
+ // off and Element 0 will contain Current Tonight. From there, the next 5 days will be contained in
+ // Elements 1/2, 3/4, 5/6, 7/8, and 9/10. As well, Elelement 11 will contain a forecast for a 6th day,
+ // but only for the Today portion (not Tonight). This module will create a 6-day forecast using
+ // Elements 0 to 11, and will ignore the additional Todat forecast in Element 11.
+ //
+ // We need to determine if Element 0 is showing the forecast for Current Today or Current Tonight.
+ // This is required to understand how Min and Max temperature will be determined, and to understand
+ // where the next day's (aka Tomorrow's) forecast is located in the forecast array.
+ //
+
+ var nextDay = 0;
+ var lastDay = 0;
+ var currentTemp = ECdoc.querySelector("siteData currentConditions temperature").textContent;
+
+ //
+ // If the first Element is Current Today, look at Current Today and Current Tonight for the current day.
+ //
+
+ if (foreGroup[0].querySelector("period[textForecastName='Today']")) {
+ this.todaytempCacheMin = 0;
+ this.todaytempCacheMax = 0;
+ this.todayCached = true;
+
+ this.setMinMaxTemps(weather, foreGroup, 0, true, currentTemp);
+
+ this.setPrecipitation(weather, foreGroup, 0);
+
+ //
+ // Set the Element number that will reflect where the next day's forecast is located. Also set
+ // the Element number where the end of the forecast will be. This is important because of the
+ // rolling nature of the EC forecast. In the current scenario (Today and Tonight are present
+ // in elements 0 and 11, we know that we will have 6 full days of forecasts and we will use
+ // them. We will set lastDay such that we iterate through all 12 elements of the forecast.
+ //
+
+ nextDay = 2;
+ lastDay = 12;
+ }
+
+ //
+ // If the first Element is Current Tonight, look at Tonight only for the current day.
+ //
+ if (foreGroup[0].querySelector("period[textForecastName='Tonight']")) {
+ this.setMinMaxTemps(weather, foreGroup, 0, false, currentTemp);
+
+ this.setPrecipitation(weather, foreGroup, 0);
+
+ //
+ // Set the Element number that will reflect where the next day's forecast is located. Also set
+ // the Element number where the end of the forecast will be. This is important because of the
+ // rolling nature of the EC forecast. In the current scenario (only Current Tonight is present
+ // in Element 0, we know that we will have 6 full days of forecasts PLUS a half-day and
+ // forecast in the final element. Because we will only use full day forecasts, we set the
+ // lastDay number to ensure we ignore that final half-day (in forecast Element 11).
+ //
+
+ nextDay = 1;
+ lastDay = 11;
+ }
+
+ //
+ // Need to map EC weather icon to MM weatherType values. Always pick the first Element's icon to
+ // reflect either Today or Tonight depending on what the forecast is showing in Element 0.
+ //
+
+ weather.weatherType = this.convertWeatherType(foreGroup[0].querySelector("abbreviatedForecast iconCode").textContent);
+
+ // Push the weather object into the forecast array.
+
+ days.push(weather);
+
+ //
+ // Now do the the rest of the forecast starting at nextDay. We will process each day using 2 EC
+ // forecast Elements. This will address the fact that the EC forecast always includes Today and
+ // Tonight for each day. This is why we iterate through the forecast by a a count of 2, with each
+ // iteration looking at the current Element and the next Element.
+ //
+
+ var lastDate = moment(baseDate, "YYYYMMDDhhmmss");
+
+ for (var stepDay = nextDay; stepDay < lastDay; stepDay += 2) {
+ var weather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
+
+ // Add 1 to the date to reflect the current forecast day we are building
+
+ lastDate = lastDate.add(1, "day");
+ weather.date = moment(lastDate, "X");
+
+ // Capture the temperatures for the current Element and the next Element in order to set
+ // the Min and Max temperatures for the forecast
+
+ this.setMinMaxTemps(weather, foreGroup, stepDay, true, currentTemp);
+
+ weather.rain = null;
+ weather.snow = null;
+ weather.precipitation = null;
+
+ this.setPrecipitation(weather, foreGroup, stepDay);
+
+ //
+ // Need to map EC weather icon to MM weatherType values. Always pick the first Element icon.
+ //
+
+ weather.weatherType = this.convertWeatherType(foreGroup[stepDay].querySelector("abbreviatedForecast iconCode").textContent);
+
+ // Push the weather object into the forecast array.
+
+ days.push(weather);
+ }
+
+ return days;
+ },
+
+ //
+ // Generate an array of WeatherObjects based on EC hourly weather forecast
+ //
+
+ generateWeatherObjectsFromHourly(ECdoc) {
+ // Declare an array to hold each hour's forecast object
+
+ const hours = [];
+
+ // Get local timezone UTC offset so that each hourly time can be calculated properly
+
+ var baseHours = ECdoc.querySelectorAll("siteData hourlyForecastGroup dateTime");
+ var hourOffset = baseHours[1].getAttribute("UTCOffset");
+
+ //
+ // The EC hourly forecast is held in a 24-element array - Elements 0 to 23 - with Element 0 holding
+ // the forecast for the next 'on the hour' timeslot. This means the array is a rolling 24 hours.
+ //
+
+ var hourGroup = ECdoc.querySelectorAll("siteData hourlyForecastGroup hourlyForecast");
+
+ for (var stepHour = 0; stepHour < 24; stepHour += 1) {
+ var weather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
+
+ // Determine local time by applying UTC offset to the forecast timestamp
+
+ var foreTime = moment(hourGroup[stepHour].getAttribute("dateTimeUTC"), "YYYYMMDDhhmmss");
+ var currTime = foreTime.add(hourOffset, "hours");
+ weather.date = moment(currTime, "X");
+
+ // Capture the temperature
+
+ weather.temperature = this.convertTemp(hourGroup[stepHour].querySelector("temperature").textContent);
+
+ // Capture Likelihood of Precipitation (LOP) and unit-of-measure values
+
+ var precipLOP = hourGroup[stepHour].querySelector("lop").textContent * 1.0;
+
+ if (precipLOP > 0) {
+ weather.precipitation = precipLOP;
+ weather.precipitationUnits = hourGroup[stepHour].querySelector("lop").getAttribute("units");
+ }
+
+ //
+ // Need to map EC weather icon to MM weatherType values. Always pick the first Element icon.
+ //
+
+ weather.weatherType = this.convertWeatherType(hourGroup[stepHour].querySelector("iconCode").textContent);
+
+ // Push the weather object into the forecast array.
+
+ hours.push(weather);
+ }
+
+ return hours;
+ },
+ //
+ // Determine Min and Max temp based on a supplied Forecast Element index and a boolen that denotes if
+ // the next Forecast element should be considered - i.e. look at Today *and* Tonight vs.Tonight-only
+ //
+
+ setMinMaxTemps(weather, foreGroup, today, fullDay, currentTemp) {
+ var todayTemp = foreGroup[today].querySelector("temperatures temperature").textContent;
+
+ var todayClass = foreGroup[today].querySelector("temperatures temperature").getAttribute("class");
+
+ //
+ // The following logic is largely aimed at accommodating the Current day's forecast whereby we
+ // can have either Current Today+Current Tonight or only Current Tonight.
+ //
+ // If fullDay is false, then we only have Tonight for the current day's forecast - meaning we have
+ // lost a min or max temp value for the day. Therefore, we will see if we were able to cache the the
+ // Today forecast for the current day. If we have, we will use them. If we do not have the cached values,
+ // it means that MM or the Computer has been restarted since the time EC rolled off Today from the
+ // forecast. In this scenario, we will simply default to the Current Conditions temperature and then
+ // check the Tonight temperature.
+ //
+
+ if (fullDay === false) {
+ if (this.todayCached === true) {
+ weather.minTemperature = this.todayTempCacheMin;
+ weather.maxTemperature = this.todayTempCacheMax;
+ } else {
+ weather.minTemperature = this.convertTemp(currentTemp);
+ weather.maxTemperature = weather.minTemperature;
+ }
+ }
+
+ //
+ // We will check to see if the current Element's temperature is Low or High and set weather values
+ // accordingly. We will also check the condition where fullDay is true *and* we are looking at forecast
+ // element 0. This is a special case where we will cache temperature values so that we have them later
+ // in the current day when the Current Today element rolls off and we have Current Tonight only.
+ //
+
+ if (todayClass === "low") {
+ weather.minTemperature = this.convertTemp(todayTemp);
+ if (today === 0 && fullDay === true) {
+ this.todayTempCacheMin = weather.minTemperature;
+ }
+ }
+
+ if (todayClass === "high") {
+ weather.maxTemperature = this.convertTemp(todayTemp);
+ if (today === 0 && fullDay === true) {
+ this.todayTempCacheMax = weather.maxTemperature;
+ }
+ }
+
+ var nextTemp = foreGroup[today + 1].querySelector("temperatures temperature").textContent;
+
+ var nextClass = foreGroup[today + 1].querySelector("temperatures temperature").getAttribute("class");
+
+ if (fullDay === true) {
+ if (nextClass === "low") {
+ weather.minTemperature = this.convertTemp(nextTemp);
+ }
+
+ if (nextClass === "high") {
+ weather.maxTemperature = this.convertTemp(nextTemp);
+ }
+ }
+
+ return;
+ },
+
+ //
+ // Check for a Precipitation forecast. EC can provide a forecast in 2 ways: either an accumulation figure
+ // or a POP percentage. If there is a POP, then that is what the module will show. If there is an accumulation,
+ // then it will be displayed ONLY if no POP is present.
+ //
+ // POP Logic: By default, we want to show the POP for 'daytime' since we are presuming that is what
+ // people are more interested in seeing. While EC provides a separate POP for daytime and nightime portions
+ // of each day, the weather module does not really allow for that view of a daily forecast. There we will
+ // ignore any nightime portion. There is an exception however! For the Current day, the EC data will only show
+ // the nightime forecast after a certain point in the afternoon. As such, we will be showing the nightime POP
+ // (if one exists) in that specific scenario.
+ //
+ // Accumulation Logic: Similar to POP, we want to show accumulation for 'daytime' since we presume that is what
+ // people are interested in seeing. While EC provides a separate accumulation for daytime and nightime portions
+ // of each day, the weather module does not really allow for that view of a daily forecast. There we will
+ // ignore any nightime portion. There is an exception however! For the Current day, the EC data will only show
+ // the nightime forecast after a certain point in that specific scenario.
+ //
+
+ setPrecipitation(weather, foreGroup, today) {
+ if (foreGroup[today].querySelector("precipitation accumulation")) {
+ weather.precipitationUnits = foreGroup[today].querySelector("precipitation accumulation amount").getAttribute("units");
+
+ weather.precipitation = foreGroup[today].querySelector("precipitation accumulation amount").textContent * 1.0;
+ }
+
+ // Check Today element for POP
+
+ if (foreGroup[today].querySelector("abbreviatedForecast pop").textContent > 0) {
+ weather.precipitation = foreGroup[today].querySelector("abbreviatedForecast pop").textContent;
+ weather.precipitationUnits = foreGroup[today].querySelector("abbreviatedForecast pop").getAttribute("units");
+ }
+
+ return;
+ },
+
+ //
+ // Unit conversions
+ //
+ //
+ // Convert C to F temps
+ //
+ convertTemp(temp) {
+ if (this.config.tempUnits === "imperial") {
+ return 1.8 * temp + 32;
+ } else {
+ return temp;
+ }
+ },
+ //
+ // Convert km/h to mph
+ //
+ convertWind(kilo) {
+ if (this.config.windUnits === "imperial") {
+ return kilo / 1.609344;
+ } else {
+ return kilo;
+ }
+ },
+ //
+ // Convert cm or mm to inches
+ //
+ convertPrecipAmt(amt, units) {
+ if (this.config.units === "imperial") {
+ if (units === "cm") {
+ return amt * 0.394;
+ }
+ if (units === "mm") {
+ return amt * 0.0394;
+ }
+ } else {
+ return amt;
+ }
+ },
+
+ //
+ // Convert ensure precip units accurately reflect configured units
+ //
+ convertPrecipUnits(units) {
+ if (this.config.units === "imperial") {
+ return null;
+ } else {
+ return " " + units;
+ }
+ },
+
+ //
+ // Convert the icons to a more usable name.
+ //
+ convertWeatherType(weatherType) {
+ const weatherTypes = {
+ "00": "day-sunny",
+ "01": "day-sunny",
+ "02": "day-sunny-overcast",
+ "03": "day-cloudy",
+ "04": "day-cloudy",
+ "05": "day-cloudy",
+ "06": "day-sprinkle",
+ "07": "day-showers",
+ "08": "day-snow",
+ "09": "day-thunderstorm",
+ 10: "cloud",
+ 11: "showers",
+ 12: "rain",
+ 13: "rain",
+ 14: "sleet",
+ 15: "sleet",
+ 16: "snow",
+ 17: "snow",
+ 18: "snow",
+ 19: "thunderstorm",
+ 20: "cloudy",
+ 21: "cloudy",
+ 22: "day-cloudy",
+ 23: "day-haze",
+ 24: "fog",
+ 25: "snow-wind",
+ 26: "sleet",
+ 27: "sleet",
+ 28: "rain",
+ 29: "na",
+ 30: "night-clear",
+ 31: "night-clear",
+ 32: "night-partly-cloudy",
+ 33: "night-alt-cloudy",
+ 34: "night-alt-cloudy",
+ 35: "night-partly-cloudy",
+ 36: "night-alt-showers",
+ 37: "night-rain-mix",
+ 38: "night-alt-snow",
+ 39: "night-thunderstorm",
+ 40: "snow-wind",
+ 41: "tornado",
+ 42: "tornado",
+ 43: "windy",
+ 44: "smoke",
+ 45: "sandstorm",
+ 46: "thunderstorm",
+ 47: "thunderstorm",
+ 48: "tornado"
+ };
+
+ return weatherTypes.hasOwnProperty(weatherType) ? weatherTypes[weatherType] : null;
+ }
+});
diff --git a/modules/default/weather/providers/smhi.js b/modules/default/weather/providers/smhi.js
index a27b1300..efcf8bb0 100644
--- a/modules/default/weather/providers/smhi.js
+++ b/modules/default/weather/providers/smhi.js
@@ -74,7 +74,7 @@ WeatherProvider.register("smhi", {
getClosestToCurrentTime(times) {
let now = moment();
let minDiff = undefined;
- for (time of times) {
+ for (const time of times) {
let diff = Math.abs(moment(time.validTime).diff(now));
if (!minDiff || diff < Math.abs(moment(minDiff.validTime).diff(now))) {
minDiff = time;
@@ -149,13 +149,13 @@ WeatherProvider.register("smhi", {
* @param coordinates
*/
convertWeatherDataGroupedByDay(allWeatherData, coordinates) {
- var currentWeather;
+ let currentWeather;
let result = [];
let allWeatherObjects = this.fillInGaps(allWeatherData).map((weatherData) => this.convertWeatherDataToObject(weatherData, coordinates));
- var dayWeatherTypes = [];
+ let dayWeatherTypes = [];
- for (weatherObject of allWeatherObjects) {
+ for (const weatherObject of allWeatherObjects) {
//If its the first object or if a day change we need to reset the summary object
if (!currentWeather || !currentWeather.date.isSame(weatherObject.date, "day")) {
currentWeather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
@@ -216,12 +216,12 @@ WeatherProvider.register("smhi", {
*/
fillInGaps(data) {
let result = [];
- for (var i = 1; i < data.length; i++) {
+ for (const i = 1; i < data.length; i++) {
let to = moment(data[i].validTime);
let from = moment(data[i - 1].validTime);
let hours = moment.duration(to.diff(from)).asHours();
// For each hour add a datapoint but change the validTime
- for (var j = 0; j < hours; j++) {
+ for (const j = 0; j < hours; j++) {
let current = Object.assign({}, data[i]);
current.validTime = from.clone().add(j, "hours").toISOString();
result.push(current);
diff --git a/modules/default/weather/providers/ukmetoffice.js b/modules/default/weather/providers/ukmetoffice.js
index 11cee48f..27127806 100755
--- a/modules/default/weather/providers/ukmetoffice.js
+++ b/modules/default/weather/providers/ukmetoffice.js
@@ -81,6 +81,7 @@ WeatherProvider.register("ukmetoffice", {
*/
generateWeatherObjectFromCurrentWeather(currentWeatherData) {
const currentWeather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits, this.config.useKmh);
+ const location = currentWeatherData.SiteRep.DV.Location;
// data times are always UTC
let nowUtc = moment.utc();
@@ -88,8 +89,8 @@ WeatherProvider.register("ukmetoffice", {
let timeInMins = nowUtc.diff(midnightUtc, "minutes");
// loop round each of the (5) periods, look for today (the first period may be yesterday)
- 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");
+ for (const period of location.Period) {
+ const periodDate = moment.utc(period.value.substr(0, 10), "YYYY-MM-DD");
// ignore if period is before today
if (periodDate.isSameOrAfter(moment.utc().startOf("day"))) {
@@ -97,17 +98,17 @@ WeatherProvider.register("ukmetoffice", {
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 (var j in currentWeatherData.SiteRep.DV.Location.Period[i].Rep) {
- let p = currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].$;
+ for (const rep of period.Rep) {
+ const p = rep.$;
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);
- currentWeather.feelsLikeTemp = this.convertTemp(currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].F);
- currentWeather.precipitation = parseInt(currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].Pp);
- currentWeather.windSpeed = this.convertWindSpeed(currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].S);
- currentWeather.windDirection = this.convertWindDirection(currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].D);
- currentWeather.weatherType = this.convertWeatherType(currentWeatherData.SiteRep.DV.Location.Period[i].Rep[j].W);
+ currentWeather.humidity = rep.H;
+ currentWeather.temperature = this.convertTemp(rep.T);
+ currentWeather.feelsLikeTemp = this.convertTemp(rep.F);
+ currentWeather.precipitation = parseInt(rep.Pp);
+ currentWeather.windSpeed = this.convertWindSpeed(rep.S);
+ currentWeather.windDirection = this.convertWindDirection(rep.D);
+ currentWeather.weatherType = this.convertWeatherType(rep.W);
}
}
}
@@ -115,7 +116,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(location);
currentWeather.sunrise = times[0];
currentWeather.sunset = times[1];
@@ -130,21 +131,21 @@ WeatherProvider.register("ukmetoffice", {
// loop round the (5) periods getting the data
// for each period array, Day is [0], Night is [1]
- for (var j in forecasts.SiteRep.DV.Location.Period) {
+ for (const period of forecasts.SiteRep.DV.Location.Period) {
const weather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits, this.config.useKmh);
// data times are always UTC
- const dateStr = forecasts.SiteRep.DV.Location.Period[j].value;
+ const dateStr = period.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.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);
- weather.precipitation = parseInt(forecasts.SiteRep.DV.Location.Period[j].Rep[0].PPd);
+ weather.minTemperature = this.convertTemp(period.Rep[1].Nm);
+ weather.maxTemperature = this.convertTemp(period.Rep[0].Dm);
+ weather.weatherType = this.convertWeatherType(period.Rep[0].W);
+ weather.precipitation = parseInt(period.Rep[0].PPd);
days.push(weather);
}
diff --git a/modules/default/weather/providers/ukmetofficedatahub.js b/modules/default/weather/providers/ukmetofficedatahub.js
index 03e5fa5a..d096c33b 100644
--- a/modules/default/weather/providers/ukmetofficedatahub.js
+++ b/modules/default/weather/providers/ukmetofficedatahub.js
@@ -59,9 +59,7 @@ WeatherProvider.register("ukmetofficedatahub", {
let queryStrings = "?";
queryStrings += "latitude=" + this.config.lat;
queryStrings += "&longitude=" + this.config.lon;
- if (this.config.appendLocationNameToHeader) {
- queryStrings += "&includeLocationName=" + true;
- }
+ queryStrings += "&includeLocationName=" + true;
// Return URL, making sure there is a trailing "/" in the base URL.
return this.config.apiBase + (this.config.apiBase.endsWith("/") ? "" : "/") + forecastType + queryStrings;
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 50c73031..3386277c 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -33,6 +33,7 @@ Module.register("weather", {
showIndoorHumidity: false,
maxNumberOfDays: 5,
maxEntries: 5,
+ ignoreToday: false,
fade: true,
fadePoint: 0.25, // Start on 1/4th of the list.
initialLoadDelay: 0, // 0 seconds delay
@@ -48,6 +49,9 @@ Module.register("weather", {
// Module properties.
weatherProvider: null,
+ // Can be used by the provider to display location of event if nothing else is specified
+ firstEvent: null,
+
// Define required scripts.
getStyles: function () {
return ["font-awesome.css", "weather-icons.css", "weather.css"];
@@ -88,15 +92,13 @@ Module.register("weather", {
// Override notification handler.
notificationReceived: function (notification, payload, sender) {
if (notification === "CALENDAR_EVENTS") {
- var senderClasses = sender.data.classes.toLowerCase().split(" ");
+ const senderClasses = sender.data.classes.toLowerCase().split(" ");
if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) {
- this.firstEvent = false;
-
- for (var e in payload) {
- var event = payload[e];
+ this.firstEvent = null;
+ for (let event of payload) {
if (event.location || event.geo) {
this.firstEvent = event;
- //Log.log("First upcoming event with location: ", event);
+ Log.debug("First upcoming event with location: ", event);
break;
}
}
@@ -114,24 +116,30 @@ Module.register("weather", {
getTemplate: function () {
switch (this.config.type.toLowerCase()) {
case "current":
- return `current.njk`;
+ return "current.njk";
case "hourly":
- return `hourly.njk`;
+ return "hourly.njk";
case "daily":
case "forecast":
- return `forecast.njk`;
+ return "forecast.njk";
//Make the invalid values use the "Loading..." from forecast
default:
- return `forecast.njk`;
+ return "forecast.njk";
}
},
// Add all the data to the template.
getTemplateData: function () {
+ const forecast = this.weatherProvider.weatherForecast();
+
+ if (this.config.ignoreToday) {
+ forecast.splice(0, 1);
+ }
+
return {
config: this.config,
current: this.weatherProvider.currentWeather(),
- forecast: this.weatherProvider.weatherForecast(),
+ forecast: forecast,
hourly: this.weatherProvider.weatherHourly(),
indoor: {
humidity: this.indoorHumidity,
@@ -152,7 +160,7 @@ Module.register("weather", {
},
scheduleUpdate: function (delay = null) {
- var nextLoad = this.config.updateInterval;
+ let nextLoad = this.config.updateInterval;
if (delay !== null && delay >= 0) {
nextLoad = delay;
}
@@ -176,8 +184,8 @@ Module.register("weather", {
},
roundValue: function (temperature) {
- var decimals = this.config.roundTemp ? 0 : 1;
- var roundValue = parseFloat(temperature).toFixed(decimals);
+ const decimals = this.config.roundTemp ? 0 : 1;
+ const roundValue = parseFloat(temperature).toFixed(decimals);
return roundValue === "-0" ? 0 : roundValue;
},
@@ -272,8 +280,8 @@ Module.register("weather", {
if (this.config.fadePoint < 0) {
this.config.fadePoint = 0;
}
- var startingPoint = numSteps * this.config.fadePoint;
- var numFadesteps = numSteps - startingPoint;
+ const startingPoint = numSteps * this.config.fadePoint;
+ const numFadesteps = numSteps - startingPoint;
if (currentStep >= startingPoint) {
return 1 - (currentStep - startingPoint) / numFadesteps;
} else {
diff --git a/modules/default/weather/weatherobject.js b/modules/default/weather/weatherobject.js
index 3fbbb42a..5bd5be9a 100755
--- a/modules/default/weather/weatherobject.js
+++ b/modules/default/weather/weatherobject.js
@@ -28,6 +28,7 @@ class WeatherObject {
this.rain = null;
this.snow = null;
this.precipitation = null;
+ this.precipitationUnits = null;
this.feelsLikeTemp = null;
}
diff --git a/modules/default/weather/weatherprovider.js b/modules/default/weather/weatherprovider.js
index 87667fd9..c193ef08 100644
--- a/modules/default/weather/weatherprovider.js
+++ b/modules/default/weather/weatherprovider.js
@@ -8,7 +8,7 @@
*
* This class is the blueprint for a weather provider.
*/
-var WeatherProvider = Class.extend({
+const WeatherProvider = Class.extend({
// Weather Provider Properties
providerName: null,
defaults: {},
@@ -114,7 +114,7 @@ var WeatherProvider = Class.extend({
// A convenience function to make requests. It returns a promise.
fetchData: function (url, method = "GET", data = null) {
return new Promise(function (resolve, reject) {
- var request = new XMLHttpRequest();
+ const request = new XMLHttpRequest();
request.open(method, url, true);
request.onreadystatechange = function () {
if (this.readyState === 4) {
diff --git a/package-lock.json b/package-lock.json
index b84201cc..18fd7ba7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "magicmirror",
- "version": "2.15.0",
+ "version": "2.16.0-develop",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -13,31 +13,30 @@
}
},
"@babel/compat-data": {
- "version": "7.13.8",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz",
- "integrity": "sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==",
+ "version": "7.14.0",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.0.tgz",
+ "integrity": "sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==",
"dev": true
},
"@babel/core": {
- "version": "7.13.8",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.8.tgz",
- "integrity": "sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg==",
+ "version": "7.14.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.0.tgz",
+ "integrity": "sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.12.13",
- "@babel/generator": "^7.13.0",
- "@babel/helper-compilation-targets": "^7.13.8",
- "@babel/helper-module-transforms": "^7.13.0",
- "@babel/helpers": "^7.13.0",
- "@babel/parser": "^7.13.4",
+ "@babel/generator": "^7.14.0",
+ "@babel/helper-compilation-targets": "^7.13.16",
+ "@babel/helper-module-transforms": "^7.14.0",
+ "@babel/helpers": "^7.14.0",
+ "@babel/parser": "^7.14.0",
"@babel/template": "^7.12.13",
- "@babel/traverse": "^7.13.0",
- "@babel/types": "^7.13.0",
+ "@babel/traverse": "^7.14.0",
+ "@babel/types": "^7.14.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
"json5": "^2.1.2",
- "lodash": "^4.17.19",
"semver": "^6.3.0",
"source-map": "^0.5.0"
},
@@ -60,12 +59,12 @@
}
},
"@babel/generator": {
- "version": "7.13.9",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
- "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
+ "version": "7.14.1",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.1.tgz",
+ "integrity": "sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==",
"dev": true,
"requires": {
- "@babel/types": "^7.13.0",
+ "@babel/types": "^7.14.1",
"jsesc": "^2.5.1",
"source-map": "^0.5.0"
},
@@ -79,12 +78,12 @@
}
},
"@babel/helper-compilation-targets": {
- "version": "7.13.8",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz",
- "integrity": "sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==",
+ "version": "7.13.16",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz",
+ "integrity": "sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==",
"dev": true,
"requires": {
- "@babel/compat-data": "^7.13.8",
+ "@babel/compat-data": "^7.13.15",
"@babel/helper-validator-option": "^7.12.17",
"browserslist": "^4.14.5",
"semver": "^6.3.0"
@@ -111,38 +110,37 @@
}
},
"@babel/helper-member-expression-to-functions": {
- "version": "7.13.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz",
- "integrity": "sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==",
+ "version": "7.13.12",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+ "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
"dev": true,
"requires": {
- "@babel/types": "^7.13.0"
+ "@babel/types": "^7.13.12"
}
},
"@babel/helper-module-imports": {
- "version": "7.12.13",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
- "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
+ "version": "7.13.12",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+ "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
"dev": true,
"requires": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.13.12"
}
},
"@babel/helper-module-transforms": {
- "version": "7.13.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz",
- "integrity": "sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==",
+ "version": "7.14.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz",
+ "integrity": "sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==",
"dev": true,
"requires": {
- "@babel/helper-module-imports": "^7.12.13",
- "@babel/helper-replace-supers": "^7.13.0",
- "@babel/helper-simple-access": "^7.12.13",
+ "@babel/helper-module-imports": "^7.13.12",
+ "@babel/helper-replace-supers": "^7.13.12",
+ "@babel/helper-simple-access": "^7.13.12",
"@babel/helper-split-export-declaration": "^7.12.13",
- "@babel/helper-validator-identifier": "^7.12.11",
+ "@babel/helper-validator-identifier": "^7.14.0",
"@babel/template": "^7.12.13",
- "@babel/traverse": "^7.13.0",
- "@babel/types": "^7.13.0",
- "lodash": "^4.17.19"
+ "@babel/traverse": "^7.14.0",
+ "@babel/types": "^7.14.0"
}
},
"@babel/helper-optimise-call-expression": {
@@ -155,24 +153,24 @@
}
},
"@babel/helper-replace-supers": {
- "version": "7.13.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz",
- "integrity": "sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==",
+ "version": "7.13.12",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
+ "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
"dev": true,
"requires": {
- "@babel/helper-member-expression-to-functions": "^7.13.0",
+ "@babel/helper-member-expression-to-functions": "^7.13.12",
"@babel/helper-optimise-call-expression": "^7.12.13",
"@babel/traverse": "^7.13.0",
- "@babel/types": "^7.13.0"
+ "@babel/types": "^7.13.12"
}
},
"@babel/helper-simple-access": {
- "version": "7.12.13",
- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
- "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+ "version": "7.13.12",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+ "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
"dev": true,
"requires": {
- "@babel/types": "^7.12.13"
+ "@babel/types": "^7.13.12"
}
},
"@babel/helper-split-export-declaration": {
@@ -185,9 +183,9 @@
}
},
"@babel/helper-validator-identifier": {
- "version": "7.12.11",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
- "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="
+ "version": "7.14.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz",
+ "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A=="
},
"@babel/helper-validator-option": {
"version": "7.12.17",
@@ -196,22 +194,22 @@
"dev": true
},
"@babel/helpers": {
- "version": "7.13.0",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.0.tgz",
- "integrity": "sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ==",
+ "version": "7.14.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.0.tgz",
+ "integrity": "sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==",
"dev": true,
"requires": {
"@babel/template": "^7.12.13",
- "@babel/traverse": "^7.13.0",
- "@babel/types": "^7.13.0"
+ "@babel/traverse": "^7.14.0",
+ "@babel/types": "^7.14.0"
}
},
"@babel/highlight": {
- "version": "7.13.8",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz",
- "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==",
+ "version": "7.14.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.0.tgz",
+ "integrity": "sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==",
"requires": {
- "@babel/helper-validator-identifier": "^7.12.11",
+ "@babel/helper-validator-identifier": "^7.14.0",
"chalk": "^2.0.0",
"js-tokens": "^4.0.0"
},
@@ -268,9 +266,9 @@
}
},
"@babel/parser": {
- "version": "7.13.9",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.9.tgz",
- "integrity": "sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw==",
+ "version": "7.14.1",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.1.tgz",
+ "integrity": "sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==",
"dev": true
},
"@babel/template": {
@@ -296,20 +294,19 @@
}
},
"@babel/traverse": {
- "version": "7.13.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz",
- "integrity": "sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==",
+ "version": "7.14.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.0.tgz",
+ "integrity": "sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.12.13",
- "@babel/generator": "^7.13.0",
+ "@babel/generator": "^7.14.0",
"@babel/helper-function-name": "^7.12.13",
"@babel/helper-split-export-declaration": "^7.12.13",
- "@babel/parser": "^7.13.0",
- "@babel/types": "^7.13.0",
+ "@babel/parser": "^7.14.0",
+ "@babel/types": "^7.14.0",
"debug": "^4.1.0",
- "globals": "^11.1.0",
- "lodash": "^4.17.19"
+ "globals": "^11.1.0"
},
"dependencies": {
"@babel/code-frame": {
@@ -330,13 +327,12 @@
}
},
"@babel/types": {
- "version": "7.13.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz",
- "integrity": "sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==",
+ "version": "7.14.1",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz",
+ "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==",
"dev": true,
"requires": {
- "@babel/helper-validator-identifier": "^7.12.11",
- "lodash": "^4.17.19",
+ "@babel/helper-validator-identifier": "^7.14.0",
"to-fast-properties": "^2.0.0"
}
},
@@ -356,10 +352,21 @@
"sumchecker": "^3.0.1"
}
},
+ "@es-joy/jsdoccomment": {
+ "version": "0.7.2",
+ "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.7.2.tgz",
+ "integrity": "sha512-i5p0VgxeCXbf5aPLPY9s9Fz6K5BkzYdbRCisw/vEY/FXAxUJ8SiAifPwkFUm0CJrmZ8tFBGW8bUtM7wiE4KTIA==",
+ "dev": true,
+ "requires": {
+ "comment-parser": "^1.1.5",
+ "esquery": "^1.4.0",
+ "jsdoctypeparser": "^9.0.0"
+ }
+ },
"@eslint/eslintrc": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
- "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz",
+ "integrity": "sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==",
"requires": {
"ajv": "^6.12.4",
"debug": "^4.1.1",
@@ -502,27 +509,27 @@
"integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
},
"@sinonjs/commons": {
- "version": "1.8.2",
- "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.2.tgz",
- "integrity": "sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw==",
+ "version": "1.8.3",
+ "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+ "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
"dev": true,
"requires": {
"type-detect": "4.0.8"
}
},
"@sinonjs/fake-timers": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
- "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+ "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
"dev": true,
"requires": {
"@sinonjs/commons": "^1.7.0"
}
},
"@sinonjs/samsam": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.3.1.tgz",
- "integrity": "sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz",
+ "integrity": "sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==",
"dev": true,
"requires": {
"@sinonjs/commons": "^1.6.0",
@@ -563,6 +570,12 @@
"defer-to-connect": "^1.0.1"
}
},
+ "@tootallnate/once": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+ "dev": true
+ },
"@types/cacheable-request": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
@@ -615,9 +628,9 @@
}
},
"@types/minimatch": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
- "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==",
"dev": true
},
"@types/minimist": {
@@ -627,9 +640,9 @@
"dev": true
},
"@types/node": {
- "version": "12.20.4",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.4.tgz",
- "integrity": "sha512-xRCgeE0Q4pT5UZ189TJ3SpYuX/QGl6QIAOAIeDSbAVAd2gX1NxSZup4jNVK7cxIeP8KDSbJgcckun495isP1jQ=="
+ "version": "12.20.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.11.tgz",
+ "integrity": "sha512-gema+apZ6qLQK7k7F0dGkGCWQYsL0qqKORWOQO6tq46q+x+1C0vbOiOqOwRVlh4RAdbQwV/j/ryr3u5NOG1fPQ=="
},
"@types/normalize-package-data": {
"version": "2.4.0",
@@ -832,9 +845,9 @@
}
},
"anymatch": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
- "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+ "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
"dev": true,
"requires": {
"normalize-path": "^3.0.0",
@@ -851,9 +864,9 @@
}
},
"archiver": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz",
- "integrity": "sha512-QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ==",
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz",
+ "integrity": "sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg==",
"dev": true,
"requires": {
"archiver-utils": "^2.1.0",
@@ -861,8 +874,8 @@
"buffer-crc32": "^0.2.1",
"readable-stream": "^3.6.0",
"readdir-glob": "^1.0.0",
- "tar-stream": "^2.1.4",
- "zip-stream": "^4.0.4"
+ "tar-stream": "^2.2.0",
+ "zip-stream": "^4.1.0"
},
"dependencies": {
"readable-stream": {
@@ -944,6 +957,7 @@
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+ "dev": true,
"requires": {
"safer-buffer": "~2.1.0"
}
@@ -951,7 +965,8 @@
"assert-plus": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
- "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
},
"assertion-error": {
"version": "1.1.0",
@@ -973,7 +988,8 @@
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
- "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+ "dev": true
},
"at-least-node": {
"version": "1.0.0",
@@ -1005,12 +1021,14 @@
"aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
- "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+ "dev": true
},
"aws4": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
- "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+ "dev": true
},
"bail": {
"version": "1.0.5",
@@ -1019,9 +1037,9 @@
"dev": true
},
"balanced-match": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
},
"base-64": {
"version": "0.1.0",
@@ -1057,6 +1075,7 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "dev": true,
"requires": {
"tweetnacl": "^0.14.3"
}
@@ -1132,9 +1151,9 @@
}
},
"boolean": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz",
- "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==",
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.3.tgz",
+ "integrity": "sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA==",
"optional": true
},
"brace-expansion": {
@@ -1168,16 +1187,16 @@
"dev": true
},
"browserslist": {
- "version": "4.16.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
- "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+ "version": "4.16.6",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+ "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
"dev": true,
"requires": {
- "caniuse-lite": "^1.0.30001181",
- "colorette": "^1.2.1",
- "electron-to-chromium": "^1.3.649",
+ "caniuse-lite": "^1.0.30001219",
+ "colorette": "^1.2.2",
+ "electron-to-chromium": "^1.3.723",
"escalade": "^3.1.1",
- "node-releases": "^1.1.70"
+ "node-releases": "^1.1.71"
}
},
"buffer": {
@@ -1290,15 +1309,16 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001196",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001196.tgz",
- "integrity": "sha512-CPvObjD3ovWrNBaXlAIGWmg2gQQuJ5YhuciUOjPRox6hIQttu8O+b51dx6VIpIY9ESd2d0Vac1RKpICdG4rGUg==",
+ "version": "1.0.30001221",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001221.tgz",
+ "integrity": "sha512-b9TOZfND3uGSLjMOrLh8XxSQ41x8mX+9MLJYDM4AAHLfaZHttrLNPrScWjVnBITRZbY5sPpCt7X85n7VSLZ+/g==",
"dev": true
},
"caseless": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
- "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+ "dev": true
},
"chai": {
"version": "4.3.4",
@@ -1324,9 +1344,9 @@
}
},
"chalk": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
- "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+ "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -1350,6 +1370,11 @@
"integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
"dev": true
},
+ "charenc": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+ "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+ },
"check-error": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@@ -1400,12 +1425,6 @@
}
}
},
- "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",
@@ -1473,14 +1492,15 @@
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "dev": true,
"requires": {
"delayed-stream": "~1.0.0"
}
},
"comment-parser": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.2.tgz",
- "integrity": "sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ==",
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz",
+ "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==",
"dev": true
},
"commondir": {
@@ -1489,12 +1509,6 @@
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
"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-emitter": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
@@ -1553,12 +1567,12 @@
}
},
"console-stamp": {
- "version": "3.0.0-rc4.3",
- "resolved": "https://registry.npmjs.org/console-stamp/-/console-stamp-3.0.0-rc4.3.tgz",
- "integrity": "sha512-NE9IGO0q+gVReZqX+ArFZOKCVPIOIef6huPNxlvsjYahHL9rVYuBUBkK0hLOlW90jH2Y2yo/Ubm2vDNym37WBw==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/console-stamp/-/console-stamp-3.0.2.tgz",
+ "integrity": "sha512-nYIxVrp1Cau8wRy8RQJO1VNBTYQPnFcN7SrsLAStSavo38Y4+jcysh5n4nZNd/WkR2IOULgwr2+6qDxMUA7Hog==",
"requires": {
"chalk": "^4.1.0",
- "dateformat": "^4.0.0"
+ "dateformat": "^4.5.1"
}
},
"content-disposition": {
@@ -1594,9 +1608,9 @@
"integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
},
"core-js": {
- "version": "3.9.1",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz",
- "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==",
+ "version": "3.11.2",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.11.2.tgz",
+ "integrity": "sha512-3tfrrO1JpJSYGKnd9LKTBPqgUES/UYiCzMKeqwR1+jF16q4kD1BY2NvqkfuzXwQ6+CIWm55V9cjD7PQd+hijdw==",
"optional": true
},
"core-util-is": {
@@ -1669,10 +1683,10 @@
"which": "^2.0.1"
}
},
- "crypto-js": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
- "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
+ "crypt": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+ "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
},
"css-shorthand-properties": {
"version": "1.1.1",
@@ -1719,6 +1733,7 @@
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "dev": true,
"requires": {
"assert-plus": "^1.0.0"
}
@@ -1837,7 +1852,8 @@
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
- "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+ "dev": true
},
"depd": {
"version": "1.1.2",
@@ -1850,9 +1866,9 @@
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
},
"detect-node": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
- "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz",
+ "integrity": "sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==",
"optional": true
},
"dev-null": {
@@ -1891,12 +1907,12 @@
"dev": true
},
"digest-fetch": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/digest-fetch/-/digest-fetch-1.1.6.tgz",
- "integrity": "sha512-CFNX4+TkxecH2L2bw6tI9RAJ7xQuE3j/fDxZe6HOyazR5lhGhF76Pxhb0/Lam3vtGsZPop3RMXydWsNZ//TJwA==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/digest-fetch/-/digest-fetch-1.2.0.tgz",
+ "integrity": "sha512-DSbWN+dPXH+9A/aqmGnpI40cVKzJRgL4iDm1eGpsZ1MpW3tXQuBJN5xNY3PEqUx3QjkQIPyD99ypClHr9fW9Ow==",
"requires": {
"base-64": "^0.1.0",
- "crypto-js": "^3.1.9-1"
+ "md5": "^2.3.0"
}
},
"dir-glob": {
@@ -1927,9 +1943,9 @@
},
"dependencies": {
"domelementtype": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
- "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+ "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
"dev": true
},
"entities": {
@@ -1991,6 +2007,7 @@
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+ "dev": true,
"requires": {
"jsbn": "~0.1.0",
"safer-buffer": "^2.1.0"
@@ -2012,9 +2029,9 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"electron": {
- "version": "11.3.0",
- "resolved": "https://registry.npmjs.org/electron/-/electron-11.3.0.tgz",
- "integrity": "sha512-MhdS0gok3wZBTscLBbYrOhLaQybCSAfkupazbK1dMP5c+84eVMxJE/QGohiWQkzs0tVFIJsAHyN19YKPbelNrQ==",
+ "version": "11.4.7",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-11.4.7.tgz",
+ "integrity": "sha512-ZObBEsLrD1mIjF15tClcyDsOisOmwpE/+EcZNhBmB5N2WBjskhQHkFczNEOSTTzQ9w0kSWQUPQjLbmKQ3fD/NQ==",
"optional": true,
"requires": {
"@electron/get": "^1.0.1",
@@ -2056,9 +2073,9 @@
}
},
"electron-to-chromium": {
- "version": "1.3.681",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.681.tgz",
- "integrity": "sha512-W6uYvSUTHuyX2DZklIESAqx57jfmGjUkd7Z3RWqLdj9Mmt39ylhBuvFXlskQnvBHj0MYXIeQI+mjiwVddZLSvA==",
+ "version": "1.3.726",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.726.tgz",
+ "integrity": "sha512-dw7WmrSu/JwtACiBzth8cuKf62NKL1xVJuNvyOg0jvruN/n4NLtGYoTzciQquCPNaS2eR+BT5GrxHbslfc/w1w==",
"dev": true
},
"emoji-regex": {
@@ -2080,9 +2097,9 @@
}
},
"engine.io": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-5.0.0.tgz",
- "integrity": "sha512-BATIdDV3H1SrE9/u2BAotvsmjJg0t1P4+vGedImSs1lkFAtQdvk4Ev1y4LDiPF7BPWgXWEG+NDY+nLvW3UrMWw==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz",
+ "integrity": "sha512-aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w==",
"requires": {
"accepts": "~1.3.4",
"base64id": "2.0.0",
@@ -2123,9 +2140,9 @@
"dev": true
},
"env-paths": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
- "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA=="
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
},
"error-ex": {
"version": "1.3.2",
@@ -2218,24 +2235,26 @@
}
},
"eslint": {
- "version": "7.23.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.23.0.tgz",
- "integrity": "sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==",
+ "version": "7.27.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz",
+ "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==",
"requires": {
"@babel/code-frame": "7.12.11",
- "@eslint/eslintrc": "^0.4.0",
+ "@eslint/eslintrc": "^0.4.1",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
"debug": "^4.0.1",
"doctrine": "^3.0.0",
"enquirer": "^2.3.5",
+ "escape-string-regexp": "^4.0.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^2.1.0",
"eslint-visitor-keys": "^2.0.0",
"espree": "^7.3.1",
"esquery": "^1.4.0",
"esutils": "^2.0.2",
+ "fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
"functional-red-black-tree": "^1.0.1",
"glob-parent": "^5.0.0",
@@ -2247,7 +2266,7 @@
"js-yaml": "^3.13.1",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
- "lodash": "^4.17.21",
+ "lodash.merge": "^4.6.2",
"minimatch": "^3.0.4",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
@@ -2256,7 +2275,7 @@
"semver": "^7.2.1",
"strip-ansi": "^6.0.0",
"strip-json-comments": "^3.1.0",
- "table": "^6.0.4",
+ "table": "^6.0.9",
"text-table": "^0.2.0",
"v8-compile-cache": "^2.0.3"
},
@@ -2272,30 +2291,32 @@
}
},
"eslint-config-prettier": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz",
- "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
+ "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
"dev": true
},
"eslint-plugin-jsdoc": {
- "version": "32.3.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-32.3.0.tgz",
- "integrity": "sha512-zyx7kajDK+tqS1bHuY5sapkad8P8KT0vdd/lE55j47VPG2MeenSYuIY/M/Pvmzq5g0+3JB+P3BJGUXmHxtuKPQ==",
+ "version": "35.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.0.0.tgz",
+ "integrity": "sha512-n92EO6g84qzjF4Lyvg+hDouMQTRHCKvW0hRobGRza0aqbG9fmmlS4p1x8cvPPAc0P87TmahMZnrP0F7hPOcAoQ==",
"dev": true,
"requires": {
- "comment-parser": "1.1.2",
+ "@es-joy/jsdoccomment": "^0.7.2",
+ "comment-parser": "1.1.5",
"debug": "^4.3.1",
+ "esquery": "^1.4.0",
"jsdoctypeparser": "^9.0.0",
- "lodash": "^4.17.20",
+ "lodash": "^4.17.21",
"regextras": "^0.7.1",
- "semver": "^7.3.4",
+ "semver": "^7.3.5",
"spdx-expression-parse": "^3.0.1"
},
"dependencies": {
"semver": {
- "version": "7.3.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
- "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+ "version": "7.3.5",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -2304,9 +2325,9 @@
}
},
"eslint-plugin-prettier": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz",
- "integrity": "sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz",
+ "integrity": "sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==",
"dev": true,
"requires": {
"prettier-linter-helpers": "^1.0.0"
@@ -2337,9 +2358,9 @@
}
},
"eslint-visitor-keys": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
- "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
},
"espree": {
"version": "7.3.1",
@@ -2513,9 +2534,9 @@
}
},
"express-ipfilter": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/express-ipfilter/-/express-ipfilter-1.1.2.tgz",
- "integrity": "sha512-dm1G3sVxlSbcOWSxfUTCo20ySyNQXJ4hJD5fuQJFoZlhkQvpbuDGBlh8AbFm1GwX85EWvfyhekOkvcydaXkBkg==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/express-ipfilter/-/express-ipfilter-1.2.0.tgz",
+ "integrity": "sha512-nPXKMuhqVjX7+Vny4XsrpdqlX4YAGcanE0gh5xzpfmNTsINGAgPnpk67kb0No3p1m4vGQQLU6hdaXRxsuGNlTA==",
"requires": {
"ip": "~1.1.0",
"lodash": "^4.17.11",
@@ -2526,7 +2547,8 @@
"extend": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
- "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+ "dev": true
},
"extract-zip": {
"version": "1.7.0",
@@ -2560,7 +2582,8 @@
"extsprintf": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
- "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+ "dev": true
},
"fast-deep-equal": {
"version": "3.1.3",
@@ -2744,15 +2767,6 @@
"path-exists": "^4.0.0"
}
},
- "find-versions": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz",
- "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==",
- "dev": true,
- "requires": {
- "semver-regex": "^3.1.2"
- }
- },
"flat": {
"version": "5.0.2",
"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
@@ -2786,12 +2800,14 @@
"forever-agent": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
- "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "dev": true
},
"form-data": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "dev": true,
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.6",
@@ -2901,6 +2917,7 @@
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "dev": true,
"requires": {
"assert-plus": "^1.0.0"
}
@@ -2919,17 +2936,17 @@
}
},
"glob-parent": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
- "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
"requires": {
"is-glob": "^4.0.1"
}
},
"global-agent": {
- "version": "2.1.12",
- "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.12.tgz",
- "integrity": "sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.2.0.tgz",
+ "integrity": "sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg==",
"optional": true,
"requires": {
"boolean": "^3.0.1",
@@ -2942,9 +2959,9 @@
},
"dependencies": {
"semver": {
- "version": "7.3.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
- "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+ "version": "7.3.5",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
"optional": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -2996,9 +3013,9 @@
}
},
"globals": {
- "version": "13.7.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.7.0.tgz",
- "integrity": "sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==",
+ "version": "13.9.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
+ "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
"requires": {
"type-fest": "^0.20.2"
},
@@ -3020,9 +3037,9 @@
}
},
"globby": {
- "version": "11.0.2",
- "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz",
- "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==",
+ "version": "11.0.3",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
+ "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
"dev": true,
"requires": {
"array-union": "^2.1.0",
@@ -3094,12 +3111,14 @@
"har-schema": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
- "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+ "dev": true
},
"har-validator": {
"version": "5.1.5",
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+ "dev": true,
"requires": {
"ajv": "^6.12.3",
"har-schema": "^2.0.0"
@@ -3150,14 +3169,14 @@
"dev": true
},
"helmet": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.4.1.tgz",
- "integrity": "sha512-G8tp0wUMI7i8wkMk2xLcEvESg5PiCitFMYgGRc/PwULB0RVhTP5GFdxOwvJwp9XVha8CuS8mnhmE8I/8dx/pbw=="
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz",
+ "integrity": "sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg=="
},
"hosted-git-info": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.0.tgz",
- "integrity": "sha512-fqhGdjk4av7mT9fU/B01dUtZ+WZSc/XEXMoLXDVZukiQRXxeHSSz3AqbeWRJHtF8EQYHlAgB1NSAHU0Cm7aqZA==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+ "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -3235,10 +3254,33 @@
}
}
},
+ "http-proxy-agent": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+ "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+ "dev": true,
+ "requires": {
+ "@tootallnate/once": "1",
+ "agent-base": "6",
+ "debug": "4"
+ },
+ "dependencies": {
+ "agent-base": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+ "dev": true,
+ "requires": {
+ "debug": "4"
+ }
+ }
+ }
+ },
"http-signature": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "dev": true,
"requires": {
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
@@ -3272,27 +3314,15 @@
"dev": true
},
"husky": {
- "version": "4.3.8",
- "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.8.tgz",
- "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==",
- "dev": true,
- "requires": {
- "chalk": "^4.0.0",
- "ci-info": "^2.0.0",
- "compare-versions": "^3.6.0",
- "cosmiconfig": "^7.0.0",
- "find-versions": "^4.0.0",
- "opencollective-postinstall": "^2.0.2",
- "pkg-dir": "^5.0.0",
- "please-upgrade-node": "^3.2.0",
- "slash": "^3.0.0",
- "which-pm-runs": "^1.0.0"
- }
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz",
+ "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==",
+ "dev": true
},
"iconv-lite": {
- "version": "0.6.2",
- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
- "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
"requires": {
"safer-buffer": ">= 2.1.2 < 3.0.0"
}
@@ -3334,12 +3364,6 @@
"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
"dev": true
},
- "indexes-of": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
- "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
- "dev": true
- },
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -3412,9 +3436,9 @@
"dev": true
},
"is-core-module": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
- "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz",
+ "integrity": "sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==",
"dev": true,
"requires": {
"has": "^1.0.3"
@@ -3427,9 +3451,9 @@
"dev": true
},
"is-docker": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
- "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
"dev": true
},
"is-extglob": {
@@ -3469,9 +3493,9 @@
"dev": true
},
"is-potential-custom-element-name": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz",
- "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+ "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
"dev": true
},
"is-regexp": {
@@ -3489,7 +3513,14 @@
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
- "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+ "dev": true
+ },
+ "is-unicode-supported": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+ "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+ "dev": true
},
"is-windows": {
"version": "1.0.2",
@@ -3519,7 +3550,8 @@
"isstream": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
- "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+ "dev": true
},
"istanbul-lib-coverage": {
"version": "3.0.0",
@@ -3620,7 +3652,8 @@
"jsbn": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
- "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+ "dev": true
},
"jsdoctypeparser": {
"version": "9.0.0",
@@ -3629,13 +3662,13 @@
"dev": true
},
"jsdom": {
- "version": "16.5.1",
- "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.1.tgz",
- "integrity": "sha512-pF73EOsJgwZekbDHEY5VO/yKXUkab/DuvrQB/ANVizbr6UAHJsDdHXuotZYwkJSGQl1JM+ivXaqY+XBDDL4TiA==",
+ "version": "16.6.0",
+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
+ "integrity": "sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==",
"dev": true,
"requires": {
"abab": "^2.0.5",
- "acorn": "^8.0.5",
+ "acorn": "^8.2.4",
"acorn-globals": "^6.0.0",
"cssom": "^0.4.4",
"cssstyle": "^2.3.0",
@@ -3643,12 +3676,13 @@
"decimal.js": "^10.2.1",
"domexception": "^2.0.1",
"escodegen": "^2.0.0",
+ "form-data": "^3.0.0",
"html-encoding-sniffer": "^2.0.1",
- "is-potential-custom-element-name": "^1.0.0",
+ "http-proxy-agent": "^4.0.1",
+ "https-proxy-agent": "^5.0.0",
+ "is-potential-custom-element-name": "^1.0.1",
"nwsapi": "^2.2.0",
"parse5": "6.0.1",
- "request": "^2.88.2",
- "request-promise-native": "^1.0.9",
"saxes": "^5.0.1",
"symbol-tree": "^3.2.4",
"tough-cookie": "^4.0.0",
@@ -3657,33 +3691,46 @@
"webidl-conversions": "^6.1.0",
"whatwg-encoding": "^1.0.5",
"whatwg-mimetype": "^2.3.0",
- "whatwg-url": "^8.0.0",
- "ws": "^7.4.4",
+ "whatwg-url": "^8.5.0",
+ "ws": "^7.4.5",
"xml-name-validator": "^3.0.0"
},
"dependencies": {
"acorn": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.0.tgz",
- "integrity": "sha512-LWCF/Wn0nfHOmJ9rzQApGnxnvgfROzGilS8936rqN/lfcYkY9MYZzdMqN+2NJ4SlTc+m5HiSa+kNfDtI64dwUA==",
+ "version": "8.2.4",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.4.tgz",
+ "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==",
"dev": true
},
- "tough-cookie": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
- "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+ "agent-base": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"dev": true,
"requires": {
- "psl": "^1.1.33",
- "punycode": "^2.1.1",
- "universalify": "^0.1.2"
+ "debug": "4"
}
},
- "ws": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
- "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
- "dev": true
+ "form-data": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+ "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+ "dev": true,
+ "requires": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "mime-types": "^2.1.12"
+ }
+ },
+ "https-proxy-agent": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+ "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+ "dev": true,
+ "requires": {
+ "agent-base": "6",
+ "debug": "4"
+ }
}
}
},
@@ -3707,7 +3754,8 @@
"json-schema": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
- "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+ "dev": true
},
"json-schema-traverse": {
"version": "0.4.1",
@@ -3745,6 +3793,7 @@
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "dev": true,
"requires": {
"assert-plus": "1.0.0",
"extsprintf": "1.3.0",
@@ -3753,9 +3802,9 @@
}
},
"just-extend": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz",
- "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
+ "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
"dev": true
},
"keyv": {
@@ -3846,8 +3895,7 @@
"lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
- "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
- "dev": true
+ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
},
"lodash.defaults": {
"version": "4.2.0",
@@ -3864,8 +3912,7 @@
"lodash.flatten": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
- "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
- "dev": true
+ "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8="
},
"lodash.flattendeep": {
"version": "4.4.0",
@@ -3894,14 +3941,12 @@
"lodash.merge": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
- "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
- "dev": true
+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
},
- "lodash.sortby": {
- "version": "4.7.0",
- "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
- "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
- "dev": true
+ "lodash.truncate": {
+ "version": "4.4.2",
+ "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+ "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM="
},
"lodash.union": {
"version": "4.6.0",
@@ -3971,15 +4016,15 @@
}
},
"map-obj": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.0.tgz",
- "integrity": "sha512-NAq0fCmZYGz9UFEQyndp7sisrow4GroyGeKluyKC/chuITZsPyOyC1UJZPJlVFImhXdROIP5xqouRLThT3BbpQ==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
+ "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
"dev": true
},
"marky": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.1.tgz",
- "integrity": "sha512-md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ==",
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.2.tgz",
+ "integrity": "sha512-k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ==",
"dev": true
},
"matcher": {
@@ -3997,6 +4042,23 @@
"integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
"dev": true
},
+ "md5": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+ "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+ "requires": {
+ "charenc": "0.0.2",
+ "crypt": "0.0.2",
+ "is-buffer": "~1.1.6"
+ },
+ "dependencies": {
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+ }
+ }
+ },
"mdast-util-from-markdown": {
"version": "0.8.5",
"resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
@@ -4102,13 +4164,13 @@
}
},
"micromatch": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
- "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+ "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
"dev": true,
"requires": {
"braces": "^3.0.1",
- "picomatch": "^2.0.5"
+ "picomatch": "^2.2.3"
}
},
"mime": {
@@ -4117,16 +4179,16 @@
"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
},
"mime-db": {
- "version": "1.46.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
- "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="
+ "version": "1.47.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
+ "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="
},
"mime-types": {
- "version": "2.1.29",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz",
- "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==",
+ "version": "2.1.30",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
+ "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
"requires": {
- "mime-db": "1.46.0"
+ "mime-db": "1.47.0"
}
},
"mimic-fn": {
@@ -4199,9 +4261,9 @@
"dev": true
},
"mocha": {
- "version": "8.3.2",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz",
- "integrity": "sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg==",
+ "version": "8.4.0",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
+ "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
"dev": true,
"requires": {
"@ungap/promise-all-settled": "1.1.2",
@@ -4340,13 +4402,13 @@
"integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
},
"nise": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz",
- "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz",
+ "integrity": "sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==",
"dev": true,
"requires": {
"@sinonjs/commons": "^1.7.0",
- "@sinonjs/fake-timers": "^6.0.0",
+ "@sinonjs/fake-timers": "^7.0.4",
"@sinonjs/text-encoding": "^0.7.1",
"just-extend": "^4.0.2",
"path-to-regexp": "^1.7.0"
@@ -4375,12 +4437,12 @@
"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
},
"node-ical": {
- "version": "0.12.9",
- "resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.12.9.tgz",
- "integrity": "sha512-5nUEZfZPpBpeZbmYCCmNRLsoP08+SGZy/fKxNBX9k67JMUTMFPLEyZ0CXApPDIExX0izMRndG1PsymhEkkSL2Q==",
+ "version": "0.13.0",
+ "resolved": "https://registry.npmjs.org/node-ical/-/node-ical-0.13.0.tgz",
+ "integrity": "sha512-hfV7HsY0oTehirXLtkKgAdVomSv6/zjSw66z/RTkKfEp9MwwIz1asyE/g9x4ZKWE2YqGnr81Se5zSRcligPY5Q==",
"requires": {
"moment-timezone": "^0.5.31",
- "request": "^2.88.2",
+ "node-fetch": "^2.6.1",
"rrule": "2.6.8",
"uuid": "^8.3.1"
}
@@ -4401,21 +4463,21 @@
"dev": true
},
"normalize-package-data": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.1.tgz",
- "integrity": "sha512-D/ttLdxo71msR4FF3VgSwK4blHfE3/vGByz1NCeE7/Dh8reQOKNJJjk5L10mLq9jxa+ZHzT1/HLgxljzbXE7Fw==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
+ "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
"dev": true,
"requires": {
- "hosted-git-info": "^4.0.0",
- "resolve": "^1.17.0",
- "semver": "^7.3.2",
+ "hosted-git-info": "^4.0.1",
+ "resolve": "^1.20.0",
+ "semver": "^7.3.4",
"validate-npm-package-license": "^3.0.1"
},
"dependencies": {
"semver": {
- "version": "7.3.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
- "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+ "version": "7.3.5",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
@@ -4590,9 +4652,9 @@
}
},
"y18n": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
- "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
"dev": true
},
"yargs": {
@@ -4629,7 +4691,8 @@
"oauth-sign": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
- "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -4667,12 +4730,6 @@
"mimic-fn": "^2.1.0"
}
},
- "opencollective-postinstall": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
- "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
- "dev": true
- },
"optionator": {
"version": "0.9.1",
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
@@ -4828,12 +4885,13 @@
"performance-now": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
- "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+ "dev": true
},
"picomatch": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
- "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
+ "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
"dev": true
},
"pify": {
@@ -4842,24 +4900,6 @@
"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"optional": true
},
- "pkg-dir": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
- "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
- "dev": true,
- "requires": {
- "find-up": "^5.0.0"
- }
- },
- "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"
- }
- },
"postcss": {
"version": "7.0.35",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -4999,14 +5039,12 @@
}
},
"postcss-selector-parser": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
- "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz",
+ "integrity": "sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==",
"dev": true,
"requires": {
"cssesc": "^3.0.0",
- "indexes-of": "^1.0.1",
- "uniq": "^1.0.1",
"util-deprecate": "^1.0.2"
}
},
@@ -5033,9 +5071,9 @@
"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
},
"prettier": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
- "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
+ "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
"dev": true
},
"prettier-linter-helpers": {
@@ -5165,7 +5203,8 @@
"psl": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
- "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+ "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+ "dev": true
},
"pump": {
"version": "3.0.0",
@@ -5276,9 +5315,9 @@
"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
},
"queue-microtask": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz",
- "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
"dev": true
},
"quick-lru": {
@@ -5351,9 +5390,9 @@
},
"dependencies": {
"hosted-git-info": {
- "version": "2.8.8",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
- "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
"dev": true
},
"normalize-package-data": {
@@ -5539,6 +5578,7 @@
"version": "2.88.2",
"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+ "dev": true,
"requires": {
"aws-sign2": "~0.7.0",
"aws4": "^1.8.0",
@@ -5565,35 +5605,27 @@
"qs": {
"version": "6.5.2",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
- "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+ "dev": true
+ },
+ "tough-cookie": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+ "dev": true,
+ "requires": {
+ "psl": "^1.1.28",
+ "punycode": "^2.1.1"
+ }
},
"uuid": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
- "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+ "dev": true
}
}
},
- "request-promise-core": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
- "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
- "dev": true,
- "requires": {
- "lodash": "^4.17.19"
- }
- },
- "request-promise-native": {
- "version": "1.0.9",
- "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
- "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
- "dev": true,
- "requires": {
- "request-promise-core": "1.1.4",
- "stealthy-require": "^1.1.1",
- "tough-cookie": "^2.3.3"
- }
- },
"require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -5622,9 +5654,9 @@
}
},
"resolve-alpn": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz",
- "integrity": "sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.1.2.tgz",
+ "integrity": "sha512-8OyfzhAtA32LVUsJSke3auIyINcwdh5l3cvYKdKO0nvsYSKuiLfTM5i78PJswFPT8y6cPW+L1v6/hE95chcpDA==",
"dev": true
},
"resolve-from": {
@@ -5700,11 +5732,6 @@
"tslib": "^1.10.0"
}
},
- "rrule-alt": {
- "version": "2.2.8",
- "resolved": "https://registry.npmjs.org/rrule-alt/-/rrule-alt-2.2.8.tgz",
- "integrity": "sha1-oxC23Gy8yKEA5Vgj+T9ia9QbFoA="
- },
"run-parallel": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -5746,13 +5773,8 @@
"semver-compare": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
- "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w="
- },
- "semver-regex": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.2.tgz",
- "integrity": "sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==",
- "dev": true
+ "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
+ "optional": true
},
"send": {
"version": "0.17.1",
@@ -5856,45 +5878,27 @@
"dev": true
},
"simple-git": {
- "version": "2.37.0",
- "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.37.0.tgz",
- "integrity": "sha512-ZK6qRnP+Xa2v23UEZDNHUfzswsuNCDHOQpWZRkpqNaXn7V5wVBBx3zRJLji3pROJGzrzA7mXwY7preL5EKuAaQ==",
+ "version": "2.39.0",
+ "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.39.0.tgz",
+ "integrity": "sha512-VOsrmc3fpp1lGVIpo+1SKNqJzrdVJeSGZCeenPKnJPNo5UouAlSkWFc037pfm9wRYtfxBdwp2deVJGCG8J6C8A==",
"requires": {
"@kwsites/file-exists": "^1.1.1",
"@kwsites/promise-deferred": "^1.1.1",
- "debug": "^4.3.2"
- },
- "dependencies": {
- "debug": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
- "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
- "requires": {
- "ms": "2.1.2"
- }
- }
+ "debug": "^4.3.1"
}
},
"sinon": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/sinon/-/sinon-10.0.0.tgz",
- "integrity": "sha512-XAn5DxtGVJBlBWYrcYKEhWCz7FLwZGdyvANRyK06419hyEpdT0dMc5A8Vcxg5SCGHc40CsqoKsc1bt1CbJPfNw==",
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/sinon/-/sinon-11.1.1.tgz",
+ "integrity": "sha512-ZSSmlkSyhUWbkF01Z9tEbxZLF/5tRC9eojCdFh33gtQaP7ITQVaMWQHGuFM7Cuf/KEfihuh1tTl3/ABju3AQMg==",
"dev": true,
"requires": {
- "@sinonjs/commons": "^1.8.1",
- "@sinonjs/fake-timers": "^6.0.1",
- "@sinonjs/samsam": "^5.3.1",
- "diff": "^4.0.2",
- "nise": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "dependencies": {
- "diff": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
- "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
- "dev": true
- }
+ "@sinonjs/commons": "^1.8.3",
+ "@sinonjs/fake-timers": "^7.1.0",
+ "@sinonjs/samsam": "^6.0.2",
+ "diff": "^5.0.0",
+ "nise": "^5.1.0",
+ "supports-color": "^7.2.0"
}
},
"slash": {
@@ -5914,9 +5918,9 @@
}
},
"socket.io": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.0.0.tgz",
- "integrity": "sha512-/c1riZMV/4yz7KEpaMhDQbwhJDIoO55whXaRKgyEBQrLU9zUHXo9rzeTMvTOqwL9mbKfHKdrXcMoCeQ/1YtMsg==",
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz",
+ "integrity": "sha512-xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w==",
"requires": {
"@types/cookie": "^0.4.0",
"@types/cors": "^2.8.8",
@@ -5924,15 +5928,15 @@
"accepts": "~1.3.4",
"base64id": "~2.0.0",
"debug": "~4.3.1",
- "engine.io": "~5.0.0",
- "socket.io-adapter": "~2.2.0",
+ "engine.io": "~5.1.0",
+ "socket.io-adapter": "~2.3.0",
"socket.io-parser": "~4.0.3"
}
},
"socket.io-adapter": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.2.0.tgz",
- "integrity": "sha512-rG49L+FwaVEwuAdeBRq49M97YI3ElVabJPzvHT9S6a2CWhDKnjSFasvwAwSYPRhQzfn4NtDIbCaGYgOCOU/rlg=="
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.0.tgz",
+ "integrity": "sha512-jdIbSFRWOkaZpo5mXy8T7rXEN6qo3bOFuq4nVeX1ZS7AtFlkbk39y153xTXEIW7W94vZfhVOux1wTU88YxcM1w=="
},
"socket.io-parser": {
"version": "4.0.4",
@@ -6033,6 +6037,7 @@
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+ "dev": true,
"requires": {
"asn1": "~0.2.3",
"assert-plus": "^1.0.0",
@@ -6050,12 +6055,6 @@
"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
"integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
},
- "stealthy-require": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
- "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
- "dev": true
- },
"string-width": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
@@ -6115,16 +6114,16 @@
"dev": true
},
"stylelint": {
- "version": "13.12.0",
- "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz",
- "integrity": "sha512-P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==",
+ "version": "13.13.1",
+ "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz",
+ "integrity": "sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==",
"dev": true,
"requires": {
"@stylelint/postcss-css-in-js": "^0.37.2",
"@stylelint/postcss-markdown": "^0.36.2",
"autoprefixer": "^9.8.6",
- "balanced-match": "^1.0.0",
- "chalk": "^4.1.0",
+ "balanced-match": "^2.0.0",
+ "chalk": "^4.1.1",
"cosmiconfig": "^7.0.0",
"debug": "^4.3.1",
"execall": "^2.0.0",
@@ -6133,7 +6132,7 @@
"file-entry-cache": "^6.0.1",
"get-stdin": "^8.0.0",
"global-modules": "^2.0.0",
- "globby": "^11.0.2",
+ "globby": "^11.0.3",
"globjoin": "^0.1.4",
"html-tags": "^3.1.0",
"ignore": "^5.1.8",
@@ -6141,10 +6140,10 @@
"imurmurhash": "^0.1.4",
"known-css-properties": "^0.21.0",
"lodash": "^4.17.21",
- "log-symbols": "^4.0.0",
+ "log-symbols": "^4.1.0",
"mathml-tag-names": "^2.1.3",
"meow": "^9.0.0",
- "micromatch": "^4.0.2",
+ "micromatch": "^4.0.4",
"normalize-selector": "^0.2.0",
"postcss": "^7.0.35",
"postcss-html": "^0.36.0",
@@ -6154,7 +6153,7 @@
"postcss-safe-parser": "^4.0.2",
"postcss-sass": "^0.4.4",
"postcss-scss": "^2.1.1",
- "postcss-selector-parser": "^6.0.4",
+ "postcss-selector-parser": "^6.0.5",
"postcss-syntax": "^0.36.2",
"postcss-value-parser": "^4.1.0",
"resolve-from": "^5.0.0",
@@ -6165,17 +6164,33 @@
"style-search": "^0.1.0",
"sugarss": "^2.0.0",
"svg-tags": "^1.0.0",
- "table": "^6.0.7",
- "v8-compile-cache": "^2.2.0",
+ "table": "^6.6.0",
+ "v8-compile-cache": "^2.3.0",
"write-file-atomic": "^3.0.3"
},
"dependencies": {
+ "balanced-match": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+ "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+ "dev": true
+ },
"ignore": {
"version": "5.1.8",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
"integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
"dev": true
},
+ "log-symbols": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+ "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+ "dev": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "is-unicode-supported": "^0.1.0"
+ }
+ },
"resolve-from": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -6191,18 +6206,18 @@
"dev": true
},
"stylelint-config-recommended": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-4.0.0.tgz",
- "integrity": "sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz",
+ "integrity": "sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA==",
"dev": true
},
"stylelint-config-standard": {
- "version": "21.0.0",
- "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-21.0.0.tgz",
- "integrity": "sha512-Yf6mx5oYEbQQJxWuW7X3t1gcxqbUx52qC9SMS3saC2ruOVYEyqmr5zSW6k3wXflDjjFrPhar3kp68ugRopmlzg==",
+ "version": "22.0.0",
+ "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-22.0.0.tgz",
+ "integrity": "sha512-uQVNi87SHjqTm8+4NIP5NMAyY/arXrBgimaaT7skvRfE9u3JKXRK9KBkbr4pVmeciuCcs64kAdjlxfq6Rur7Hw==",
"dev": true,
"requires": {
- "stylelint-config-recommended": "^4.0.0"
+ "stylelint-config-recommended": "^5.0.0"
}
},
"stylelint-prettier": {
@@ -6252,20 +6267,23 @@
"dev": true
},
"table": {
- "version": "6.0.7",
- "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz",
- "integrity": "sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==",
+ "version": "6.6.0",
+ "resolved": "https://registry.npmjs.org/table/-/table-6.6.0.tgz",
+ "integrity": "sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==",
"requires": {
- "ajv": "^7.0.2",
- "lodash": "^4.17.20",
+ "ajv": "^8.0.1",
+ "lodash.clonedeep": "^4.5.0",
+ "lodash.flatten": "^4.4.0",
+ "lodash.truncate": "^4.4.2",
"slice-ansi": "^4.0.0",
- "string-width": "^4.2.0"
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0"
},
"dependencies": {
"ajv": {
- "version": "7.2.1",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.1.tgz",
- "integrity": "sha512-+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ==",
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.2.0.tgz",
+ "integrity": "sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==",
"requires": {
"fast-deep-equal": "^3.1.1",
"json-schema-traverse": "^1.0.0",
@@ -6366,18 +6384,20 @@
"integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
},
"tough-cookie": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
- "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+ "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+ "dev": true,
"requires": {
- "psl": "^1.1.28",
- "punycode": "^2.1.1"
+ "psl": "^1.1.33",
+ "punycode": "^2.1.1",
+ "universalify": "^0.1.2"
}
},
"tr46": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
- "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+ "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
"dev": true,
"requires": {
"punycode": "^2.1.1"
@@ -6410,6 +6430,7 @@
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "dev": true,
"requires": {
"safe-buffer": "^5.0.1"
}
@@ -6417,7 +6438,8 @@
"tweetnacl": {
"version": "0.14.5",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
- "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+ "dev": true
},
"type-check": {
"version": "0.4.0",
@@ -6464,9 +6486,9 @@
}
},
"ua-parser-js": {
- "version": "0.7.24",
- "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.24.tgz",
- "integrity": "sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw==",
+ "version": "0.7.28",
+ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz",
+ "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==",
"dev": true
},
"unbzip2-stream": {
@@ -6493,12 +6515,6 @@
"vfile": "^4.0.0"
}
},
- "uniq": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
- "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
- "dev": true
- },
"unist-util-find-all-after": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
@@ -6588,6 +6604,7 @@
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "dev": true,
"requires": {
"assert-plus": "^1.0.0",
"core-util-is": "1.0.2",
@@ -6649,9 +6666,9 @@
},
"dependencies": {
"@sindresorhus/is": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.0.tgz",
- "integrity": "sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz",
+ "integrity": "sha512-Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g==",
"dev": true
},
"@szmarczak/http-timer": {
@@ -6749,9 +6766,9 @@
"dev": true
},
"p-cancelable": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz",
- "integrity": "sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
+ "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
"dev": true
},
"responselike": {
@@ -6819,9 +6836,9 @@
}
},
"serialize-error": {
- "version": "8.0.1",
- "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.0.1.tgz",
- "integrity": "sha512-r5o60rWFS+8/b49DNAbB+GXZA0SpDpuWE758JxDKgRTga05r3U5lwyksE91dYKDhXSmnu36RALj615E6Aj5pSg==",
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz",
+ "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==",
"dev": true,
"requires": {
"type-fest": "^0.20.2"
@@ -6874,12 +6891,12 @@
"dev": true
},
"whatwg-url": {
- "version": "8.4.0",
- "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz",
- "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==",
+ "version": "8.5.0",
+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz",
+ "integrity": "sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==",
"dev": true,
"requires": {
- "lodash.sortby": "^4.7.0",
+ "lodash": "^4.7.0",
"tr46": "^2.0.2",
"webidl-conversions": "^6.1.0"
}
@@ -6898,12 +6915,6 @@
"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",
@@ -6986,9 +6997,9 @@
}
},
"ws": {
- "version": "7.4.3",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz",
- "integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="
+ "version": "7.4.5",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
+ "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
},
"xml-name-validator": {
"version": "3.0.0",
@@ -7003,9 +7014,9 @@
"dev": true
},
"y18n": {
- "version": "5.0.5",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
- "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+ "version": "5.0.8",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
"dev": true
},
"yallist": {
diff --git a/package.json b/package.json
index 0f1f1ddf..098b6efb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "magicmirror",
- "version": "2.15.0",
+ "version": "2.16.0-develop",
"description": "The open source modular smart mirror platform.",
"main": "js/electron.js",
"scripts": {
@@ -14,14 +14,16 @@
"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text mocha tests --recursive --timeout=3000",
"test:e2e": "NODE_ENV=test mocha tests/e2e --recursive",
"test:unit": "NODE_ENV=test mocha tests/unit --recursive",
- "test:prettier": "prettier --check **/*.{js,css,json,md,yml}",
+ "test:prettier": "prettier . --check",
"test:js": "eslint 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",
"test:calendar": "node ./modules/default/calendar/debug.js",
"config:check": "node js/check_config.js",
- "lint:prettier": "prettier --write **/*.{js,css,json,md,yml}",
+ "lint:prettier": "prettier . --write",
"lint:js": "eslint 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"
+ "lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
+ "lint:staged": "pretty-quick --staged",
+ "prepare": "[ -f node_modules/.bin/husky ] && husky install || echo no husky installed."
},
"repository": {
"type": "git",
@@ -45,58 +47,51 @@
"devDependencies": {
"chai": "^4.3.4",
"chai-as-promised": "^7.1.1",
- "eslint-config-prettier": "^8.1.0",
- "eslint-plugin-jsdoc": "^32.3.0",
- "eslint-plugin-prettier": "^3.3.1",
+ "eslint-config-prettier": "^8.3.0",
+ "eslint-plugin-jsdoc": "^35.0.0",
+ "eslint-plugin-prettier": "^3.4.0",
"express-basic-auth": "^1.2.0",
- "husky": "^4.3.8",
- "jsdom": "^16.5.1",
+ "husky": "^6.0.0",
+ "jsdom": "^16.6.0",
"lodash": "^4.17.21",
- "mocha": "^8.3.2",
+ "mocha": "^8.4.0",
"mocha-each": "^2.0.1",
"mocha-logger": "^1.0.7",
"nyc": "^15.1.0",
- "prettier": "^2.2.1",
+ "prettier": "^2.3.0",
"pretty-quick": "^3.1.0",
- "sinon": "^10.0.0",
+ "sinon": "^11.1.1",
"spectron": "^13.0.0",
- "stylelint": "^13.12.0",
+ "stylelint": "^13.13.1",
"stylelint-config-prettier": "^8.0.2",
- "stylelint-config-standard": "^21.0.0",
+ "stylelint-config-standard": "^22.0.0",
"stylelint-prettier": "^1.2.0"
},
"optionalDependencies": {
- "electron": "^11.3.0"
+ "electron": "^11.4.7"
},
"dependencies": {
"colors": "^1.4.0",
- "console-stamp": "^3.0.0-rc4.2",
- "digest-fetch": "^1.1.6",
- "eslint": "^7.23.0",
+ "console-stamp": "^3.0.2",
+ "digest-fetch": "^1.2.0",
+ "eslint": "^7.27.0",
"express": "^4.17.1",
- "express-ipfilter": "^1.1.2",
+ "express-ipfilter": "^1.2.0",
"feedme": "^2.0.2",
- "helmet": "^4.4.1",
- "iconv-lite": "^0.6.2",
+ "helmet": "^4.6.0",
+ "iconv-lite": "^0.6.3",
"module-alias": "^2.2.2",
"moment": "^2.29.1",
"node-fetch": "^2.6.1",
- "node-ical": "^0.12.9",
- "rrule": "^2.6.8",
- "rrule-alt": "^2.2.8",
- "simple-git": "^2.37.0",
- "socket.io": "^4.0.0"
+ "node-ical": "^0.13.0",
+ "simple-git": "^2.39.0",
+ "socket.io": "^4.1.2"
},
"_moduleAliases": {
"node_helper": "js/node_helper.js",
"logger": "js/logger.js"
},
"engines": {
- "node": ">=10"
- },
- "husky": {
- "hooks": {
- "pre-commit": "pretty-quick --staged"
- }
+ "node": ">=12"
}
}
diff --git a/serveronly/index.js b/serveronly/index.js
index 136eaa00..00d6b64b 100644
--- a/serveronly/index.js
+++ b/serveronly/index.js
@@ -1,8 +1,8 @@
const app = require("../js/app.js");
const Log = require("logger");
-app.start(function (config) {
- var bindAddress = config.address ? config.address : "localhost";
- var httpType = config.useHttps ? "https" : "http";
+app.start((config) => {
+ const bindAddress = config.address ? config.address : "localhost";
+ const httpType = config.useHttps ? "https" : "http";
Log.log("\nReady to go! Please point your browser to: " + httpType + "://" + bindAddress + ":" + config.port);
});
diff --git a/tests/configs/data/calendar_test_recurring.ics b/tests/configs/data/calendar_test_recurring.ics
new file mode 100644
index 00000000..635497da
--- /dev/null
+++ b/tests/configs/data/calendar_test_recurring.ics
@@ -0,0 +1,37 @@
+BEGIN:VCALENDAR
+PRODID:-//Google Inc//Google Calendar 70.9054//EN
+VERSION:2.0
+CALSCALE:GREGORIAN
+METHOD:PUBLISH
+X-WR-CALNAME:xxx@gmail.com
+X-WR-TIMEZONE:Europe/Zurich
+BEGIN:VTIMEZONE
+TZID:Etc/UTC
+X-LIC-LOCATION:Etc/UTC
+BEGIN:STANDARD
+TZOFFSETFROM:+0000
+TZOFFSETTO:+0000
+TZNAME:GMT
+DTSTART:19700101T00000--äüüßßß-0
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTART;VALUE=DATE:20210325
+DTEND;VALUE=DATE:20210326
+RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1
+DTSTAMP:20210421T154106Z
+UID:zzz@google.com
+REATED:20200831T200244Z
+DESCRIPTION:
+LAST-MODIFIED:20200831T200244Z
+LOCATION:
+SEQUENCE:0
+STATUS:CONFIRMED
+SUMMARY:Birthday
+TRANSP:OPAQUE
+BEGIN:VALARM
+ACTION:DISPLAY
+DESCRIPTION:This is an event reminder
+TRIGGER:-P0DT7H0M0S
+END:VALARM
+END:VEVENT
diff --git a/tests/configs/data/feed_test_rodrigoramirez.xml b/tests/configs/data/feed_test_rodrigoramirez.xml
index dbce18e9..b781a8a8 100644
--- a/tests/configs/data/feed_test_rodrigoramirez.xml
+++ b/tests/configs/data/feed_test_rodrigoramirez.xml
@@ -1,44 +1,44 @@
-
+
+
+
+ Rodrigo Ramírez Norambuena
+ Temas sobre Linux, VoIP, Open Source, tecnología y lo relacionado.
+ Fri, 21 Oct 2016 21:30:22 +0000
+ es-ES
+ hourly
+ 1
+ https://wordpress.org/?v=4.7.3
+ -
+
QPanel 0.13.0
+ https://rodrigoramirez.com/qpanel-0-13-0/#comments
+ Tue, 20 Sep 2016 11:16:08 +0000
+
- Rodrigo Ramírez Norambuena
- Temas sobre Linux, VoIP, Open Source, tecnología y lo relacionado.
- Fri, 21 Oct 2016 21:30:22 +0000
- es-ES
- hourly
- 1
- https://wordpress.org/?v=4.7.3
- -
-
QPanel 0.13.0
- https://rodrigoramirez.com/qpanel-0-13-0/#comments
- Tue, 20 Sep 2016 11:16:08 +0000
- https://rodrigoramirez.com/?p=1299
- Ya está disponible la versión 0.13.0 de QPanel Para instalar esta nueva versión, la debes descargar de https://github.com/roramirez/qpanel/tree/0.13.0 En al README.md puedes encontrar las instrucciones para hacer que funcione en tu sistema. En esta nueva versión cuenta con los siguientes cambios: Se establece un limite para el reciclado del tiempo de conexión a la base […]
+ https://rodrigoramirez.com/?p=1299
+ Ya está disponible la versión 0.13.0 de QPanel Para instalar esta nueva versión, la debes descargar de https://github.com/roramirez/qpanel/tree/0.13.0 En al README.md puedes encontrar las instrucciones para hacer que funcione en tu sistema. En esta nueva versión cuenta con los siguientes cambios: Se establece un limite para el reciclado del tiempo de conexión a la base […]
La entrada QPanel 0.13.0 aparece primero en Rodrigo Ramírez Norambuena .
]]>
- Para instalar esta nueva versión, la debes descargar de
https://rodrigoramirez.com/qpanel-0-13-0/feed/
- 3
-
- -
-
Problema VirtualBox “starting virtual machine” …
- https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/#respond
- Sat, 10 Sep 2016 22:50:13 +0000
- https://rodrigoramirez.com/qpanel-0-13-0/feed/
+ 3
+
+ -
+
Problema VirtualBox “starting virtual machine” …
+ https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/#respond
+ Sat, 10 Sep 2016 22:50:13 +0000
+ https://rodrigoramirez.com/?p=1284
- Después de una actualización de Debian, de la rama stretch/sid, tuve un problema con VirtualBox. La versión que se actualizó fue a la virtualbox 5.1.4-dfsg-1+b1. El gran problema era que ninguna maquina virtual quería arrancar, se quedaba en un largo limbo con el mensaje “starting virtual machine”, como el de la imagen de a continuación. […]
+ https://rodrigoramirez.com/?p=1284
+ Después de una actualización de Debian, de la rama stretch/sid, tuve un problema con VirtualBox. La versión que se actualizó fue a la virtualbox 5.1.4-dfsg-1+b1. El gran problema era que ninguna maquina virtual quería arrancar, se quedaba en un largo limbo con el mensaje “starting virtual machine”, como el de la imagen de a continuación. […]
La entrada Problema VirtualBox “starting virtual machine” … aparece primero en Rodrigo Ramírez Norambuena .
]]>
- Después de una actualización de Debian, de la rama stretch/sid, tuve un problema con VirtualBox. La versión que se actualizó fue a la virtualbox 5.1.4-dfsg-1+b1. El gran problema era que ninguna maquina virtual quería arrancar, se quedaba en un largo limbo con el mensaje “starting virtual machine”, como el de la imagen de a continuación.
+ Después de una actualización de Debian, de la rama stretch/sid, tuve un problema con VirtualBox. La versión que se actualizó fue a la virtualbox 5.1.4-dfsg-1+b1. El gran problema era que ninguna maquina virtual quería arrancar, se quedaba en un largo limbo con el mensaje “starting virtual machine”, como el de la imagen de a continuación.
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
@@ -85,7 +85,7 @@
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
@@ -95,24 +95,24 @@ $ 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 .
]]>
- https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/feed/
- 0
-
- -
-
Mejorando la consola interactiva de Python
- https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/#comments
- Tue, 06 Sep 2016 04:24:43 +0000
- https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/feed/
+ 0
+
+ -
+
Mejorando la consola interactiva de Python
+ https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/#comments
+ Tue, 06 Sep 2016 04:24:43 +0000
+ https://rodrigoramirez.com/?p=1247
- Cuando estás desarrollando en Python es muy cool estar utilizando la consola interactiva para ir probando cosas antes de ponerlas dentro del archivo de código fuente. La consola de Python funciona y cumple su cometido. Solo al tipear python te permite entrar en modo interactivo e ir probando cosas. El punto es que a veces […]
+ https://rodrigoramirez.com/?p=1247
+ Cuando estás desarrollando en Python es muy cool estar utilizando la consola interactiva para ir probando cosas antes de ponerlas dentro del archivo de código fuente. La consola de Python funciona y cumple su cometido. Solo al tipear python te permite entrar en modo interactivo e ir probando cosas. El punto es que a veces […]
La entrada Mejorando la consola interactiva de Python aparece primero en Rodrigo Ramírez Norambuena .
]]>
- Cuando estás desarrollando en Python es muy cool estar utilizando la consola interactiva para ir probando cosas antes de ponerlas dentro del archivo de código fuente.
+ Cuando estás desarrollando en Python es muy cool estar utilizando la consola interactiva para ir probando cosas antes de ponerlas dentro del archivo de código fuente.
La consola de Python funciona y cumple su cometido. Solo al tipear python te permite entrar en modo interactivo e ir probando cosas.
El punto es que a veces uno necesita ir un poco más allá. Como autocomentado de código o resaltado de sintaxis, para eso tengo dos truco que utilizo generalmente.
Truco a)
@@ -139,31 +139,31 @@ $ ls -lh /dev/vboxdrvu
O lo agregas a un bashrc, zshrc o la shell que ocupes.
La entrada Mejorando la consola interactiva de Python aparece primero en Rodrigo Ramírez Norambuena .
]]>
- https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/feed/
- 4
-
- -
-
QPanel 0.12.0 con estadísticas
- https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/#respond
- Mon, 22 Aug 2016 04:19:03 +0000
- https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/feed/
+ 4
+
+ -
+
QPanel 0.12.0 con estadísticas
+ https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/#respond
+ Mon, 22 Aug 2016 04:19:03 +0000
+ https://rodrigoramirez.com/?p=1268
- Ya está disponible una nueva versión de QPanel, esta es la 0.12.0 Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.12.0 En esta nueva versión las funcionalidades agregadas son: Permite remover los agentes de las cola Posibilidad de cancelar llamadas que están en espera de atención Estadísticas por rango de fecha obtenidas desde […]
+ https://rodrigoramirez.com/?p=1268
+ Ya está disponible una nueva versión de QPanel, esta es la 0.12.0 Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.12.0 En esta nueva versión las funcionalidades agregadas son: Permite remover los agentes de las cola Posibilidad de cancelar llamadas que están en espera de atención Estadísticas por rango de fecha obtenidas desde […]
La entrada QPanel 0.12.0 con estadísticas aparece primero en Rodrigo Ramírez Norambuena .
]]>
- Para instalar esta nueva versión, debes visitar la siguiente URL
https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/feed/
- 0
-
- -
-
QPanel 0.11.0 con Spy, Whisper y mas
- https://rodrigoramirez.com/qpanel-spy-supervisor/#comments
- Thu, 21 Jul 2016 01:53:21 +0000
- https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/feed/
+ 0
+
+ -
+
QPanel 0.11.0 con Spy, Whisper y mas
+ https://rodrigoramirez.com/qpanel-spy-supervisor/#comments
+ Thu, 21 Jul 2016 01:53:21 +0000
+ https://rodrigoramirez.com/?p=1245
- Ya está disponible una nueva versión de QPanel, esta es la 0.11.0 Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.11.0 Esta versión hemos agregado algunas funcionalidades que los usuarios han ido solicitando. Para esta versión es posible realizar Spy, Whisper o Barge a un canal para la supervisión de los miembros que […]
+ https://rodrigoramirez.com/?p=1245
+ Ya está disponible una nueva versión de QPanel, esta es la 0.11.0 Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.11.0 Esta versión hemos agregado algunas funcionalidades que los usuarios han ido solicitando. Para esta versión es posible realizar Spy, Whisper o Barge a un canal para la supervisión de los miembros que […]
La entrada QPanel 0.11.0 con Spy, Whisper y mas aparece primero en Rodrigo Ramírez Norambuena .
]]>
- Para instalar esta nueva versión, debes visitar la siguiente URL
https://rodrigoramirez.com/qpanel-spy-supervisor/feed/
- 4
-
- -
-
Añadir Swap a un sistema
- https://rodrigoramirez.com/crear-swap/#respond
- Fri, 15 Jul 2016 05:07:43 +0000
- https://rodrigoramirez.com/qpanel-spy-supervisor/feed/
+ 4
+
+ -
+
Añadir Swap a un sistema
+ https://rodrigoramirez.com/crear-swap/#respond
+ Fri, 15 Jul 2016 05:07:43 +0000
+ https://rodrigoramirez.com/?p=1234
- Algo que me toma generalmente hacer es cuando trabajo con maquina virtuales es asignar una cantidad determinada de Swap. La memoria swap es un espacio de intercambio en disco para cuando el sistema ya no puede utilizar más memoria RAM. El problema para mi es que algunos sistemas de maquinas virtuales no asignan por defecto […]
+ https://rodrigoramirez.com/?p=1234
+ Algo que me toma generalmente hacer es cuando trabajo con maquina virtuales es asignar una cantidad determinada de Swap. La memoria swap es un espacio de intercambio en disco para cuando el sistema ya no puede utilizar más memoria RAM. El problema para mi es que algunos sistemas de maquinas virtuales no asignan por defecto […]
La entrada Añadir Swap a un sistema aparece primero en Rodrigo Ramírez Norambuena .
]]>
- Algo que me toma generalmente hacer es cuando trabajo con maquina virtuales es asignar una cantidad determinada de Swap.
+ Algo que me toma generalmente hacer es cuando trabajo con maquina virtuales es asignar una cantidad determinada de Swap.
La memoria swap es un espacio de intercambio en disco para cuando el sistema ya no puede utilizar más memoria RAM.
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
@@ -271,27 +271,27 @@ Swap: 3071 0 3071
La entrada Añadir Swap a un sistema aparece primero en Rodrigo Ramírez Norambuena .
]]>
- https://rodrigoramirez.com/crear-swap/feed/
- 0
-
- -
-
QPanel 0.10.0 con vista consolidada
- https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/#respond
- Mon, 20 Jun 2016 19:32:55 +0000
- https://rodrigoramirez.com/crear-swap/feed/
+ 0
+
+ -
+
QPanel 0.10.0 con vista consolidada
+ https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/#respond
+ Mon, 20 Jun 2016 19:32:55 +0000
+ https://rodrigoramirez.com/?p=1227
- Ya con la release numero 28 la nueva versión 0.10.0 de QPanel ya está disponible. Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.10.0 Esta versión versión nos preocupamos de realizar mejoras, refactorizaciones y agregamos una nueva funcionalidad. La nueva funcionalidad incluida es que ahora es posible contar con una vista consolidada para […]
+ https://rodrigoramirez.com/?p=1227
+ Ya con la release numero 28 la nueva versión 0.10.0 de QPanel ya está disponible. Para instalar esta nueva versión, debes visitar la siguiente URL https://github.com/roramirez/qpanel/tree/0.10.0 Esta versión versión nos preocupamos de realizar mejoras, refactorizaciones y agregamos una nueva funcionalidad. La nueva funcionalidad incluida es que ahora es posible contar con una vista consolidada para […]
La entrada QPanel 0.10.0 con vista consolidada aparece primero en Rodrigo Ramírez Norambuena .
]]>
- Para instalar esta nueva versión, debes visitar la siguiente URL
https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/feed/
- 0
-
- -
-
Nerdearla 2016, WebRTC Glue
- https://rodrigoramirez.com/nerdearla-2016/#respond
- Wed, 15 Jun 2016 17:55:41 +0000
- https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/feed/
+ 0
+
+ -
+
Nerdearla 2016, WebRTC Glue
+ https://rodrigoramirez.com/nerdearla-2016/#respond
+ Wed, 15 Jun 2016 17:55:41 +0000
+ https://rodrigoramirez.com/?p=1218
- 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 […]
+ https://rodrigoramirez.com/?p=1218
+ 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
@@ -338,30 +338,30 @@ Swap: 3071 0 3071
La entrada Nerdearla 2016, WebRTC Glue aparece primero en Rodrigo Ramírez Norambuena .
]]>
- https://rodrigoramirez.com/nerdearla-2016/feed/
- 0
-
- -
-
QPanel 0.9.0
- https://rodrigoramirez.com/qpanel-0-9-0/#respond
- Mon, 09 May 2016 18:40:23 +0000
- https://rodrigoramirez.com/nerdearla-2016/feed/
+ 0
+
+ -
+
QPanel 0.9.0
+ https://rodrigoramirez.com/qpanel-0-9-0/#respond
+ Mon, 09 May 2016 18:40:23 +0000
+ 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 […]
+ 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 .
]]>
- Para instalar esta nueva versión, debes visitar la siguiente URL
https://rodrigoramirez.com/qpanel-0-9-0/feed/
- 0
-
- -
-
Mandar un email desde la shell
- https://rodrigoramirez.com/mandar-un-email-desde-la-shell/#comments
- Wed, 13 Apr 2016 13:05:13 +0000
- https://rodrigoramirez.com/qpanel-0-9-0/feed/
+ 0
+
+ -
+
Mandar un email desde la shell
+ https://rodrigoramirez.com/mandar-un-email-desde-la-shell/#comments
+ Wed, 13 Apr 2016 13:05:13 +0000
+ 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 […]
+ 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 .
]]>
- 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.
+ 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 echo le pasas por pipe a mail
echo "Cuerpo del mensaje" | mail -s Asunto a@rodrigoramirez.com
La entrada Mandar un email desde la shell aparece primero en Rodrigo Ramírez Norambuena .
]]>
- https://rodrigoramirez.com/mandar-un-email-desde-la-shell/feed/
- 4
-
-
+ https://rodrigoramirez.com/mandar-un-email-desde-la-shell/feed/
+ 4
+
+
diff --git a/tests/unit/functions/weatherforecast_data.json b/tests/configs/data/weatherforecast_data.json
similarity index 100%
rename from tests/unit/functions/weatherforecast_data.json
rename to tests/configs/data/weatherforecast_data.json
diff --git a/tests/configs/empty_ipWhiteList.js b/tests/configs/empty_ipWhiteList.js
index b2369c46..45728c71 100644
--- a/tests/configs/empty_ipWhiteList.js
+++ b/tests/configs/empty_ipWhiteList.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: [],
diff --git a/tests/configs/env.js b/tests/configs/env.js
index d59f01a9..99bd6b4e 100644
--- a/tests/configs/env.js
+++ b/tests/configs/env.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/alert/default.js b/tests/configs/modules/alert/default.js
new file mode 100644
index 00000000..8ee282d0
--- /dev/null
+++ b/tests/configs/modules/alert/default.js
@@ -0,0 +1,34 @@
+/* Magic Mirror Test config sample module alert
+ *
+ * By rejas
+ * MIT Licensed.
+ */
+let config = {
+ port: 8080,
+ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
+
+ language: "en",
+ timeFormat: 24,
+ units: "metric",
+ electronOptions: {
+ webPreferences: {
+ nodeIntegration: true,
+ enableRemoteModule: true
+ }
+ },
+
+ modules: [
+ {
+ module: "alert",
+ config: {
+ display_time: 1000000,
+ welcome_message: true
+ }
+ }
+ ]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+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 dd65c53e..053c18ff 100644
--- a/tests/configs/modules/calendar/auth-default.js
+++ b/tests/configs/modules/calendar/auth-default.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/calendar/basic-auth.js b/tests/configs/modules/calendar/basic-auth.js
index 8937b2a3..c34998b8 100644
--- a/tests/configs/modules/calendar/basic-auth.js
+++ b/tests/configs/modules/calendar/basic-auth.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/calendar/changed-port.js b/tests/configs/modules/calendar/changed-port.js
index fa0f7ae7..a7e3b34a 100644
--- a/tests/configs/modules/calendar/changed-port.js
+++ b/tests/configs/modules/calendar/changed-port.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/calendar/custom.js b/tests/configs/modules/calendar/custom.js
index 3d806ce9..6b0e6707 100644
--- a/tests/configs/modules/calendar/custom.js
+++ b/tests/configs/modules/calendar/custom.js
@@ -1,5 +1,6 @@
/* Magic Mirror Test config custom calendar
*
+ * By Rejas
* MIT Licensed.
*/
let config = {
diff --git a/tests/configs/modules/calendar/default.js b/tests/configs/modules/calendar/default.js
index 86f81a36..901a6667 100644
--- a/tests/configs/modules/calendar/default.js
+++ b/tests/configs/modules/calendar/default.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/calendar/fail-basic-auth.js b/tests/configs/modules/calendar/fail-basic-auth.js
index 7ccb8bce..c48d2471 100644
--- a/tests/configs/modules/calendar/fail-basic-auth.js
+++ b/tests/configs/modules/calendar/fail-basic-auth.js
@@ -5,8 +5,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/calendar/old-basic-auth.js b/tests/configs/modules/calendar/old-basic-auth.js
index fa7b70f3..7d0a146b 100644
--- a/tests/configs/modules/calendar/old-basic-auth.js
+++ b/tests/configs/modules/calendar/old-basic-auth.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/calendar/recurring.js b/tests/configs/modules/calendar/recurring.js
new file mode 100644
index 00000000..371446a3
--- /dev/null
+++ b/tests/configs/modules/calendar/recurring.js
@@ -0,0 +1,40 @@
+/* Magic Mirror Test config custom calendar
+ *
+ * By Rejas
+ * MIT Licensed.
+ */
+let config = {
+ port: 8080,
+ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
+
+ language: "en",
+ timeFormat: 12,
+ units: "metric",
+ electronOptions: {
+ webPreferences: {
+ nodeIntegration: true,
+ enableRemoteModule: true
+ }
+ },
+
+ modules: [
+ {
+ module: "calendar",
+ position: "bottom_bar",
+ config: {
+ calendars: [
+ {
+ maximumEntries: 6,
+ maximumNumberOfDays: 3650,
+ url: "http://localhost:8080/tests/configs/data/calendar_test_recurring.ics"
+ }
+ ]
+ }
+ }
+ ]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+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 c4ab07fc..bf3cedff 100644
--- a/tests/configs/modules/clock/clock_12hr.js
+++ b/tests/configs/modules/clock/clock_12hr.js
@@ -3,8 +3,7 @@
* By Sergey Morozov
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js
index 57c29010..7813a10d 100644
--- a/tests/configs/modules/clock/clock_24hr.js
+++ b/tests/configs/modules/clock/clock_24hr.js
@@ -3,8 +3,7 @@
* By Sergey Morozov
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js
index 5031ab82..292a8283 100644
--- a/tests/configs/modules/clock/clock_displaySeconds_false.js
+++ b/tests/configs/modules/clock/clock_displaySeconds_false.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js
index 6fe1840f..5dd30222 100644
--- a/tests/configs/modules/clock/clock_showPeriodUpper.js
+++ b/tests/configs/modules/clock/clock_showPeriodUpper.js
@@ -3,8 +3,7 @@
* By Sergey Morozov
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js
index 02b4acf4..ca9d4384 100644
--- a/tests/configs/modules/clock/clock_showWeek.js
+++ b/tests/configs/modules/clock/clock_showWeek.js
@@ -3,8 +3,7 @@
* By Johan Hammar
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js
index b753a550..82f5bfdb 100644
--- a/tests/configs/modules/clock/es/clock_12hr.js
+++ b/tests/configs/modules/clock/es/clock_12hr.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js
index feb55770..8db5aae2 100644
--- a/tests/configs/modules/clock/es/clock_24hr.js
+++ b/tests/configs/modules/clock/es/clock_24hr.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js
index 208d9394..1d24a58a 100644
--- a/tests/configs/modules/clock/es/clock_showPeriodUpper.js
+++ b/tests/configs/modules/clock/es/clock_showPeriodUpper.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js
index 2a6661e9..d86db2d7 100644
--- a/tests/configs/modules/clock/es/clock_showWeek.js
+++ b/tests/configs/modules/clock/es/clock_showWeek.js
@@ -1,13 +1,10 @@
/* Magic Mirror Test config for default clock module
* Language es for showWeek feature
*
- * By Rodrigo Ramírez Norambuena
- * https://rodrigoramirez.com
- *
+ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/compliments/compliments_anytime.js b/tests/configs/modules/compliments/compliments_anytime.js
index 12ee1d3d..21db9ffb 100644
--- a/tests/configs/modules/compliments/compliments_anytime.js
+++ b/tests/configs/modules/compliments/compliments_anytime.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/compliments/compliments_date.js b/tests/configs/modules/compliments/compliments_date.js
index 0aed1a96..cc2134bb 100644
--- a/tests/configs/modules/compliments/compliments_date.js
+++ b/tests/configs/modules/compliments/compliments_date.js
@@ -1,10 +1,8 @@
/* Magic Mirror Test config compliments with date type
*
* By Rejas
- *
* MIT Licensed.
*/
-
let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/compliments/compliments_only_anytime.js b/tests/configs/modules/compliments/compliments_only_anytime.js
index d93b1d37..145157d9 100644
--- a/tests/configs/modules/compliments/compliments_only_anytime.js
+++ b/tests/configs/modules/compliments/compliments_only_anytime.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js
index d4a4da76..c04b3a32 100644
--- a/tests/configs/modules/compliments/compliments_parts_day.js
+++ b/tests/configs/modules/compliments/compliments_parts_day.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/display.js b/tests/configs/modules/display.js
index bf2ae261..d22e3cf5 100644
--- a/tests/configs/modules/display.js
+++ b/tests/configs/modules/display.js
@@ -1,8 +1,9 @@
/* Magic Mirror Test config for display setters module using the helloworld module
*
+ * By Rejas
* MIT Licensed.
*/
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
@@ -37,6 +38,7 @@ var config = {
}
]
};
+
/*************** DO NOT EDIT THE LINE BELOW ***************/
if (typeof module !== "undefined") {
module.exports = config;
diff --git a/tests/configs/modules/helloworld/helloworld.js b/tests/configs/modules/helloworld/helloworld.js
index b741d5ed..c0e00458 100644
--- a/tests/configs/modules/helloworld/helloworld.js
+++ b/tests/configs/modules/helloworld/helloworld.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/helloworld/helloworld_default.js b/tests/configs/modules/helloworld/helloworld_default.js
index d04f2884..9d516aef 100644
--- a/tests/configs/modules/helloworld/helloworld_default.js
+++ b/tests/configs/modules/helloworld/helloworld_default.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/newsfeed/prohibited_words.js b/tests/configs/modules/newsfeed/prohibited_words.js
index e039385e..f9bfa5cf 100644
--- a/tests/configs/modules/newsfeed/prohibited_words.js
+++ b/tests/configs/modules/newsfeed/prohibited_words.js
@@ -27,7 +27,8 @@ let config = {
url: "http://localhost:8080/tests/configs/data/feed_test_rodrigoramirez.xml"
}
],
- prohibitedWords: ["QPanel"]
+ prohibitedWords: ["QPanel"],
+ showDescription: true
}
}
]
diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js
index 24eed5e2..b99316ce 100644
--- a/tests/configs/modules/positions.js
+++ b/tests/configs/modules/positions.js
@@ -1,12 +1,9 @@
-/* Magic Mirror Test config for position setters module
- *
- * For this case is using helloworld module
+/* Magic Mirror Test config for position setters module using the helloworld module
*
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
@@ -23,9 +20,9 @@ var config = {
modules:
// Using exotic content. This is why don't 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"];
- var modules = Array();
- for (var idx in positions) {
+ let 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"];
+ let modules = Array();
+ for (let idx in positions) {
modules.push({
module: "helloworld",
position: positions[idx],
@@ -37,6 +34,7 @@ var config = {
return modules;
})()
};
+
/*************** DO NOT EDIT THE LINE BELOW ***************/
if (typeof module !== "undefined") {
module.exports = config;
diff --git a/tests/configs/modules/weather/currentweather_compliments.js b/tests/configs/modules/weather/currentweather_compliments.js
index b2aaeeed..0a039b36 100644
--- a/tests/configs/modules/weather/currentweather_compliments.js
+++ b/tests/configs/modules/weather/currentweather_compliments.js
@@ -1,10 +1,8 @@
/* Magic Mirror Test config current weather compliments
*
* By rejas https://github.com/rejas
- *
* MIT Licensed.
*/
-
let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/weather/currentweather_default.js b/tests/configs/modules/weather/currentweather_default.js
index 9d53d3b0..440cc725 100644
--- a/tests/configs/modules/weather/currentweather_default.js
+++ b/tests/configs/modules/weather/currentweather_default.js
@@ -1,10 +1,8 @@
/* Magic Mirror Test config default weather
*
* By fewieden https://github.com/fewieden
- *
* MIT Licensed.
*/
-
let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js
index 722aa746..3fcd49b9 100644
--- a/tests/configs/modules/weather/currentweather_options.js
+++ b/tests/configs/modules/weather/currentweather_options.js
@@ -1,10 +1,8 @@
/* Magic Mirror Test config default weather
*
* By fewieden https://github.com/fewieden
- *
* MIT Licensed.
*/
-
let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/weather/currentweather_units.js b/tests/configs/modules/weather/currentweather_units.js
index 35bf62b0..9eba6660 100644
--- a/tests/configs/modules/weather/currentweather_units.js
+++ b/tests/configs/modules/weather/currentweather_units.js
@@ -1,10 +1,8 @@
/* Magic Mirror Test config default weather
*
* By fewieden https://github.com/fewieden
- *
* MIT Licensed.
*/
-
let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/weather/forecastweather_default.js b/tests/configs/modules/weather/forecastweather_default.js
index 60a83f17..dbe2d7e3 100644
--- a/tests/configs/modules/weather/forecastweather_default.js
+++ b/tests/configs/modules/weather/forecastweather_default.js
@@ -1,10 +1,8 @@
/* Magic Mirror Test config default weather
*
* By fewieden https://github.com/fewieden
- *
* MIT Licensed.
*/
-
let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/weather/forecastweather_options.js b/tests/configs/modules/weather/forecastweather_options.js
index ccb2de98..32e0c8af 100644
--- a/tests/configs/modules/weather/forecastweather_options.js
+++ b/tests/configs/modules/weather/forecastweather_options.js
@@ -1,10 +1,8 @@
/* Magic Mirror Test config default weather
*
* By fewieden https://github.com/fewieden
- *
* MIT Licensed.
*/
-
let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/modules/weather/forecastweather_units.js b/tests/configs/modules/weather/forecastweather_units.js
new file mode 100644
index 00000000..9d1a54ff
--- /dev/null
+++ b/tests/configs/modules/weather/forecastweather_units.js
@@ -0,0 +1,39 @@
+/* Magic Mirror Test config default weather
+ *
+ * By rejas
+ * MIT Licensed.
+ */
+let config = {
+ port: 8080,
+ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
+
+ language: "en",
+ timeFormat: 24,
+ units: "imperial",
+ electronOptions: {
+ webPreferences: {
+ nodeIntegration: true,
+ enableRemoteModule: true
+ }
+ },
+
+ modules: [
+ {
+ module: "weather",
+ position: "bottom_bar",
+ config: {
+ type: "forecast",
+ location: "Munich",
+ apiKey: "fake key",
+ weatherEndpoint: "/forecast/daily",
+ initialLoadDelay: 3000,
+ decimalSymbol: "_"
+ }
+ }
+ ]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+ module.exports = config;
+}
diff --git a/tests/configs/noIpWhiteList.js b/tests/configs/noIpWhiteList.js
index 3bc2ed31..28369bea 100644
--- a/tests/configs/noIpWhiteList.js
+++ b/tests/configs/noIpWhiteList.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["x.x.x.x"],
diff --git a/tests/configs/port_8090.js b/tests/configs/port_8090.js
index 91ddee50..99386dd2 100644
--- a/tests/configs/port_8090.js
+++ b/tests/configs/port_8090.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8090,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
diff --git a/tests/configs/without_modules.js b/tests/configs/without_modules.js
index 18e3ce80..8703374c 100644
--- a/tests/configs/without_modules.js
+++ b/tests/configs/without_modules.js
@@ -3,8 +3,7 @@
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
*/
-
-var config = {
+let config = {
port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.10.1"],
diff --git a/tests/e2e/dev_console.js b/tests/e2e/dev_console.js
index 4e5d1ca1..e6400bef 100644
--- a/tests/e2e/dev_console.js
+++ b/tests/e2e/dev_console.js
@@ -12,7 +12,7 @@ describe("Development console tests", function () {
/* eslint-disable */
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
before(function () {
// Set config sample for use in test
diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js
index 9c827055..1ec4a086 100644
--- a/tests/e2e/env_spec.js
+++ b/tests/e2e/env_spec.js
@@ -10,7 +10,7 @@ const afterEach = global.afterEach;
describe("Electron app environment", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
before(function () {
// Set config sample for use in test
diff --git a/tests/e2e/fonts.js b/tests/e2e/fonts.js
index c8c2a063..d6d65c0b 100644
--- a/tests/e2e/fonts.js
+++ b/tests/e2e/fonts.js
@@ -8,12 +8,12 @@ const describe = global.describe;
describe("All font files from roboto.css should be downloadable", function () {
helpers.setupTimeout(this);
- var app;
- var fontFiles = [];
+ let app;
+ const fontFiles = [];
// Statements below filters out all 'url' lines in the CSS file
- var fileContent = require("fs").readFileSync(__dirname + "/../../fonts/roboto.css", "utf8");
- var regex = /\burl\(['"]([^'"]+)['"]\)/g;
- var match = regex.exec(fileContent);
+ const fileContent = require("fs").readFileSync(__dirname + "/../../fonts/roboto.css", "utf8");
+ const regex = /\burl\(['"]([^'"]+)['"]\)/g;
+ let match = regex.exec(fileContent);
while (match !== null) {
// Push 1st match group onto fontFiles stack
fontFiles.push(match[1]);
@@ -39,7 +39,7 @@ describe("All font files from roboto.css should be downloadable", function () {
});
forEach(fontFiles).it("should return 200 HTTP code for file '%s'", (fontFile, done) => {
- var fontUrl = "http://localhost:8080/fonts/" + fontFile;
+ const fontUrl = "http://localhost:8080/fonts/" + fontFile;
fetch(fontUrl).then((res) => {
expect(res.status).to.equal(200);
done();
diff --git a/tests/e2e/global-setup.js b/tests/e2e/global-setup.js
index ed6217d3..801c61e5 100644
--- a/tests/e2e/global-setup.js
+++ b/tests/e2e/global-setup.js
@@ -1,13 +1,9 @@
/*
- * Magic Mirror
- *
- * Global Setup Test Suite
+ * Magic Mirror Global Setup Test Suite
*
* By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
* MIT Licensed.
- *
*/
-
const Application = require("spectron").Application;
const assert = require("assert");
const chai = require("chai");
diff --git a/tests/e2e/ipWhistlist_spec.js b/tests/e2e/ipWhistlist_spec.js
index 203bc711..1c259f1e 100644
--- a/tests/e2e/ipWhistlist_spec.js
+++ b/tests/e2e/ipWhistlist_spec.js
@@ -10,7 +10,7 @@ const afterEach = global.afterEach;
describe("ipWhitelist directive configuration", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
beforeEach(function () {
return helpers
@@ -31,6 +31,7 @@ describe("ipWhitelist directive configuration", function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/noIpWhiteList.js";
});
+
it("should return 403", function (done) {
fetch("http://localhost:8080").then((res) => {
expect(res.status).to.equal(403);
@@ -44,6 +45,7 @@ describe("ipWhitelist directive configuration", function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/empty_ipWhiteList.js";
});
+
it("should return 200", function (done) {
fetch("http://localhost:8080").then((res) => {
expect(res.status).to.equal(200);
diff --git a/tests/e2e/modules/alert_spec.js b/tests/e2e/modules/alert_spec.js
new file mode 100644
index 00000000..515001bf
--- /dev/null
+++ b/tests/e2e/modules/alert_spec.js
@@ -0,0 +1,37 @@
+const helpers = require("../global-setup");
+
+const describe = global.describe;
+const it = global.it;
+const beforeEach = global.beforeEach;
+const afterEach = global.afterEach;
+
+describe("Alert module", function () {
+ helpers.setupTimeout(this);
+
+ let app = null;
+
+ beforeEach(function () {
+ return helpers
+ .startApplication({
+ args: ["js/electron.js"]
+ })
+ .then(function (startedApp) {
+ app = startedApp;
+ });
+ });
+
+ afterEach(function () {
+ return helpers.stopApplication(app);
+ });
+
+ describe("Default configuration", function () {
+ before(function () {
+ // Set config sample for use in test
+ process.env.MM_CONFIG_FILE = "tests/configs/modules/alert/default.js";
+ });
+
+ it("should show the welcome message", function () {
+ return app.client.waitUntilTextExists(".ns-box .ns-box-inner .light.bright.small", "Welcome, start was successful!", 10000);
+ });
+ });
+});
diff --git a/tests/e2e/modules/calendar_spec.js b/tests/e2e/modules/calendar_spec.js
index 34cc0164..097ce220 100644
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -76,6 +76,19 @@ describe("Calendar module", function () {
});
});
+ describe("Recurring event", function () {
+ before(function () {
+ // Set config sample for use in test
+ process.env.MM_CONFIG_FILE = "tests/configs/modules/calendar/recurring.js";
+ });
+
+ it("should show the recurring birthday event 6 times", async () => {
+ await app.client.waitUntilTextExists(".calendar", "Mar 25th", 10000);
+ const events = await app.client.$$(".calendar .event");
+ return expect(events.length).equals(6);
+ });
+ });
+
describe("Changed port", function () {
before(function () {
serverBasicAuth.listen(8010);
@@ -136,8 +149,8 @@ describe("Calendar module", function () {
serverBasicAuth.close(done());
});
- it("should return No upcoming events", function () {
- return app.client.waitUntilTextExists(".calendar", "No upcoming events.", 10000);
+ it("should show Unauthorized error", function () {
+ return app.client.waitUntilTextExists(".calendar", "Error in the calendar module. Authorization failed", 10000);
});
});
});
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index 46d74e8d..5ef491a3 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -8,7 +8,7 @@ const afterEach = global.afterEach;
describe("Clock set to spanish language module", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
beforeEach(function () {
return helpers
diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js
index 0f9e3878..27536dc2 100644
--- a/tests/e2e/modules/clock_spec.js
+++ b/tests/e2e/modules/clock_spec.js
@@ -10,7 +10,7 @@ const afterEach = global.afterEach;
describe("Clock module", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
beforeEach(function () {
return helpers
diff --git a/tests/e2e/modules/compliments_spec.js b/tests/e2e/modules/compliments_spec.js
index 8a9da41d..1eed2b8d 100644
--- a/tests/e2e/modules/compliments_spec.js
+++ b/tests/e2e/modules/compliments_spec.js
@@ -9,7 +9,7 @@ const afterEach = global.afterEach;
describe("Compliments module", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
beforeEach(function () {
return helpers
@@ -32,7 +32,7 @@ describe("Compliments module", function () {
});
it("if Morning compliments for that part of day", async function () {
- var hour = new Date().getHours();
+ const hour = new Date().getHours();
if (hour >= 3 && hour < 12) {
// if morning check
const elem = await app.client.$(".compliments");
@@ -43,9 +43,9 @@ describe("Compliments module", function () {
});
it("if Afternoon show Compliments for that part of day", async function () {
- var hour = new Date().getHours();
+ const hour = new Date().getHours();
if (hour >= 12 && hour < 17) {
- // if morning check
+ // if afternoon check
const elem = await app.client.$(".compliments");
return elem.getText(".compliments").then(function (text) {
expect(text).to.be.oneOf(["Hello", "Good Afternoon", "Afternoon test"]);
@@ -54,7 +54,7 @@ describe("Compliments module", function () {
});
it("if Evening show Compliments for that part of day", async function () {
- var hour = new Date().getHours();
+ const hour = new Date().getHours();
if (!(hour >= 3 && hour < 12) && !(hour >= 12 && hour < 17)) {
// if evening check
const elem = await app.client.$(".compliments");
diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js
index 21e33985..6a744e51 100644
--- a/tests/e2e/modules/helloworld_spec.js
+++ b/tests/e2e/modules/helloworld_spec.js
@@ -8,7 +8,7 @@ const afterEach = global.afterEach;
describe("Test helloworld module", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
beforeEach(function () {
return helpers
diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js
index dae3d86b..fc8c7122 100644
--- a/tests/e2e/modules/newsfeed_spec.js
+++ b/tests/e2e/modules/newsfeed_spec.js
@@ -1,4 +1,5 @@
const helpers = require("../global-setup");
+const expect = require("chai").expect;
const describe = global.describe;
const it = global.it;
@@ -36,6 +37,12 @@ describe("Newsfeed module", function () {
it("should show the newsfeed article", function () {
return app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "QPanel", 10000);
});
+
+ it("should NOT show the newsfeed description", async () => {
+ await app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "QPanel", 10000);
+ const events = await app.client.$$(".newsfeed .newsfeed-desc");
+ return expect(events.length).equals(0);
+ });
});
describe("Custom configuration", function () {
@@ -46,6 +53,12 @@ describe("Newsfeed module", function () {
it("should not show articles with prohibited words", function () {
return app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "Problema VirtualBox", 10000);
});
+
+ it("should show the newsfeed description", async () => {
+ await app.client.waitUntilTextExists(".newsfeed .newsfeed-title", "Problema VirtualBox", 10000);
+ const events = await app.client.$$(".newsfeed .newsfeed-desc");
+ return expect(events.length).equals(1);
+ });
});
describe("Invalid configuration", function () {
@@ -53,8 +66,8 @@ describe("Newsfeed module", function () {
process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/incorrect_url.js";
});
- it("should show invalid url warning", function () {
- return app.client.waitUntilTextExists(".newsfeed .small", "Error in the Newsfeed module. Incorrect url:", 10000);
+ it("should show malformed url warning", function () {
+ return app.client.waitUntilTextExists(".newsfeed .small", "Error in the Newsfeed module. Malformed url.", 10000);
});
});
});
diff --git a/tests/e2e/modules/weather_spec.js b/tests/e2e/modules/weather_spec.js
index cd386f3c..70c88512 100644
--- a/tests/e2e/modules/weather_spec.js
+++ b/tests/e2e/modules/weather_spec.js
@@ -139,7 +139,7 @@ describe("Weather module", function () {
const weather = generateWeather();
await setup({ template, data: weather });
- return getText(".weather .large.light span.bright", "1°C") && getText(".weather .normal.medium.feelslike span.dimmed", "Feels like -6°C");
+ return (await getText(".weather .large.light span.bright", "1°C")) && (await getText(".weather .normal.medium.feelslike span.dimmed", "Feels like -6°C"));
});
});
@@ -161,10 +161,10 @@ describe("Weather module", function () {
});
await setup({ template, data: weather });
- return getText(".weather .normal.medium span:nth-child(2)", "6 WSW") && getText(".weather .large.light span.bright", "34,7°") && getText(".weather .normal.medium.feelslike span.dimmed", "Feels like 22,0°");
+ return (await getText(".weather .normal.medium span:nth-child(2)", "6 WSW")) && (await getText(".weather .large.light span.bright", "34,7°")) && getText(".weather .normal.medium.feelslike span.dimmed", "Feels like 22,0°");
});
- it("should render decimalSymbol = ','", async function () {
+ it("should render custom decimalSymbol = ','", async function () {
const weather = generateWeather({
main: {
temp: (1.49 * 9) / 5 + 32,
@@ -177,7 +177,7 @@ describe("Weather module", function () {
});
await setup({ template, data: weather });
- return getText(".weather .normal.medium span:nth-child(3)", "93,7") && getText(".weather .large.light span.bright", "34,7°") && getText(".weather .normal.medium.feelslike span.dimmed", "Feels like 22,0°");
+ return (await getText(".weather .normal.medium span:nth-child(3)", "93,7")) && (await getText(".weather .large.light span.bright", "34,7°")) && getText(".weather .normal.medium.feelslike span.dimmed", "Feels like 22,0°");
});
});
});
@@ -201,7 +201,7 @@ describe("Weather module", function () {
const days = ["Today", "Tomorrow", "Sun", "Mon", "Tue"];
for (const [index, day] of days.entries()) {
- getText(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(1)`, day);
+ await getText(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(1)`, day);
}
});
@@ -212,7 +212,7 @@ describe("Weather module", function () {
const icons = ["day-cloudy", "rain", "day-sunny", "day-sunny", "day-sunny"];
for (const [index, icon] of icons.entries()) {
- getText(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(2) span.wi-${icon}`);
+ await getElement(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(2) span.wi-${icon}`);
}
});
@@ -223,7 +223,7 @@ describe("Weather module", function () {
const temperatures = ["24.4°", "21.0°", "22.9°", "23.4°", "20.6°"];
for (const [index, temp] of temperatures.entries()) {
- getText(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(3)`, temp);
+ await getText(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(3)`, temp);
}
});
@@ -234,7 +234,7 @@ describe("Weather module", function () {
const temperatures = ["15.3°", "13.6°", "13.8°", "13.9°", "10.9°"];
for (const [index, temp] of temperatures.entries()) {
- getText(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(4)`, temp);
+ await getText(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(4)`, temp);
}
});
@@ -274,5 +274,22 @@ describe("Weather module", function () {
expect(rows.length).to.be.equal(5);
});
});
+
+ describe("Forecast weather units", function () {
+ before(function () {
+ process.env.MM_CONFIG_FILE = "tests/configs/modules/weather/forecastweather_units.js";
+ });
+
+ it("should render custom decimalSymbol = '_'", async function () {
+ const weather = generateWeatherForecast();
+ await setup({ template, data: weather });
+
+ const temperatures = ["24_4°", "21_0°", "22_9°", "23_4°", "20_6°"];
+
+ for (const [index, temp] of temperatures.entries()) {
+ await getText(`.weather table.small tr:nth-child(${index + 1}) td:nth-child(3)`, temp);
+ }
+ });
+ });
});
});
diff --git a/tests/e2e/modules_display_spec.js b/tests/e2e/modules_display_spec.js
index 3dfcf26f..5ae06b6f 100644
--- a/tests/e2e/modules_display_spec.js
+++ b/tests/e2e/modules_display_spec.js
@@ -6,7 +6,7 @@ const it = global.it;
describe("Display of modules", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
beforeEach(function () {
return helpers
diff --git a/tests/e2e/modules_position_spec.js b/tests/e2e/modules_position_spec.js
index 8b86d8ad..7e8662be 100644
--- a/tests/e2e/modules_position_spec.js
+++ b/tests/e2e/modules_position_spec.js
@@ -6,7 +6,7 @@ const it = global.it;
describe("Position of modules", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
describe("Using helloworld", function () {
after(function () {
@@ -25,14 +25,11 @@ describe("Position of modules", 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"];
+ const 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 (var idx in positions) {
- position = positions[idx];
- className = position.replace("_", ".");
- it("show text in " + position, function () {
+ for (const position of positions) {
+ const className = position.replace("_", ".");
+ it("should show text in " + position, function () {
return app.client.$("." + className).then((result) => {
return result.getText("." + className).should.eventually.equal("Text in " + position);
});
diff --git a/tests/e2e/port_config.js b/tests/e2e/port_config.js
index 9f45f486..e32f577b 100644
--- a/tests/e2e/port_config.js
+++ b/tests/e2e/port_config.js
@@ -10,7 +10,7 @@ const afterEach = global.afterEach;
describe("port directive configuration", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
beforeEach(function () {
return helpers
diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js
index d31a2493..49499756 100644
--- a/tests/e2e/vendor_spec.js
+++ b/tests/e2e/vendor_spec.js
@@ -10,7 +10,7 @@ const after = global.after;
describe("Vendors", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
before(function () {
process.env.MM_CONFIG_FILE = "tests/configs/env.js";
@@ -31,7 +31,7 @@ describe("Vendors", function () {
const vendors = require(__dirname + "/../../vendor/vendor.js");
Object.keys(vendors).forEach((vendor) => {
it(`should return 200 HTTP code for vendor "${vendor}"`, function () {
- var urlVendor = "http://localhost:8080/vendor/" + vendors[vendor];
+ const urlVendor = "http://localhost:8080/vendor/" + vendors[vendor];
fetch(urlVendor).then((res) => {
expect(res.status).to.equal(200);
});
@@ -40,7 +40,7 @@ describe("Vendors", function () {
Object.keys(vendors).forEach((vendor) => {
it(`should return 404 HTTP code for vendor https://localhost/"${vendor}"`, function () {
- var urlVendor = "http://localhost:8080/" + vendors[vendor];
+ const urlVendor = "http://localhost:8080/" + vendors[vendor];
fetch(urlVendor).then((res) => {
expect(res.status).to.equal(404);
});
diff --git a/tests/e2e/without_modules.js b/tests/e2e/without_modules.js
index 050c8a84..637236ba 100644
--- a/tests/e2e/without_modules.js
+++ b/tests/e2e/without_modules.js
@@ -8,7 +8,7 @@ const afterEach = global.afterEach;
describe("Check configuration without modules", function () {
helpers.setupTimeout(this);
- var app = null;
+ let app = null;
beforeEach(function () {
return helpers
diff --git a/tests/unit/classes/utils_spec.js b/tests/unit/classes/utils_spec.js
index 82c9a2ff..d41411d9 100644
--- a/tests/unit/classes/utils_spec.js
+++ b/tests/unit/classes/utils_spec.js
@@ -4,7 +4,7 @@ const colors = require("colors/safe");
describe("Utils", function () {
describe("colors", function () {
- var colorsEnabled = colors.enabled;
+ const colorsEnabled = colors.enabled;
afterEach(function () {
colors.enabled = colorsEnabled;
diff --git a/tests/unit/functions/currentweather_spec.js b/tests/unit/functions/currentweather_spec.js
index 2a29002e..d5a96e3e 100644
--- a/tests/unit/functions/currentweather_spec.js
+++ b/tests/unit/functions/currentweather_spec.js
@@ -21,7 +21,7 @@ describe("Functions module currentweather", function () {
Module.definitions.currentweather.config.roundTemp = true;
});
- var values = [
+ const values = [
// index 0 value
// index 1 expect
[1, "1"],
@@ -45,7 +45,7 @@ describe("Functions module currentweather", function () {
Module.definitions.currentweather.config.roundTemp = false;
});
- var values = [
+ const values = [
// index 0 value
// index 1 expect
[1, "1.0"],
diff --git a/tests/unit/functions/weatherforecast_spec.js b/tests/unit/functions/weatherforecast_spec.js
index 96ddc77f..634bb488 100644
--- a/tests/unit/functions/weatherforecast_spec.js
+++ b/tests/unit/functions/weatherforecast_spec.js
@@ -1,7 +1,7 @@
/* eslint no-multi-spaces: 0 */
const expect = require("chai").expect;
const moment = require("moment-timezone");
-var data = require("../functions/weatherforecast_data.json");
+const data = require("../../configs/data/weatherforecast_data.json");
describe("Functions module weatherforecast", function () {
before(function () {
@@ -21,7 +21,7 @@ describe("Functions module weatherforecast", function () {
Module.definitions.weatherforecast.config.roundTemp = true;
});
- var values = [
+ const values = [
// index 0 value
// index 1 expect
[1, "1"],
@@ -45,7 +45,7 @@ describe("Functions module weatherforecast", function () {
Module.definitions.weatherforecast.config.roundTemp = false;
});
- var values = [
+ const values = [
// index 0 value
// index 1 expect
[1, "1.0"],
@@ -71,8 +71,8 @@ describe("Functions module weatherforecast", function () {
error: function () {}
};
- var originalLocale;
- var originalTimeZone;
+ let originalLocale;
+ let originalTimeZone;
before(function () {
originalLocale = moment.locale();
originalTimeZone = moment.tz.guess();
diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js
index c48bfc55..dc44b270 100644
--- a/tests/unit/global_vars/root_path_spec.js
+++ b/tests/unit/global_vars/root_path_spec.js
@@ -4,11 +4,11 @@ const expect = require("chai").expect;
const vm = require("vm");
before(function () {
- var basedir = path.join(__dirname, "../../..");
+ const basedir = path.join(__dirname, "../../..");
- var fileName = "js/app.js";
- var filePath = path.join(basedir, fileName);
- var code = fs.readFileSync(filePath);
+ const fileName = "js/app.js";
+ const filePath = path.join(basedir, fileName);
+ const code = fs.readFileSync(filePath);
this.sandbox = {
module: {},
@@ -41,7 +41,7 @@ after(function () {
});
describe("'global.root_path' set in js/app.js", function () {
- var expectedSubPaths = ["modules", "serveronly", "js", "js/app.js", "js/main.js", "js/electron.js", "config"];
+ const expectedSubPaths = ["modules", "serveronly", "js", "js/app.js", "js/main.js", "js/electron.js", "config"];
expectedSubPaths.forEach((subpath) => {
it(`contains a file/folder "${subpath}"`, function () {
diff --git a/translations/de.json b/translations/de.json
index 3e3d9ade..cacbe2bd 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -26,6 +26,7 @@
"NNW": "NNW",
"FEELS": "Gefühlt {DEGREE}",
+ "PRECIP": "Niederschlagswahrscheinlichkeit",
"MODULE_CONFIG_CHANGED": "Die Konfigurationsoptionen für das {MODULE_NAME} Modul haben sich geändert. \nBitte überprüfen Sie die Dokumentation.",
"MODULE_CONFIG_ERROR": "Fehler im {MODULE_NAME} Modul. {ERROR}",
diff --git a/translations/en.json b/translations/en.json
index 9710d781..5959fc82 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -30,6 +30,10 @@
"MODULE_CONFIG_CHANGED": "The configuration options for the {MODULE_NAME} module have changed.\nPlease check the documentation.",
"MODULE_CONFIG_ERROR": "Error in the {MODULE_NAME} module. {ERROR}",
+ "MODULE_ERROR_MALFORMED_URL": "Malformed url.",
+ "MODULE_ERROR_NO_CONNECTION": "No internet connection.",
+ "MODULE_ERROR_UNAUTHORIZED": "Authorization failed.",
+ "MODULE_ERROR_UNSPECIFIED": "Check logs for more details.",
"UPDATE_NOTIFICATION": "MagicMirror² update available.",
"UPDATE_NOTIFICATION_MODULE": "Update available for {MODULE_NAME} module.",
diff --git a/translations/fr.json b/translations/fr.json
index 8aafdc44..97cccc59 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -26,8 +26,10 @@
"NNW": "NNO",
"FEELS": "Ressenti {DEGREE}",
+ "PRECIP": "Probabilité de précipitations",
"MODULE_CONFIG_CHANGED": "Les options de configuration du module {MODULE_NAME} ont changé. \nVeuillez consulter la documentation.",
+ "MODULE_CONFIG_ERROR": "Erreur dans le module {MODULE_NAME}. {ERROR}",
"UPDATE_NOTIFICATION": "Une mise à jour de MagicMirror² est disponible",
"UPDATE_NOTIFICATION_MODULE": "Une mise à jour est disponible pour le module {MODULE_NAME} .",
diff --git a/vendor/vendor.js b/vendor/vendor.js
index 8b146a7b..69d300e8 100755
--- a/vendor/vendor.js
+++ b/vendor/vendor.js
@@ -4,7 +4,7 @@
* By Michael Teeuw https://michaelteeuw.nl
* MIT Licensed.
*/
-var vendor = {
+const vendor = {
"moment.js": "node_modules/moment/min/moment-with-locales.js",
"moment-timezone.js": "node_modules/moment-timezone/builds/moment-timezone-with-data.js",
"weather-icons.css": "node_modules/weathericons/css/weather-icons.css",
- 
**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).
@@ -23,6 +22,7 @@ For the full documentation including **[installation instructions](https://docs.
- 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)
+ - Technical discussions: https://forum.magicmirror.builders/category/11/core-system
- Discord: [https://discord.gg/J5BAtvx](https://discord.gg/J5BAtvx)
- Blog: [https://michaelteeuw.nl/tagged/magicmirror](https://michaelteeuw.nl/tagged/magicmirror)
- Donations: [https://magicmirror.builders/#donate](https://magicmirror.builders/#donate)
diff --git a/clientonly/index.js b/clientonly/index.js
index 3564eef8..1a0a7970 100644
--- a/clientonly/index.js
+++ b/clientonly/index.js
@@ -2,7 +2,7 @@
// Use separate scope to prevent global scope pollution
(function () {
- var config = {};
+ const config = {};
/**
* Helper function to get server address/hostname from either the commandline or env
@@ -17,8 +17,8 @@
* @returns {string} the value of the parameter
*/
function getCommandLineParameter(key, defaultValue = undefined) {
- var index = process.argv.indexOf(`--${key}`);
- var value = index > -1 ? process.argv[index + 1] : undefined;
+ const index = process.argv.indexOf(`--${key}`);
+ const value = index > -1 ? process.argv[index + 1] : undefined;
return value !== undefined ? String(value) : defaultValue;
}
@@ -43,7 +43,7 @@
// Select http or https module, depending on requested url
const lib = url.startsWith("https") ? require("https") : require("http");
const request = lib.get(url, (response) => {
- var configData = "";
+ let configData = "";
// Gather incoming data
response.on("data", function (chunk) {
@@ -79,15 +79,15 @@
getServerAddress();
(config.address && config.port) || fail();
- var prefix = config.tls ? "https://" : "http://";
+ const 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(`${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 };
+ const env = Object.create(process.env);
+ const options = { env: env };
configReturn.address = config.address;
configReturn.port = config.port;
configReturn.tls = config.tls;
diff --git a/config/config.js.sample b/config/config.js.sample
index e17ae195..e221b5ed 100644
--- a/config/config.js.sample
+++ b/config/config.js.sample
@@ -7,8 +7,7 @@
* See https://github.com/MichMich/MagicMirror#configuration
*
*/
-
-var config = {
+let 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
diff --git a/css/custom.css.sample b/css/custom.css.sample
new file mode 100644
index 00000000..ac5b5e2e
--- /dev/null
+++ b/css/custom.css.sample
@@ -0,0 +1,31 @@
+/* Magic Mirror Custom CSS Sample
+ *
+ * Change color and fonts here.
+ *
+ * Beware that properties cannot be unitless, so for example write '--gap-body: 0px;' instead of just '--gap-body: 0;'
+ *
+ * MIT Licensed.
+ */
+
+/* Uncomment and adjust accordingly if you want to import another font from the google-fonts-api: */
+/* @import url('https://fonts.googleapis.com/css2?family=Poppins:wght@100;300;400;700&display=swap'); */
+
+:root {
+ --color-text: #999;
+ --color-text-dimmed: #666;
+ --color-text-bright: #fff;
+ --color-background: black;
+
+ --font-primary: "Roboto Condensed";
+ --font-secondary: "Roboto";
+
+ --font-size: 20px;
+ --font-size-small: 0.75rem;
+
+ --gap-body-top: 60px;
+ --gap-body-right: 60px;
+ --gap-body-bottom: 60px;
+ --gap-body-left: 60px;
+
+ --gap-modules: 30px;
+}
diff --git a/css/main.css b/css/main.css
index 16c281be..a36ca5e4 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,8 +1,29 @@
+:root {
+ --color-text: #999;
+ --color-text-dimmed: #666;
+ --color-text-bright: #fff;
+ --color-background: #000;
+
+ --font-primary: "Roboto Condensed";
+ --font-secondary: "Roboto";
+
+ --font-size: 20px;
+ --font-size-small: 0.75rem;
+
+ --gap-body-top: 60px;
+ --gap-body-right: 60px;
+ --gap-body-bottom: 60px;
+ --gap-body-left: 60px;
+
+ --gap-modules: 30px;
+}
+
html {
cursor: none;
overflow: hidden;
- background: #000;
+ background: var(--color-background);
user-select: none;
+ font-size: var(--font-size);
}
::-webkit-scrollbar {
@@ -10,16 +31,15 @@ html {
}
body {
- margin: 60px;
+ margin: var(--gap-body-top) var(--gap-body-right) var(--gap-body-bottom) var(--gap-body-left);
position: absolute;
- height: calc(100% - 120px);
- width: calc(100% - 120px);
- background: #000;
- color: #aaa;
- font-family: "Roboto Condensed", sans-serif;
+ height: calc(100% - var(--gap-body-top) - var(--gap-body-bottom));
+ width: calc(100% - var(--gap-body-right) - var(--gap-body-left));
+ background: var(--color-background);
+ color: var(--color-text);
+ font-family: var(--font-primary), sans-serif;
font-weight: 400;
- font-size: 2em;
- line-height: 1.5em;
+ line-height: 1.5;
-webkit-font-smoothing: antialiased;
}
@@ -28,60 +48,60 @@ body {
*/
.dimmed {
- color: #666;
+ color: var(--color-text-dimmed);
}
.normal {
- color: #999;
+ color: var(--color-text);
}
.bright {
- color: #fff;
+ color: var(--color-text-bright);
}
.xsmall {
- font-size: 15px;
- line-height: 20px;
+ font-size: var(--font-size-small);
+ line-height: 1.275;
}
.small {
- font-size: 20px;
- line-height: 25px;
+ font-size: 1rem;
+ line-height: 1.25;
}
.medium {
- font-size: 30px;
- line-height: 35px;
+ font-size: 1.5rem;
+ line-height: 1.225;
}
.large {
- font-size: 65px;
- line-height: 65px;
+ font-size: 3.25rem;
+ line-height: 1;
}
.xlarge {
- font-size: 75px;
- line-height: 75px;
+ font-size: 3.75rem;
+ line-height: 1;
letter-spacing: -3px;
}
.thin {
- font-family: Roboto, sans-serif;
+ font-family: var(--font-secondary), sans-serif;
font-weight: 100;
}
.light {
- font-family: "Roboto Condensed", sans-serif;
+ font-family: var(--font-primary), sans-serif;
font-weight: 300;
}
.regular {
- font-family: "Roboto Condensed", sans-serif;
+ font-family: var(--font-primary), sans-serif;
font-weight: 400;
}
.bold {
- font-family: "Roboto Condensed", sans-serif;
+ font-family: var(--font-primary), sans-serif;
font-weight: 700;
}
@@ -95,14 +115,14 @@ body {
header {
text-transform: uppercase;
- font-size: 15px;
- font-family: "Roboto Condensed", Arial, Helvetica, sans-serif;
+ font-size: var(--font-size-small);
+ font-family: var(--font-primary), Arial, Helvetica, sans-serif;
font-weight: 400;
- border-bottom: 1px solid #666;
+ border-bottom: 1px solid var(--color-text-dimmed);
line-height: 15px;
padding-bottom: 5px;
margin-bottom: 10px;
- color: #999;
+ color: var(--color-text);
}
sup {
@@ -115,11 +135,11 @@ sup {
*/
.module {
- margin-bottom: 30px;
+ margin-bottom: var(--gap-modules);
}
.region.bottom .module {
- margin-top: 30px;
+ margin-top: var(--gap-modules);
margin-bottom: 0;
}
@@ -143,10 +163,10 @@ sup {
.region.fullscreen {
position: absolute;
- top: -60px;
- left: -60px;
- right: -60px;
- bottom: -60px;
+ top: calc(-1 * var(--gap-body-top));
+ left: calc(-1 * var(--gap-body-left));
+ right: calc(-1 * var(--gap-body-right));
+ bottom: calc(-1 * var(--gap-body-bottom));
pointer-events: none;
}
@@ -163,18 +183,6 @@ sup {
top: 0;
}
-.region.top .container {
- margin-bottom: 25px;
-}
-
-.region.bottom .container {
- margin-top: 25px;
-}
-
-.region.top .container:empty {
- margin-bottom: 0;
-}
-
.region.top.center,
.region.bottom.center {
left: 50%;
@@ -191,10 +199,6 @@ sup {
bottom: 0;
}
-.region.bottom .container:empty {
- margin-top: 0;
-}
-
.region.bottom.right,
.region.bottom.center,
.region.bottom.left {
diff --git a/fonts/package-lock.json b/fonts/package-lock.json
index 960e793a..2f944edf 100644
--- a/fonts/package-lock.json
+++ b/fonts/package-lock.json
@@ -1,12 +1,12 @@
{
- "name": "magicmirror-fonts",
- "requires": true,
- "lockfileVersion": 1,
- "dependencies": {
- "roboto-fontface": {
- "version": "0.10.0",
- "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz",
- "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="
- }
- }
+ "name": "magicmirror-fonts",
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+ "roboto-fontface": {
+ "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/index.html b/index.html
index 5a46bb72..c9f2239c 100644
--- a/index.html
+++ b/index.html
@@ -1,55 +1,57 @@
-
- 
Ya está disponible la versión 0.13.0 de QPanel
+ 
Ya con la release numero 28 la nueva versión 0.10.0 de QPanel ya está disponible.
+ 
El Panel monitor callcenter para colas de Asterisk ya cuenta con una nueva versión, la 0.9.0
+ 