From 0bc119825d073fa002408b2c04bf1c968cf7e8b8 Mon Sep 17 00:00:00 2001 From: Sudipto Choudhury Date: Mon, 14 Sep 2020 13:51:12 +0530 Subject: [PATCH 1/4] Fix Timezone offset format for offsets with decimal parts --- src/fns.js | 6 ++++-- src/methods/format/_offset.js | 27 +-------------------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/src/fns.js b/src/fns.js index e0701132..dccb0ee6 100644 --- a/src/fns.js +++ b/src/fns.js @@ -76,7 +76,9 @@ exports.beADate = (d, s) => { } exports.formatTimezone = (offset, delimiter = '') => { - const absOffset = Math.abs(offset) const sign = offset > 0 ? '+' : '-' - return `${sign}${exports.zeroPad(absOffset)}${delimiter}00` + const absOffset = Math.abs(offset) + const hours = exports.zeroPad(parseInt('' + absOffset, 10)) + const minutes = exports.zeroPad(absOffset % 1 * 60) + return `${sign}${hours}${delimiter}${minutes}` } diff --git a/src/methods/format/_offset.js b/src/methods/format/_offset.js index 03e51cad..bba742c3 100644 --- a/src/methods/format/_offset.js +++ b/src/methods/format/_offset.js @@ -5,32 +5,7 @@ const fns = require('../../fns') // "+01:00", "+0100", or simply "+01" const isoOffset = s => { let offset = s.timezone().current.offset - const isNegative = offset < 0 - let minute = '00' - //handle 5.5 → '5:30' - if (Math.abs(offset % 1) === 0.5) { - minute = '30' - if (offset >= 0) { - offset = Math.floor(offset) - } else { - offset = Math.ceil(offset) - } - } - if (isNegative) { - //handle negative sign - offset *= -1 - offset = fns.zeroPad(offset, 2) - offset = '-' + offset - } else { - offset = fns.zeroPad(offset, 2) - offset = '+' + offset - } - offset = offset + ':' + minute - //'Z' means 00 - if (offset === '+00:00') { - offset = 'Z' - } - return offset + return !offset ? 'Z' : fns.formatTimezone(offset) } module.exports = isoOffset From 34748bee442b59d0e2da0c484e1e1f976c0f1830 Mon Sep 17 00:00:00 2001 From: Sudipto Choudhury Date: Mon, 14 Sep 2020 14:11:21 +0530 Subject: [PATCH 2/4] Fix missing delimiter for ISO offset format --- src/methods/format/_offset.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/methods/format/_offset.js b/src/methods/format/_offset.js index bba742c3..75e3e7e0 100644 --- a/src/methods/format/_offset.js +++ b/src/methods/format/_offset.js @@ -5,7 +5,7 @@ const fns = require('../../fns') // "+01:00", "+0100", or simply "+01" const isoOffset = s => { let offset = s.timezone().current.offset - return !offset ? 'Z' : fns.formatTimezone(offset) + return !offset ? 'Z' : fns.formatTimezone(offset, ':') } module.exports = isoOffset From 6fd41f87ece7bb0867abb5169ca8127a9ba53209 Mon Sep 17 00:00:00 2001 From: spencer kelly Date: Mon, 14 Sep 2020 16:53:24 -0400 Subject: [PATCH 3/4] add test for #226 --- package.json | 2 +- scratch.js | 7 +++++-- test/format.test.js | 6 ++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d0a1c016..976f122e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "spacetime", - "version": "6.6.3", + "version": "6.6.4", "description": "figure-out dates across timezones", "main": "builds/spacetime.js", "unpkg": "builds/spacetime.min.js", diff --git a/scratch.js b/scratch.js index 83986405..cc83ff49 100644 --- a/scratch.js +++ b/scratch.js @@ -3,8 +3,11 @@ const spacetime = require('./src/index') // let s = spacetime([2020, 1, 29]) // console.log(s.format()) -let s = spacetime('now', null, { today: { year: 2012 } }) -console.log(s.format()) +// let s = spacetime('now', null, { today: { year: 2012 } }) +// console.log(s.format()) + +const date = spacetime(null, 'Asia/Kathmandu') +console.log(date.format('offset')) // let a = spacetime(null, 'Canada/Eastern') // let b = spacetime(Date.now(), 'Canada/Eastern') diff --git a/test/format.test.js b/test/format.test.js index 3312fc5b..e9484636 100644 --- a/test/format.test.js +++ b/test/format.test.js @@ -146,6 +146,12 @@ test('test 0-based formatting', (t) => { t.end() }) +test('offset formatting', (t) => { + const date = spacetime(null, 'Asia/Kathmandu') + t.equal(date.format('offset'), '+05:45', '45min offset') + t.end() +}) + /* FIXME failing test test('unix-fmt-padding', t => { let d = spacetime({ From e0673e89ed11e9cdb1e6f760c11a3af660f38914 Mon Sep 17 00:00:00 2001 From: spencer kelly Date: Mon, 14 Sep 2020 16:55:56 -0400 Subject: [PATCH 4/4] 6.6.4rc --- _version.js | 2 +- builds/spacetime.js | 41 +-- builds/spacetime.min.js | 2 +- builds/spacetime.mjs | 41 +-- changelog.md | 5 + package-lock.json | 593 ++++++++++++++-------------------------- package.json | 8 +- 7 files changed, 229 insertions(+), 463 deletions(-) diff --git a/_version.js b/_version.js index 23af31c4..3a7dbba3 100644 --- a/_version.js +++ b/_version.js @@ -1 +1 @@ -module.exports = '6.6.3' \ No newline at end of file +module.exports = '6.6.4' \ No newline at end of file diff --git a/builds/spacetime.js b/builds/spacetime.js index 18860973..ab276adc 100644 --- a/builds/spacetime.js +++ b/builds/spacetime.js @@ -1,4 +1,4 @@ -/* spencermountain/spacetime 6.6.3 Apache 2.0 */ +/* spencermountain/spacetime 6.6.4 Apache 2.0 */ (function (global, factory) { typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : typeof define === 'function' && define.amd ? define(factory) : @@ -118,9 +118,11 @@ exports.formatTimezone = function (offset) { var delimiter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; - var absOffset = Math.abs(offset); var sign = offset > 0 ? '+' : '-'; - return "".concat(sign).concat(exports.zeroPad(absOffset)).concat(delimiter, "00"); + var absOffset = Math.abs(offset); + var hours = exports.zeroPad(parseInt('' + absOffset, 10)); + var minutes = exports.zeroPad(absOffset % 1 * 60); + return "".concat(sign).concat(hours).concat(delimiter).concat(minutes); }; }); var fns_1 = fns.isLeapYear; @@ -1390,36 +1392,7 @@ var isoOffset = function isoOffset(s) { var offset = s.timezone().current.offset; - var isNegative = offset < 0; - var minute = '00'; //handle 5.5 → '5:30' - - if (Math.abs(offset % 1) === 0.5) { - minute = '30'; - - if (offset >= 0) { - offset = Math.floor(offset); - } else { - offset = Math.ceil(offset); - } - } - - if (isNegative) { - //handle negative sign - offset *= -1; - offset = fns.zeroPad(offset, 2); - offset = '-' + offset; - } else { - offset = fns.zeroPad(offset, 2); - offset = '+' + offset; - } - - offset = offset + ':' + minute; //'Z' means 00 - - if (offset === '+00:00') { - offset = 'Z'; - } - - return offset; + return !offset ? 'Z' : fns.formatTimezone(offset, ':'); }; var _offset = isoOffset; @@ -4072,7 +4045,7 @@ var whereIts_1 = whereIts; - var _version = '6.6.3'; + var _version = '6.6.4'; var main$1 = function main(input, tz, options) { return new spacetime(input, tz, options); diff --git a/builds/spacetime.min.js b/builds/spacetime.min.js index 32daeb20..77924469 100644 --- a/builds/spacetime.min.js +++ b/builds/spacetime.min.js @@ -1 +1 @@ -!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).spacetime=n()}(this,(function(){"use strict";var e,n=function(e,n){return e(n={exports:{}},n.exports),n.exports}((function(e,n){n.isLeapYear=function(e){return e%4==0&&e%100!=0||e%400==0},n.isDate=function(e){return"[object Date]"===Object.prototype.toString.call(e)&&!isNaN(e.valueOf())},n.isArray=function(e){return"[object Array]"===Object.prototype.toString.call(e)},n.isObject=function(e){return"[object Object]"===Object.prototype.toString.call(e)},n.zeroPad=function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:2,t="0";return(e+="").length>=n?e:new Array(n-e.length+1).join(t)+e},n.titleCase=function(e){return e?e[0].toUpperCase()+e.substr(1):""},n.ordinal=function(e){var n=e%10,t=e%100;return 1===n&&11!==t?e+"st":2===n&&12!==t?e+"nd":3===n&&13!==t?e+"rd":e+"th"},n.toCardinal=function(e){return e=(e=String(e)).replace(/([0-9])(st|nd|rd|th)$/i,"$1"),parseInt(e,10)},n.normalize=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return"day"===(e=(e=(e=(e=e.toLowerCase().trim()).replace(/ies$/,"y")).replace(/s$/,"")).replace(/-/g,""))?"date":e},n.getEpoch=function(e){return"number"==typeof e?e:n.isDate(e)?e.getTime():e.epoch?e.epoch:null},n.beADate=function(e,t){return!1===n.isObject(e)?t.clone().set(e):e},n.formatTimezone=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=Math.abs(e),a=e>0?"+":"-";return"".concat(a).concat(n.zeroPad(r)).concat(t,"00")}})),t=(n.isLeapYear,n.isDate,n.isArray,n.isObject,n.zeroPad,n.titleCase,n.ordinal,n.toCardinal,n.normalize,n.getEpoch,n.beADate,n.formatTimezone,n.zeroPad),r=function(e,n,r,a){var o=new Date(e),i=(o.getTimezoneOffset()||0)+60*a;i=60*i*1e3;var u=function(e){return t(e.getMonth()+1)+"/"+t(e.getDate())+":"+t(e.getHours())}(o=new Date(e+i));return u>=n&&u");return!0===r(e.epoch,o[0],o[1],t)?t:a},o=["africa","america","asia","atlantic","australia","brazil","canada","chile","europe","indian","mexico","pacific","antarctica","etc"],i=(e=Object.freeze({__proto__:null,default:{"9|s":"2/dili,2/jayapura","9|n":"2/chita,2/khandyga,2/pyongyang,2/seoul,2/tokyo,11/palau","9.5|s|04/05:03->10/04:02":"4/adelaide,4/broken_hill,4/south,4/yancowinna","9.5|s":"4/darwin,4/north","8|s":"12/casey,2/kuala_lumpur,2/makassar,2/singapore,4/perth,4/west","8|n|03/25:03->09/29:23":"2/ulan_bator","8|n":"2/brunei,2/choibalsan,2/chongqing,2/chungking,2/harbin,2/hong_kong,2/irkutsk,2/kuching,2/macao,2/macau,2/manila,2/shanghai,2/taipei,2/ujung_pandang,2/ulaanbaatar","8.75|s":"4/eucla","7|s":"12/davis,2/jakarta,9/christmas","7|n":"2/bangkok,2/barnaul,2/ho_chi_minh,2/hovd,2/krasnoyarsk,2/novokuznetsk,2/novosibirsk,2/phnom_penh,2/pontianak,2/saigon,2/tomsk,2/vientiane","6|s":"12/vostok","6|n":"2/almaty,2/bishkek,2/dacca,2/dhaka,2/kashgar,2/omsk,2/qyzylorda,2/thimbu,2/thimphu,2/urumqi,9/chagos","6.5|n":"2/rangoon,2/yangon,9/cocos","5|s":"12/mawson,9/kerguelen","5|n":"2/aqtau,2/aqtobe,2/ashgabat,2/ashkhabad,2/atyrau,2/baku,2/dushanbe,2/karachi,2/oral,2/samarkand,2/tashkent,2/yekaterinburg,9/maldives","5.75|n":"2/kathmandu,2/katmandu","5.5|n":"2/calcutta,2/colombo,2/kolkata","4|s":"9/reunion","4|n":"2/dubai,2/muscat,2/tbilisi,2/yerevan,8/astrakhan,8/samara,8/saratov,8/ulyanovsk,8/volgograd,2/volgograd,9/mahe,9/mauritius","4.5|n|03/21:00->09/20:24":"2/tehran","4.5|n":"2/kabul","3|s":"12/syowa,9/antananarivo","3|n|03/29:03->10/25:04":"2/famagusta,2/nicosia,8/athens,8/bucharest,8/helsinki,8/kiev,8/mariehamn,8/nicosia,8/riga,8/sofia,8/tallinn,8/uzhgorod,8/vilnius,8/zaporozhye","3|n|03/29:02->10/25:03":"8/chisinau,8/tiraspol","3|n|03/29:00->10/24:24":"2/beirut","3|n|03/27:02->10/25:02":"2/jerusalem,2/tel_aviv","3|n|03/27:00->10/31:01":"2/gaza,2/hebron","3|n|03/27:00->10/30:01":"2/amman","3|n|03/27:00->10/29:24":"2/damascus","3|n":"0/addis_ababa,0/asmara,0/asmera,0/dar_es_salaam,0/djibouti,0/juba,0/kampala,0/mogadishu,0/nairobi,2/aden,2/baghdad,2/bahrain,2/istanbul,2/kuwait,2/qatar,2/riyadh,8/istanbul,8/kirov,8/minsk,8/moscow,8/simferopol,9/comoro,9/mayotte","2|s|03/29:02->10/25:02":"12/troll","2|s":"0/gaborone,0/harare,0/johannesburg,0/lubumbashi,0/lusaka,0/maputo,0/maseru,0/mbabane","2|n|03/29:02->10/25:03":"0/ceuta,arctic/longyearbyen,3/jan_mayen,8/amsterdam,8/andorra,8/belgrade,8/berlin,8/bratislava,8/brussels,8/budapest,8/busingen,8/copenhagen,8/gibraltar,8/ljubljana,8/luxembourg,8/madrid,8/malta,8/monaco,8/oslo,8/paris,8/podgorica,8/prague,8/rome,8/san_marino,8/sarajevo,8/skopje,8/stockholm,8/tirane,8/vaduz,8/vatican,8/vienna,8/warsaw,8/zagreb,8/zurich","2|n":"0/blantyre,0/bujumbura,0/cairo,0/khartoum,0/kigali,0/tripoli,8/kaliningrad","1|s|04/02:01->09/03:03":"0/windhoek","1|s":"0/kinshasa,0/luanda","1|n|04/19:03->05/31:02":"0/casablanca,0/el_aaiun","1|n|03/29:01->10/25:02":"3/canary,3/faeroe,3/faroe,3/madeira,8/belfast,8/dublin,8/guernsey,8/isle_of_man,8/jersey,8/lisbon,8/london","1|n":"0/algiers,0/bangui,0/brazzaville,0/douala,0/lagos,0/libreville,0/malabo,0/ndjamena,0/niamey,0/porto-novo,0/tunis","14|n":"11/kiritimati","13|s|04/05:04->09/27:03":"11/apia","13|s|01/15:02->11/05:03":"11/tongatapu","13|n":"11/enderbury,11/fakaofo","12|s|04/05:03->09/27:02":"12/mcmurdo,12/south_pole,11/auckland","12|s|01/12:03->11/08:02":"11/fiji","12|n":"2/anadyr,2/kamchatka,2/srednekolymsk,11/funafuti,11/kwajalein,11/majuro,11/nauru,11/tarawa,11/wake,11/wallis","12.75|s|04/05:03->04/05:02":"11/chatham","11|s":"12/macquarie,11/bougainville","11|n":"2/magadan,2/sakhalin,11/efate,11/guadalcanal,11/kosrae,11/noumea,11/pohnpei,11/ponape","11.5|n|04/05:03->10/04:02":"11/norfolk","10|s|04/05:03->10/04:02":"4/act,4/canberra,4/currie,4/hobart,4/melbourne,4/nsw,4/sydney,4/tasmania,4/victoria","10|s":"12/dumontdurville,4/brisbane,4/lindeman,4/queensland","10|n":"2/ust-nera,2/vladivostok,2/yakutsk,11/chuuk,11/guam,11/port_moresby,11/saipan,11/truk,11/yap","10.5|s|04/05:01->10/04:02":"4/lhi,4/lord_howe","0|n|03/29:00->10/25:01":"1/scoresbysund,3/azores","0|n":"0/abidjan,0/accra,0/bamako,0/banjul,0/bissau,0/conakry,0/dakar,0/freetown,0/lome,0/monrovia,0/nouakchott,0/ouagadougou,0/sao_tome,0/timbuktu,1/danmarkshavn,3/reykjavik,3/st_helena,13/gmt,13/gmt+0,13/gmt-0,13/gmt0,13/greenwich,13/utc,13/universal,13/zulu","-9|n|03/08:02->11/01:02":"1/adak,1/atka","-9|n":"11/gambier","-9.5|n":"11/marquesas","-8|n|03/08:02->11/01:02":"1/anchorage,1/juneau,1/metlakatla,1/nome,1/sitka,1/yakutat","-8|n":"11/pitcairn","-7|n|03/08:02->11/01:02":"1/dawson,1/ensenada,1/los_angeles,1/santa_isabel,1/tijuana,1/vancouver,1/whitehorse,6/pacific,6/yukon,10/bajanorte","-7|n":"1/creston,1/dawson_creek,1/hermosillo,1/phoenix","-6|s|04/04:22->09/05:22":"7/easterisland,11/easter","-6|n|04/05:02->10/25:02":"1/chihuahua,1/mazatlan,10/bajasur","-6|n|03/08:02->11/01:02":"1/boise,1/cambridge_bay,1/denver,1/edmonton,1/inuvik,1/ojinaga,1/shiprock,1/yellowknife,6/mountain","-6|n":"1/belize,1/costa_rica,1/el_salvador,1/guatemala,1/managua,1/regina,1/swift_current,1/tegucigalpa,6/east-saskatchewan,6/saskatchewan,11/galapagos","-5|s":"1/lima,1/rio_branco,5/acre","-5|n|04/05:02->10/25:02":"1/bahia_banderas,1/merida,1/mexico_city,1/monterrey,10/general","-5|n|03/12:03->11/05:01":"1/north_dakota","-5|n|03/08:02->11/01:02":"1/chicago,1/knox_in,1/matamoros,1/menominee,1/rainy_river,1/rankin_inlet,1/resolute,1/winnipeg,6/central","-5|n":"1/atikokan,1/bogota,1/cancun,1/cayman,1/coral_harbour,1/eirunepe,1/guayaquil,1/jamaica,1/panama,1/porto_acre","-4|s|05/13:23->08/13:01":"12/palmer","-4|s|04/04:24->09/06:00":"1/santiago,7/continental","-4|s|03/21:24->10/04:00":"1/asuncion","-4|s|02/16:24->11/03:00":"1/campo_grande,1/cuiaba","-4|s":"1/la_paz,1/manaus,5/west","-4|n|03/12:03->11/05:01":"1/indiana,1/kentucky","-4|n|03/08:02->11/01:02":"1/detroit,1/fort_wayne,1/grand_turk,1/indianapolis,1/iqaluit,1/louisville,1/montreal,1/nassau,1/new_york,1/nipigon,1/pangnirtung,1/port-au-prince,1/thunder_bay,1/toronto,6/eastern","-4|n|03/08:00->11/01:01":"1/havana","-4|n":"1/anguilla,1/antigua,1/aruba,1/barbados,1/blanc-sablon,1/boa_vista,1/caracas,1/curacao,1/dominica,1/grenada,1/guadeloupe,1/guyana,1/kralendijk,1/lower_princes,1/marigot,1/martinique,1/montserrat,1/port_of_spain,1/porto_velho,1/puerto_rico,1/santo_domingo,1/st_barthelemy,1/st_kitts,1/st_lucia,1/st_thomas,1/st_vincent,1/tortola,1/virgin","-3|s":"1/argentina,1/buenos_aires,1/cordoba,1/fortaleza,1/montevideo,1/punta_arenas,1/sao_paulo,12/rothera,3/stanley,5/east","-3|n|03/08:02->11/01:02":"1/glace_bay,1/goose_bay,1/halifax,1/moncton,1/thule,3/bermuda,6/atlantic","-3|n":"1/araguaina,1/bahia,1/belem,1/catamarca,1/cayenne,1/jujuy,1/maceio,1/mendoza,1/paramaribo,1/recife,1/rosario,1/santarem","-2|s":"5/denoronha","-2|n|03/28:22->10/24:23":"1/godthab","-2|n|03/08:02->11/01:02":"1/miquelon","-2|n":"1/noronha,3/south_georgia","-2.5|n|03/08:02->11/01:02":"1/st_johns,6/newfoundland","-1|n":"3/cape_verde","-11|n":"11/midway,11/niue,11/pago_pago,11/samoa","-10|n":"11/honolulu,11/johnston,11/rarotonga,11/tahiti"}}))&&e.default||e,u={};Object.keys(i).forEach((function(e){var n=e.split("|"),t={offset:Number(n[0]),hem:n[1]};n[2]&&(t.dst=n[2]),i[e].split(",").forEach((function(e){e=e.replace(/(^[0-9]+)\//,(function(e,n){return n=Number(n),o[n]+"/"})),u[e]=t}))})),u.utc={offset:0,hem:"n"};for(var s=-14;s<=14;s+=.5){var c=s;c>0&&(c="+"+c);var h="etc/gmt"+c;u[h]={offset:-1*s,hem:"n"},u[h="utc/gmt"+c]={offset:-1*s,hem:"n"}}var d=u,f=/(\-?[0-9]+)h(rs)?/i,l=/(\-?[0-9]+)/,m=/utc([\-+]?[0-9]+)/i,p=/gmt([\-+]?[0-9]+)/i,y=function(e){return(e=Number(e))>-13&&e<13?"etc/gmt"+(e=((e*=-1)>0?"+":"")+e):null},v=function(e){var n=e.match(f);if(null!==n)return y(n[1]);if(null!==(n=e.match(m)))return y(n[1]);if(null!==(n=e.match(p))){var t=-1*Number(n[1]);return y(t)}return null!==(n=e.match(l))?y(n[1]):null},g=function(){var e=function(){if("undefined"==typeof Intl||void 0===Intl.DateTimeFormat)return null;var e=Intl.DateTimeFormat();if(void 0===e||void 0===e.resolvedOptions)return null;var n=e.resolvedOptions().timeZone;return n?n.toLowerCase():null}();return null===e?"utc":e}(),b=Object.keys(d).reduce((function(e,n){var t=n.split("/")[1]||"";return e[t=t.replace(/_/g," ")]=n,e}),{}),k=function(e,n){if(!e)return g;var t=e.trim(),r=e.split("/");if(r.length>2&&!1===n.hasOwnProperty(t)&&(t=r[0]+"/"+r[1]),t=t.toLowerCase(),!0===n.hasOwnProperty(t))return t;if(t=function(e){return(e=(e=(e=(e=(e=e.replace(/ time/g,"")).replace(/ (standard|daylight|summer)/g,"")).replace(/\b(east|west|north|south)ern/g,"$1")).replace(/\b(africa|america|australia)n/g,"$1")).replace(/\beuropean/g,"europe")).replace(/\islands/g,"island")}(t),!0===n.hasOwnProperty(t))return t;if(!0===b.hasOwnProperty(t))return b[t];if(!0===/[0-9]/.test(t)){var a=v(t);if(a)return a}throw new Error("Spacetime: Cannot find timezone named: '"+e+"'. Please enter an IANA timezone id.")},w={millisecond:1,second:1e3,minute:6e4,hour:36e5,day:864e5};w.date=w.day,w.month=25488e5,w.week=6048e5,w.year=3154e7,Object.keys(w).forEach((function(e){w[e+"s"]=w[e]}));var z=w,_=function(e,n,t,r,a){var o=e.d[t]();if(o!==n){var i=null===a?null:e.d[a](),u=e.epoch,s=n-o;e.epoch+=z[r]*s,"day"===r&&Math.abs(s)>28&&n<28&&(e.epoch+=z.hour),null!==a&&i!==e.d[a]()&&(e.epoch=u);for(var c=z[r]/2;e.d[t]()n;)e.epoch-=c;null!==a&&i!==e.d[a]()&&(e.epoch=u)}},j={year:{valid:function(e){return e>-4e3&&e<4e3},walkTo:function(e,n){return _(e,n,"getFullYear","year",null)}},month:{valid:function(e){return e>=0&&e<=11},walkTo:function(e,n){var t=e.d,r=t.getMonth(),a=e.epoch,o=t.getFullYear();if(r!==n){var i=n-r;for(e.epoch+=z.day*(28*i),o!==e.d.getFullYear()&&(e.epoch=a);e.d.getMonth()n;)e.epoch-=z.day}}},date:{valid:function(e){return e>0&&e<=31},walkTo:function(e,n){return _(e,n,"getDate","day","getMonth")}},hour:{valid:function(e){return e>=0&&e<24},walkTo:function(e,n){return _(e,n,"getHours","hour","getDate")}},minute:{valid:function(e){return e>=0&&e<60},walkTo:function(e,n){return _(e,n,"getMinutes","minute","getHours")}},second:{valid:function(e){return e>=0&&e<60},walkTo:function(e,n){e.epoch=e.seconds(n).epoch}},millisecond:{valid:function(e){return e>=0&&e<1e3},walkTo:function(e,n){e.epoch=e.milliseconds(n).epoch}}},O=function(e,n){for(var t=Object.keys(j),r=e.clone(),a=0;a100&&(t/=100),(t*=-1)>=0&&(t="+"+t);var r="etc/gmt"+t;return e.timezones[r]&&(e.tz=r),e},I=function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",t=(n=n.replace(/^\s+/,"").toLowerCase()).match(/([0-9]{1,2}):([0-9]{1,2}):?([0-9]{1,2})?[:\.]?([0-9]{1,4})?/);if(null!==t){var r=Number(t[1]);if(r<0||r>24)return e.startOf("day");var a=Number(t[2]);if(t[2].length<2||a<0||a>59)return e.startOf("day");e=(e=(e=(e=e.hour(r)).minute(a)).seconds(t[3]||0)).millisecond(t[4]||0);var o=n.match(/[\b0-9](am|pm)\b/);return null!==o&&o[1]&&(e=e.ampm(o[1])),e}if(null!==(t=n.match(/([0-9]+) ?(am|pm)/))&&t[1]){var i=Number(t[1]);return i>12||i<1?e.startOf("day"):e=(e=(e=e.hour(t[1]||0)).ampm(t[2])).startOf("hour")}return e=e.startOf("day")},T=[31,28,31,30,31,30,31,31,30,31,30,31],N=n.isLeapYear,A=function(e){if(!0!==T.hasOwnProperty(e.month))return!1;if(1===e.month)return!!(N(e.year)&&e.date<=29)||e.date<=28;var n=T[e.month]||0;return e.date<=n},$=E(),x=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1?arguments[1]:void 0,t=parseInt(e.trim(),10);return!t&&n&&(t=n.year),t=t||(new Date).getFullYear()},Y=[{reg:/^(\-?0?0?[0-9]{3,4})-([0-9]{1,2})-([0-9]{1,2})[T| ]([0-9.:]+)(Z|[0-9\-\+:]+)?$/,parse:function(e,n,t,r){var a=parseInt(n[2],10)-1,o={year:n[1],month:a,date:n[3]};return!1===A(o)?(e.epoch=null,e):(C(e,n[5]),O(e,o),e=I(e,n[4]))}},{reg:/^([0-9]{4})[\-\/]([0-9]{1,2})[\-\/]([0-9]{1,2}),?( [0-9]{1,2}:[0-9]{2}:?[0-9]{0,2}? ?(am|pm|gmt))?$/i,parse:function(e,n){var t={year:n[1],month:parseInt(n[2],10)-1,date:parseInt(n[3],10)};return t.month>=12&&(t.date=parseInt(n[2],10),t.month=parseInt(n[3],10)-1),!1===A(t)?(e.epoch=null,e):(O(e,t),e=I(e,n[4]))}},{reg:/^([0-9]{1,2})[\-\/]([0-9]{1,2})[\-\/]?([0-9]{4})?,?( [0-9]{1,2}:[0-9]{2}:?[0-9]{0,2}? ?(am|pm|gmt))?$/i,parse:function(e,n){var t=parseInt(n[1],10)-1,r=parseInt(n[2],10);(e.british||t>=12)&&(r=parseInt(n[1],10),t=parseInt(n[2],10)-1);var a={year:n[3]||(new Date).getFullYear(),month:t,date:r};return!1===A(a)?(e.epoch=null,e):(O(e,a),e=I(e,n[4]))}},{reg:/^([0-9]{1,2})[\-\/]([a-z]+)[\-\/]?([0-9]{4})?$/i,parse:function(e,t){var r=$[t[2].toLowerCase()],a={year:x(t[3],e._today),month:r,date:n.toCardinal(t[1]||"")};return!1===A(a)?(e.epoch=null,e):(O(e,a),e=I(e,t[4]))}},{reg:/^([a-z]+) ([0-9]{1,2}(?:st|nd|rd|th)?),?( [0-9]{4})?( ([0-9:]+( ?am| ?pm| ?gmt)?))?$/i,parse:function(e,t){var r=$[t[1].toLowerCase()],a={year:x(t[3],e._today),month:r,date:n.toCardinal(t[2]||"")};return!1===A(a)?(e.epoch=null,e):(O(e,a),e=I(e,t[4]))}},{reg:/^([a-z]+) ([0-9]{4})$/i,parse:function(e,n){var t=$[n[1].toLowerCase()],r={year:x(n[2],e._today),month:t,date:e._today.date||1};return!1===A(r)?(e.epoch=null,e):(O(e,r),e=I(e,n[4]))}},{reg:/^([0-9]{1,2}(?:st|nd|rd|th)?) ([a-z]+),?( [0-9]{4})?,? ?([0-9]{1,2}:[0-9]{2}:?[0-9]{0,2}? ?(am|pm|gmt))?$/i,parse:function(e,t){var r=$[t[2].toLowerCase()];if(!r)return null;var a={year:x(t[3],e._today),month:r,date:n.toCardinal(t[1])};return!1===A(a)?(e.epoch=null,e):(O(e,a),e=I(e,t[4]))}},{reg:/^[0-9,]+ ?b\.?c\.?$/i,parse:function(e,n){var t=n[0]||"";t=(t=t.replace(/^([0-9,]+) ?b\.?c\.?$/i,"-$1")).replace(/,/g,"");var r=parseInt(t.trim(),10),a=new Date,o={year:r,month:a.getMonth(),date:a.getDate()};return!1===A(o)?(e.epoch=null,e):(O(e,o),e=I(e))}},{reg:/^[0-9,]+ ?(a\.?d\.?|c\.?e\.?)$/i,parse:function(e,n){var t=n[0]||"";t=t.replace(/,/g,"");var r=parseInt(t.trim(),10),a=new Date,o={year:r,month:a.getMonth(),date:a.getDate()};return!1===A(o)?(e.epoch=null,e):(O(e,o),e=I(e))}},{reg:/^[0-9]{4}( ?a\.?d\.?)?$/i,parse:function(e,n){var t=e._today,r=x(n[0],t),a=new Date;t.month&&!t.date&&(t.date=1);var o={year:r,month:t.month||a.getMonth(),date:t.date||a.getDate()};return!1===A(o)?(e.epoch=null,e):(O(e,o),e=I(e))}}],L=function(e){return e.epoch=Date.now(),Object.keys(e._today||{}).forEach((function(n){"function"==typeof e[n]&&(e=e[n](e._today[n]))})),e},F={now:function(e){return L(e)},today:function(e){return L(e)},tonight:function(e){return e=(e=L(e)).hour(18)},tomorrow:function(e){return e=(e=(e=L(e)).add(1,"day")).startOf("day")},yesterday:function(e){return e=(e=(e=L(e)).subtract(1,"day")).startOf("day")},christmas:function(e){var n=L(e).year();return e=e.set([n,11,25,18,0,0])},"new years":function(e){var n=L(e).year();return e=e.set([n,11,31,18,0,0])}};F["new years eve"]=F["new years"];var Z=F,H={year:(new Date).getFullYear(),month:0,date:1},B=function(e,n,t){n=Object.assign({},H,t,n);for(var r=Object.keys(n),a=0;a0&&t<25e8&&!1===e.silent&&(console.warn(" - Warning: You are setting the date to January 1970."),console.warn(" - did input seconds instead of milliseconds?")),e.epoch=t,e;if(e.epoch=Date.now(),e._today&&n.isObject(e._today)&&Object.keys(e._today).length>0){var o=B(e,a,H);o.isValid()&&(e.epoch=o.epoch)}if(null==t||""===t)return e;if(!0===n.isDate(t))return e.epoch=t.getTime(),e;if(!0===n.isArray(t))return e=function(e,n,t){for(var r=["year","month","date","hour","minute","second","millisecond"],a=0;a=0?Math.floor(t):Math.ceil(t)),r?(t*=-1,t="-"+(t=n.zeroPad(t,2))):t="+"+(t=n.zeroPad(t,2)),"+00:00"===(t=t+":"+a)&&(t="Z"),t},R={day:function(e){return n.titleCase(e.dayName())},"day-short":function(e){return n.titleCase(V()[e.day()])},"day-number":function(e){return e.day()},"day-ordinal":function(e){return n.ordinal(e.day())},"day-pad":function(e){return n.zeroPad(e.day())},date:function(e){return e.date()},"date-ordinal":function(e){return n.ordinal(e.date())},"date-pad":function(e){return n.zeroPad(e.date())},month:function(e){return n.titleCase(e.monthName())},"month-short":function(e){return n.titleCase(P()[e.month()])},"month-number":function(e){return e.month()},"month-ordinal":function(e){return n.ordinal(e.month())},"month-pad":function(e){return n.zeroPad(e.month())},"iso-month":function(e){return n.zeroPad(e.month()+1)},year:function(e){var n=e.year();return n>0?n:(n=Math.abs(n),n+" BC")},"year-short":function(e){var n=e.year();return n>0?"'".concat(String(e.year()).substr(2,4)):(n=Math.abs(n))+" BC"},"iso-year":function(e){var t=e.year(),r=t<0,a=n.zeroPad(Math.abs(t),4);return r&&(a="-"+(a=n.zeroPad(a,6))),a},time:function(e){return e.time()},"time-24":function(e){return"".concat(e.hour24(),":").concat(n.zeroPad(e.minute()))},hour:function(e){return e.hour12()},"hour-pad":function(e){return n.zeroPad(e.hour12())},"hour-24":function(e){return e.hour24()},"hour-24-pad":function(e){return n.zeroPad(e.hour24())},minute:function(e){return e.minute()},"minute-pad":function(e){return n.zeroPad(e.minute())},second:function(e){return e.second()},"second-pad":function(e){return n.zeroPad(e.second())},ampm:function(e){return e.ampm()},quarter:function(e){return"Q"+e.quarter()},season:function(e){return e.season()},era:function(e){return e.era()},json:function(e){return e.json()},timezone:function(e){return e.timezone().name},offset:function(e){return K(e)},numeric:function(e){return"".concat(e.year(),"/").concat(n.zeroPad(e.month()+1),"/").concat(n.zeroPad(e.date()))},"numeric-us":function(e){return"".concat(n.zeroPad(e.month()+1),"/").concat(n.zeroPad(e.date()),"/").concat(e.year())},"numeric-uk":function(e){return"".concat(n.zeroPad(e.date()),"/").concat(n.zeroPad(e.month()+1),"/").concat(e.year())},"mm/dd":function(e){return"".concat(n.zeroPad(e.month()+1),"/").concat(n.zeroPad(e.date()))},iso:function(e){var t=e.format("iso-year"),r=n.zeroPad(e.month()+1),a=n.zeroPad(e.date()),o=n.zeroPad(e.h24()),i=n.zeroPad(e.minute()),u=n.zeroPad(e.second()),s=n.zeroPad(e.millisecond(),3),c=K(e);return"".concat(t,"-").concat(r,"-").concat(a,"T").concat(o,":").concat(i,":").concat(u,".").concat(s).concat(c)},"iso-short":function(e){var t=n.zeroPad(e.month()+1),r=n.zeroPad(e.date());return"".concat(e.year(),"-").concat(t,"-").concat(r)},"iso-utc":function(e){return new Date(e.epoch).toISOString()},nice:function(e){return"".concat(P()[e.month()]," ").concat(n.ordinal(e.date()),", ").concat(e.time())},"nice-year":function(e){return"".concat(P()[e.month()]," ").concat(n.ordinal(e.date()),", ").concat(e.year())},"nice-day":function(e){return"".concat(V()[e.day()]," ").concat(n.titleCase(P()[e.month()])," ").concat(n.ordinal(e.date()))},"nice-full":function(e){return"".concat(e.dayName()," ").concat(n.titleCase(e.monthName())," ").concat(n.ordinal(e.date()),", ").concat(e.time())}},X={"day-name":"day","month-name":"month","iso 8601":"iso","time-h24":"time-24","time-12":"time","time-h12":"time",tz:"timezone","day-num":"day-number","month-num":"month-number","month-iso":"iso-month","year-iso":"iso-year","nice-short":"nice",mdy:"numeric-us",dmy:"numeric-uk",ymd:"numeric","yyyy/mm/dd":"numeric","mm/dd/yyyy":"numeric-us","dd/mm/yyyy":"numeric-us","little-endian":"numeric-uk","big-endian":"numeric","day-nice":"nice-day"};Object.keys(X).forEach((function(e){return R[e]=R[X[e]]}));var ee=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(!0!==e.isValid())return"";if(R.hasOwnProperty(t)){var r=R[t](e)||"";return"json"!==t&&(r=String(r),"ampm"!==t&&(r=n.titleCase(r))),r}if(-1!==t.indexOf("{")){var a=/\{(.+?)\}/g;return t=t.replace(a,(function(n,t){return t=t.toLowerCase().trim(),R.hasOwnProperty(t)?String(R[t](e)):""}))}return e.format("iso-short")},ne=n.zeroPad,te=n.formatTimezone,re={G:function(e){return e.era()},GG:function(e){return e.era()},GGG:function(e){return e.era()},GGGG:function(e){return"AD"===e.era()?"Anno Domini":"Before Christ"},y:function(e){return e.year()},yy:function(e){return parseInt(String(e.year()).substr(2,4),10)},yyy:function(e){return e.year()},yyyy:function(e){return e.year()},yyyyy:function(e){return"0"+e.year()},Q:function(e){return e.quarter()},QQ:function(e){return e.quarter()},QQQ:function(e){return e.quarter()},QQQQ:function(e){return e.quarter()},M:function(e){return e.month()+1},MM:function(e){return ne(e.month()+1)},MMM:function(e){return e.format("month-short")},MMMM:function(e){return e.format("month")},w:function(e){return e.week()},ww:function(e){return ne(e.week())},d:function(e){return e.date()},dd:function(e){return ne(e.date())},D:function(e){return e.dayOfYear()},DD:function(e){return ne(e.dayOfYear())},DDD:function(e){return ne(e.dayOfYear(),3)},E:function(e){return e.format("day-short")},EE:function(e){return e.format("day-short")},EEE:function(e){return e.format("day-short")},EEEE:function(e){return e.format("day")},EEEEE:function(e){return e.format("day")[0]},e:function(e){return e.day()},ee:function(e){return e.day()},eee:function(e){return e.format("day-short")},eeee:function(e){return e.format("day")},eeeee:function(e){return e.format("day")[0]},a:function(e){return e.ampm().toUpperCase()},aa:function(e){return e.ampm().toUpperCase()},aaa:function(e){return e.ampm().toUpperCase()},aaaa:function(e){return e.ampm().toUpperCase()},h:function(e){return e.h12()},hh:function(e){return ne(e.h12())},H:function(e){return e.hour()},HH:function(e){return ne(e.hour())},m:function(e){return e.minute()},mm:function(e){return ne(e.minute())},s:function(e){return e.second()},ss:function(e){return ne(e.second())},A:function(e){return e.epoch-e.startOf("day").epoch},z:function(e){return e.timezone().name},zz:function(e){return e.timezone().name},zzz:function(e){return e.timezone().name},zzzz:function(e){return e.timezone().name},Z:function(e){return te(e.timezone().current.offset)},ZZ:function(e){return te(e.timezone().current.offset)},ZZZ:function(e){return te(e.timezone().current.offset)},ZZZZ:function(e){return te(e.timezone().current.offset,":")}},ae=function(e,n,t){for(var r=e,a=n,o=0;o.5&&(e=e.add(1,t)),e=e.startOf(t)):!1===e.silent&&console.warn("no known unit '"+t+"'"),e},he=function(e,n,t){var r=0;for(e=e.clone();e.isBefore(n);)e=e.add(1,t),r+=1;return e.isAfter(n,t)&&(r-=1),r},de=function(e,n,t){return e.isBefore(n)?he(e,n,t):-1*he(n,e,t)},fe=function(e,n){var t=n.epoch-e.epoch,r={milliseconds:t,seconds:parseInt(t/1e3,10)};r.minutes=parseInt(r.seconds/60,10),r.hours=parseInt(r.minutes/60,10);var a=e.clone();return r.years=function(e,n){var t=n.year()-e.year();return(e=e.year(n.year())).isAfter(n)&&(t-=1),t}(a,n),a=e.add(r.years,"year"),r.months=12*r.years,a=e.add(r.months,"month"),r.months+=de(a,n,"month"),r.weeks=52*r.years,a=e.add(r.weeks,"week"),r.weeks+=de(a,n,"week"),r.days=7*r.weeks,a=e.add(r.days,"day"),r.days+=de(a,n,"day"),r},le=function(e,t,r){t=n.beADate(t,e);var a=!1;if(e.isAfter(t)){var o=e;e=t,t=o,a=!0}var i=fe(e,t);return a&&(i=function(e){return Object.keys(e).forEach((function(n){e[n]*=-1})),e}(i)),r?(r=n.normalize(r),!0!==/s$/.test(r)&&(r+="s"),"dates"===r&&(r="days"),i[r]):i},me={months:{almost:10,over:4},days:{almost:25,over:10},hours:{almost:20,over:8},minutes:{almost:50,over:20},seconds:{almost:50,over:20}};function pe(e,n){return 1===e&&(n=n.slice(0,-1)),e+" "+n}var ye=function(e,t){var r,a,o,i=function(e,n){var t=e.isBefore(n),r=t?n:e,a=t?e:n;a=a.clone();var o={years:0,months:0,days:0,hours:0,minutes:0,seconds:0};return Object.keys(o).forEach((function(e){if(!a.isSame(r,e)){var n=a.diff(r,e);a=a.add(n,e),o[e]=n}})),t&&Object.keys(o).forEach((function(e){0!==o[e]&&(o[e]*=-1)})),o}(e,t=n.beADate(t,e));if(!0===Object.keys(i).every((function(e){return!i[e]})))return{diff:i,rounded:"now",qualified:"now",precise:"now"};var u=[];return Object.keys(i).forEach((function(e,n,t){var o=Math.abs(i[e]);if(0!==o){var s=pe(o,e);if(u.push(s),!r){if(r=a=s,n>4)return;var c=t[n+1],h=Math.abs(i[c]);h>me[c].almost?(r=pe(o+1,e),a="almost "+r):h>me[c].over&&(a="over "+s)}}})),o=u.splice(0,2).join(", "),!0===e.isAfter(t)?(r+=" ago",a+=" ago",o+=" ago"):(r="in "+r,a="in "+a,o="in "+o),{diff:i,rounded:r,qualified:a,precise:o}},ve={north:[["spring",2,1],["summer",5,1],["fall",8,1],["autumn",8,1],["winter",11,1]],south:[["fall",2,1],["autumn",2,1],["winter",5,1],["spring",8,1],["summer",11,1]]},ge=[null,[0,1],[3,1],[6,1],[9,1]],be={minute:function(e){return O(e,{second:0,millisecond:0}),e},quarterhour:function(e){var n=e.minutes();return e=n>=45?e.minutes(45):n>=30?e.minutes(30):n>=15?e.minutes(15):e.minutes(0),O(e,{second:0,millisecond:0}),e},hour:function(e){return O(e,{minute:0,second:0,millisecond:0}),e},day:function(e){return O(e,{hour:0,minute:0,second:0,millisecond:0}),e},week:function(e){var n=e.clone();return(e=e.day(e._weekStart)).isAfter(n)&&(e=e.subtract(1,"week")),O(e,{hour:0,minute:0,second:0,millisecond:0}),e},month:function(e){return O(e,{date:1,hour:0,minute:0,second:0,millisecond:0}),e},quarter:function(e){var n=e.quarter();return ge[n]&&O(e,{month:ge[n][0],date:ge[n][1],hour:0,minute:0,second:0,millisecond:0}),e},season:function(e){var n=e.season(),t="north";"South"===e.hemisphere()&&(t="south");for(var r=0;r1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2?arguments[2]:void 0;if(!t||!r)return[];if(t=n.normalize(t),r=e.clone().set(r),e.isAfter(r)){var a=e;e=r,r=a}var o=e.clone();ze(t)?(o=o.next(t),t="week"):o=o.next(t);for(var i=[];o.isBefore(r);)i.push(o),o=o.add(1,t);return i},je=function(e){var n=e.timezones,t=e.tz;if(!1===n.hasOwnProperty(t)&&(t=k(e.tz,n)),null===t)return!1===e.silent&&console.warn("Warn: could not find given or local timezone - '"+e.tz+"'"),{current:{epochShift:0}};var a,o,i=n[t],u={name:(a=t,a=(a=(a=a[0].toUpperCase()+a.substr(1)).replace(/\/gmt/,"/GMT")).replace(/[\/_]([a-z])/gi,(function(e){return e.toUpperCase()}))),hasDst:Boolean(i.dst),default_offset:i.offset,hemisphere:"s"===i.hem?"South":"North",current:{}};if(u.hasDst){var s=(o=i.dst)?o.split("->"):[];u.change={start:s[0],back:s[1]}}var c=i.offset,h=c;return!0===u.hasDst&&(h="North"===u.hemisphere?c-1:i.offset+1),!1===u.hasDst?(u.current.offset=c,u.current.isDST=!1):!0===r(e.epoch,u.change.start,u.change.back,c)?(u.current.offset=c,u.current.isDST="North"===u.hemisphere):(u.current.offset=h,u.current.isDST="South"===u.hemisphere),u},Oe=["century","decade","year","month","date","day","hour","minute","second","millisecond"],De={set:function(e,n){var t=this.clone();return t=Q(t,e,null),n&&(this.tz=k(n)),t},timezone:function(){return je(this)},isDST:function(){return je(this).current.isDST},hasDST:function(){return je(this).hasDst},offset:function(){return 60*je(this).current.offset},hemisphere:function(){return je(this).hemisphere},format:function(e){return ee(this,e)},unixFmt:function(e){return oe(this,e)},startOf:function(e){return ke(this,e)},endOf:function(e){return we(this,e)},leapYear:function(){var e=this.year();return n.isLeapYear(e)},progress:function(e){return se(this,e)},nearest:function(e){return ce(this,e)},diff:function(e,n){return le(this,e,n)},since:function(e){return e||(e=this.clone().set()),ye(this,e)},next:function(e){return this.add(1,e).startOf(e)},last:function(e){return this.subtract(1,e).startOf(e)},isValid:function(){return!(!this.epoch&&0!==this.epoch)&&!isNaN(this.d.getTime())},goto:function(e){var n=this.clone();return n.tz=k(e,n.timezones),n},every:function(e,n){return _e(this,e,n)},isAwake:function(){var e=this.hour();return!(e<8||e>22)},isAsleep:function(){return!this.isAwake()},log:function(){return console.log(""),console.log(ee(this,"nice-short")),this},logYear:function(){return console.log(""),console.log(ee(this,"full-short")),this},json:function(){var e=this;return Oe.reduce((function(n,t){return n[t]=e[t](),n}),{})},debug:function(){var e=this.timezone(),n=this.format("MM")+" "+this.format("date-ordinal")+" "+this.year();return n+="\n - "+this.format("time"),console.log("\n\n",n+"\n - "+e.name+" ("+e.current.offset+")"),this},from:function(e){return(e=this.clone().set(e)).since(this)},fromNow:function(){return this.clone().set(Date.now()).since(this)},weekStart:function(e){if("number"==typeof e)return this._weekStart=e,this;if("string"==typeof e){e=e.toLowerCase().trim();var n=V().indexOf(e);-1===n&&(n=W().indexOf(e)),-1===n&&(n=1),this._weekStart=n}else console.warn("Spacetime Error: Cannot understand .weekStart() input:",e);return this}};De.inDST=De.isDST,De.round=De.nearest,De.each=De.every;var Me=De,Pe=n.isLeapYear,Se=function(e){return"string"==typeof e&&(e=parseInt(e,10)),e},Ee=["year","month","date","hour","minute","second","millisecond"],qe=function(e,n,t){for(var r=Ee.indexOf(t),a=Ee.slice(r,Ee.length),o=0;o=24?n=24:n<0&&(n=0);var t=e.clone(),r=(e.hour()-n)*z.hour;return e.epoch-=r,O(e,{hour:n}),qe(e,t,"minute"),e.epoch},Ae=function(e,n){var t=n.match(/([0-9]{1,2}):([0-9]{1,2})(am|pm)?/);if(!t){if(!(t=n.match(/([0-9]{1,2})(am|pm)/)))return e.epoch;t.splice(2,0,"0")}var r=!1,a=parseInt(t[1],10),o=parseInt(t[2],10);return a>12&&(r=!0),!1===r&&("am"===t[3]&&12===a&&(a=0),"pm"===t[3]&&a<12&&(a+=12)),(e=(e=(e=(e=e.hour(a)).minute(o)).second(0)).millisecond(0)).epoch},$e=function(e,n){if((n=Se(n))>28){var t=e.month(),r=T[t];1===t&&29===n&&Pe(e.year())&&(r=29),n>r&&(n=r)}return n<=0&&(n=1),O(e,{date:n}),e.epoch},xe=function(e,n){"string"==typeof n&&(n=E()[n.toLowerCase()]),(n=Se(n))>=12&&(n=11),n<=0&&(n=0);var t=e.date();return t>T[n]&&(t=T[n]),O(e,{month:n,date:t}),e.epoch},Ye=function(e,n){return n=Se(n),O(e,{year:n}),e.epoch},Le=function(e,n){n=Se(n);var t=e.clone();return(n-=1)<=0?n=0:n>=365&&(n=364),e=(e=e.startOf("year")).add(n,"day"),qe(e,t,"hour"),e.epoch},Fe={millisecond:function(e){if(void 0!==e){var n=this.clone();return n.epoch=Ce(n,e),n}return this.d.getMilliseconds()},second:function(e){if(void 0!==e){var n=this.clone();return n.epoch=Ie(n,e),n}return this.d.getSeconds()},minute:function(e){if(void 0!==e){var n=this.clone();return n.epoch=Te(n,e),n}return this.d.getMinutes()},hour:function(e){var n=this.d;if(void 0!==e){var t=this.clone();return t.epoch=Ne(t,e),t}return n.getHours()},hourFloat:function(e){if(void 0!==e){var n=this.clone(),t=e%1;t*=60;var r=parseInt(e,10);return n.epoch=Ne(n,r),n.epoch=Te(n,t),n}var a=this.d,o=a.getHours(),i=a.getMinutes();return o+(i/=60)},hour12:function(e){var n=this.d;if(void 0!==e){var t=this.clone(),r=(e=""+e).match(/^([0-9]+)(am|pm)$/);if(r){var a=parseInt(r[1],10);"pm"===r[2]&&(a+=12),t.epoch=Ne(t,a)}return t}var o=n.getHours();return o>12&&(o-=12),0===o&&(o=12),o},time:function(e){if(void 0!==e){var t=this.clone();return t.epoch=Ae(t,e),t}return"".concat(this.h12(),":").concat(n.zeroPad(this.minute())).concat(this.ampm())},ampm:function(e){var n="am",t=this.hour();if(t>=12&&(n="pm"),"string"!=typeof e)return n;var r=this.clone();return e=e.toLowerCase().trim(),t>=12&&"am"===e?(t-=12,r.hour(t)):t<12&&"pm"===e?(t+=12,r.hour(t)):r},dayTime:function(e){if(void 0!==e){var n={morning:"7:00am",breakfast:"7:00am",noon:"12:00am",lunch:"12:00pm",afternoon:"2:00pm",evening:"6:00pm",dinner:"6:00pm",night:"11:00pm",midnight:"23:59pm"},t=this.clone();return e=(e=e||"").toLowerCase(),!0===n.hasOwnProperty(e)&&(t=t.time(n[e])),t}var r=this.hour();return r<6?"night":r<12?"morning":r<17?"afternoon":r<22?"evening":"night"},iso:function(e){return void 0!==e?this.set(e):this.format("iso")}},Ze={date:function(e){if(void 0!==e){var n=this.clone();return n.epoch=$e(n,e),n}return this.d.getDate()},day:function(e){if(void 0===e)return this.d.getDay();var n=this.clone(),t=e;"string"==typeof e&&(e=e.toLowerCase(),-1===(t=V().indexOf(e))&&(t=W().indexOf(e)));var r=this.d.getDay(),a=r-t,o=this.subtract(24*a,"hours");return O(o,{hour:n.hour(),minute:n.minute(),second:n.second()}),o},dayName:function(e){if(void 0===e)return W()[this.day()];var n=this.clone();return n=n.day(e)},month:function(e){if(void 0!==e){var n=this.clone();return n.epoch=xe(n,e),n}return this.d.getMonth()}},He=function(e){return e=(e=(e=e.minute(0)).second(0)).millisecond(1)},Be={dayOfYear:function(e){if(void 0!==e){var n=this.clone();return n.epoch=Le(n,e),n}for(var t,r=0,a=this.d.getMonth(),o=1;o<=a;o++)(t=new Date).setDate(1),t.setFullYear(this.d.getFullYear()),t.setHours(1),t.setMinutes(1),t.setMonth(o),t.setHours(-2),r+=t.getDate();return r+this.d.getDate()},week:function(e){if(void 0!==e){var n=this.clone();return n=(n=(n=n.month(0)).date(1)).day("monday"),"december"===(n=He(n)).monthName()&&(n=n.add(1,"week")),e-=1,n=n.add(e,"weeks")}var t=this.clone();t=(t=t.month(0)).date(1),"december"===(t=(t=He(t)).day("monday")).monthName()&&(t=t.add(1,"week"));var r=1;1===t.date()&&(r=0),t=t.minus(1,"second");var a=this.epoch;if(t.epoch>a)return 1;var o=0,i=4*this.month();for(t.epoch+=z.week*i,o+=i;o<52;o++){if(t.epoch>a)return o+r;t=t.add(1,"week")}return 52},monthName:function(e){if(void 0===e)return S()[this.month()];var n=this.clone();return n=n.month(e)},quarter:function(e){if(void 0!==e&&("string"==typeof e&&(e=e.replace(/^q/i,""),e=parseInt(e,10)),ge[e])){var n=this.clone(),t=ge[e][0];return n=(n=(n=n.month(t)).date(1)).startOf("day")}for(var r=this.d.getMonth(),a=1;a=ve[n][o][1]&&a0&&(n.epoch=Ye(n,-1*t)),"ad"===e&&t<0&&(n.epoch=Ye(n,-1*t)),n}return this.d.getFullYear()<0?"BC":"AD"},decade:function(e){if(void 0!==e){if(!(e=(e=(e=String(e)).replace(/([0-9])'?s$/,"$1")).replace(/([0-9])(th|rd|st|nd)/,"$1")))return console.warn("Spacetime: Invalid decade input"),this;2===e.length&&/[0-9][0-9]/.test(e)&&(e="19"+e);var n=Number(e);return isNaN(n)?this:(n=10*Math.floor(n/10),this.year(n))}return this.startOf("decade").year()},century:function(e){if(void 0!==e){"string"==typeof e&&(e=(e=(e=e.replace(/([0-9])(th|rd|st|nd)/,"$1")).replace(/([0-9]+) ?(b\.?c\.?|a\.?d\.?)/i,(function(e,n,t){return t.match(/b\.?c\.?/i)&&(n="-"+n),n}))).replace(/c$/,""));var n=Number(e);return isNaN(e)?(console.warn("Spacetime: Invalid century input"),this):(0===n&&(n=1),n=n>=0?100*(n-1):100*(n+1),this.year(n))}var t=this.startOf("century").year();return(t=Math.floor(t/100))<0?t-1:t+1},millenium:function(e){if(void 0!==e){if("string"==typeof e&&(e=e.replace(/([0-9])(th|rd|st|nd)/,"$1"),e=Number(e),isNaN(e)))return console.warn("Spacetime: Invalid millenium input"),this;e>0&&(e-=1);var n=1e3*e;return 0===n&&(n=1),this.year(n)}var t=Math.floor(this.year()/1e3);return t>=0&&(t+=1),t}},Qe=Object.assign({},Fe,Ze,Be);Qe.milliseconds=Qe.millisecond,Qe.seconds=Qe.second,Qe.minutes=Qe.minute,Qe.hours=Qe.hour,Qe.hour24=Qe.hour,Qe.h12=Qe.hour12,Qe.h24=Qe.hour24,Qe.days=Qe.day;var Ge=function(e){Object.keys(Qe).forEach((function(n){e.prototype[n]=Qe[n]}))},Ue=n.isLeapYear,Ve=function(e,n){return 1===e&&Ue(n)?29:T[e]},We=function(e,n){if(e.month>0){var t=parseInt(e.month/12,10);e.year=n.year()+t,e.month=e.month%12}else if(e.month<0){var r=Math.floor(Math.abs(e.month)/13,10);r=Math.abs(r)+1,e.year=n.year()-r,e.month=e.month%12,e.month=e.month+12,12===e.month&&(e.month=0)}return e},Je=function(e,n,t){for(var r=n.year(),a=n.month(),o=Ve(a,r);t>o;)t-=o,(a+=1)>=12&&(a-=12,r+=1),o=Ve(a,r);return e.month=a,e.date=t,e},Ke=function(e,n,t){e.year=n.year(),e.month=n.month();var r=n.date();for(e.date=r-Math.abs(t);e.date<1;){e.month-=1,e.month<0&&(e.month=11,e.year-=1);var a=Ve(e.month,e.year);e.date+=a}return e},Re=["millisecond","second","minute","hour","date","month"],Xe={second:Re.slice(0,1),minute:Re.slice(0,2),quarterhour:Re.slice(0,2),hour:Re.slice(0,3),date:Re.slice(0,4),month:Re.slice(0,4),quarter:Re.slice(0,4),season:Re.slice(0,4),year:Re,decade:Re,century:Re};Xe.week=Xe.hour,Xe.season=Xe.date,Xe.quarter=Xe.date;var en={year:!0,quarter:!0,season:!0,month:!0,week:!0,day:!0},nn={month:!0,quarter:!0,season:!0,year:!0},tn=function(e){e.prototype.add=function(e,t){var r=this.clone();if(!t||0===e)return r;var a=this.clone();t=n.normalize(t),z[t]?r.epoch+=z[t]*e:"week"===t?r.epoch+=z.day*(7*e):"quarter"===t||"season"===t||"season"===t?r.epoch+=z.month*(4*e):"quarterhour"===t&&(r.epoch+=15*z.minute*e);var o={};if(Xe[t]&&Xe[t].forEach((function(e){o[e]=a[e]()})),en[t]){var i=a.timezone().current.offset-r.timezone().current.offset;r.epoch+=3600*i*1e3}if("month"===t&&(o.month=a.month()+e,o=We(o,a)),"week"===t){var u=a.date()+7*e;u<=28&&u>1&&(o.date=u)}else if("date"===t){if(e<0)o=Ke(o,a,e);else{var s=a.date()+e;o=Je(o,a,s)}0!==e&&a.isSame(r,"day")&&(o.date=a.date()+e)}else"year"===t&&r.year()===a.year()?r.epoch+=z.week:"decade"===t?o.year=r.year()+10:"century"===t&&(o.year=r.year()+100);if(nn[t]){var c=T[o.month];o.date=a.date(),o.date>c&&(o.date=c)}return O(r,o),r},e.prototype.subtract=function(e,n){return this.clone().add(-1*e,n)},e.prototype.minus=e.prototype.subtract,e.prototype.plus=e.prototype.add},rn={millisecond:function(e){return e.epoch},second:function(e){return[e.year(),e.month(),e.date(),e.hour(),e.minute(),e.second()].join("-")},minute:function(e){return[e.year(),e.month(),e.date(),e.hour(),e.minute()].join("-")},hour:function(e){return[e.year(),e.month(),e.date(),e.hour()].join("-")},day:function(e){return[e.year(),e.month(),e.date()].join("-")},week:function(e){return[e.year(),e.week()].join("-")},month:function(e){return[e.year(),e.month()].join("-")},quarter:function(e){return[e.year(),e.quarter()].join("-")},year:function(e){return e.year()}};rn.date=rn.day;var an=function(e){e.prototype.isSame=function(n,t){return t?("string"!=typeof n&&"number"!=typeof n||(n=new e(n,this.timezone.name)),t=t.replace(/s$/,""),rn[t]?rn[t](this)===rn[t](n):null):null}},on=function(e){var t={isAfter:function(e){e=n.beADate(e,this);var t=n.getEpoch(e);return null===t?null:this.epoch>t},isBefore:function(e){e=n.beADate(e,this);var t=n.getEpoch(e);return null===t?null:this.epoch2&&void 0!==arguments[2]&&arguments[2];e=n.beADate(e,this),t=n.beADate(t,this);var a=n.getEpoch(e);if(null===a)return null;var o=n.getEpoch(t);return null===o?null:r?this.isBetween(e,t)||this.isEqual(e)||this.isEqual(t):a2&&void 0!==arguments[2]?arguments[2]:{};this.epoch=null,this.tz=k(n,sn),this.silent=t.silent||!0,this.british=t.dmy||t.british,this._weekStart=1,void 0!==t.weekStart&&(this._weekStart=t.weekStart),this._today={},void 0!==t.today&&(this._today=t.today),Object.defineProperty(this,"d",{get:function(){var e=a(this),n=(new Date(this.epoch).getTimezoneOffset()||0)+60*e;n=60*n*1e3;var t=this.epoch+n;return new Date(t)}}),Object.defineProperty(this,"timezones",{get:function(){return sn},set:function(e){return sn=e,e}});var r=Q(this,e,n);this.epoch=r.epoch};Object.keys(Me).forEach((function(e){cn.prototype[e]=Me[e]})),cn.prototype.clone=function(){return new cn(this.epoch,this.tz,{silent:this.silent,weekStart:this._weekStart,today:this._today})},cn.prototype.toLocalDate=function(){return new Date(this.epoch)},Ge(cn),tn(cn),an(cn),on(cn),un(cn);var hn=cn,dn=function(e,n){var t=new hn(null),r=new hn(null);t=t.time(e),r=n?r.time(n):t.add(59,"minutes");var a=t.hour(),o=r.hour();return Object.keys(t.timezones).filter((function(e){if(-1===e.indexOf("/"))return!1;var n=new hn(null,e),i=n.hour();return i>=a&&i<=o&&(!(i===a&&n.minute()r.minute()))}))},fn=function(e,n,t){return new hn(e,n,t)},ln=function(e){var n=e._today||{};return Object.keys(n).forEach((function(t){e=e[t](n[t])})),e};return fn.now=function(e,n){var t=new hn((new Date).getTime(),e,n);return t=ln(t)},fn.today=function(e,n){var t=new hn((new Date).getTime(),e,n);return(t=ln(t)).startOf("day")},fn.tomorrow=function(e,n){var t=new hn((new Date).getTime(),e,n);return(t=ln(t)).add(1,"day").startOf("day")},fn.yesterday=function(e,n){var t=new hn((new Date).getTime(),e,n);return(t=ln(t)).subtract(1,"day").startOf("day")},fn.extend=function(e){return Object.keys(e).forEach((function(n){hn.prototype[n]=e[n]})),this},fn.whereIts=dn,fn.version="6.6.3",fn.plugin=fn.extend,fn})); +!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e="undefined"!=typeof globalThis?globalThis:e||self).spacetime=n()}(this,(function(){"use strict";var e,n=function(e,n){return e(n={exports:{}},n.exports),n.exports}((function(e,n){n.isLeapYear=function(e){return e%4==0&&e%100!=0||e%400==0},n.isDate=function(e){return"[object Date]"===Object.prototype.toString.call(e)&&!isNaN(e.valueOf())},n.isArray=function(e){return"[object Array]"===Object.prototype.toString.call(e)},n.isObject=function(e){return"[object Object]"===Object.prototype.toString.call(e)},n.zeroPad=function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:2,t="0";return(e+="").length>=n?e:new Array(n-e.length+1).join(t)+e},n.titleCase=function(e){return e?e[0].toUpperCase()+e.substr(1):""},n.ordinal=function(e){var n=e%10,t=e%100;return 1===n&&11!==t?e+"st":2===n&&12!==t?e+"nd":3===n&&13!==t?e+"rd":e+"th"},n.toCardinal=function(e){return e=(e=String(e)).replace(/([0-9])(st|nd|rd|th)$/i,"$1"),parseInt(e,10)},n.normalize=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return"day"===(e=(e=(e=(e=e.toLowerCase().trim()).replace(/ies$/,"y")).replace(/s$/,"")).replace(/-/g,""))?"date":e},n.getEpoch=function(e){return"number"==typeof e?e:n.isDate(e)?e.getTime():e.epoch?e.epoch:null},n.beADate=function(e,t){return!1===n.isObject(e)?t.clone().set(e):e},n.formatTimezone=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r=e>0?"+":"-",a=Math.abs(e),o=n.zeroPad(parseInt(""+a,10)),i=n.zeroPad(a%1*60);return"".concat(r).concat(o).concat(t).concat(i)}})),t=(n.isLeapYear,n.isDate,n.isArray,n.isObject,n.zeroPad,n.titleCase,n.ordinal,n.toCardinal,n.normalize,n.getEpoch,n.beADate,n.formatTimezone,n.zeroPad),r=function(e,n,r,a){var o=new Date(e),i=(o.getTimezoneOffset()||0)+60*a;i=60*i*1e3;var u=function(e){return t(e.getMonth()+1)+"/"+t(e.getDate())+":"+t(e.getHours())}(o=new Date(e+i));return u>=n&&u");return!0===r(e.epoch,o[0],o[1],t)?t:a},o=["africa","america","asia","atlantic","australia","brazil","canada","chile","europe","indian","mexico","pacific","antarctica","etc"],i=(e=Object.freeze({__proto__:null,default:{"9|s":"2/dili,2/jayapura","9|n":"2/chita,2/khandyga,2/pyongyang,2/seoul,2/tokyo,11/palau","9.5|s|04/05:03->10/04:02":"4/adelaide,4/broken_hill,4/south,4/yancowinna","9.5|s":"4/darwin,4/north","8|s":"12/casey,2/kuala_lumpur,2/makassar,2/singapore,4/perth,4/west","8|n|03/25:03->09/29:23":"2/ulan_bator","8|n":"2/brunei,2/choibalsan,2/chongqing,2/chungking,2/harbin,2/hong_kong,2/irkutsk,2/kuching,2/macao,2/macau,2/manila,2/shanghai,2/taipei,2/ujung_pandang,2/ulaanbaatar","8.75|s":"4/eucla","7|s":"12/davis,2/jakarta,9/christmas","7|n":"2/bangkok,2/barnaul,2/ho_chi_minh,2/hovd,2/krasnoyarsk,2/novokuznetsk,2/novosibirsk,2/phnom_penh,2/pontianak,2/saigon,2/tomsk,2/vientiane","6|s":"12/vostok","6|n":"2/almaty,2/bishkek,2/dacca,2/dhaka,2/kashgar,2/omsk,2/qyzylorda,2/thimbu,2/thimphu,2/urumqi,9/chagos","6.5|n":"2/rangoon,2/yangon,9/cocos","5|s":"12/mawson,9/kerguelen","5|n":"2/aqtau,2/aqtobe,2/ashgabat,2/ashkhabad,2/atyrau,2/baku,2/dushanbe,2/karachi,2/oral,2/samarkand,2/tashkent,2/yekaterinburg,9/maldives","5.75|n":"2/kathmandu,2/katmandu","5.5|n":"2/calcutta,2/colombo,2/kolkata","4|s":"9/reunion","4|n":"2/dubai,2/muscat,2/tbilisi,2/yerevan,8/astrakhan,8/samara,8/saratov,8/ulyanovsk,8/volgograd,2/volgograd,9/mahe,9/mauritius","4.5|n|03/21:00->09/20:24":"2/tehran","4.5|n":"2/kabul","3|s":"12/syowa,9/antananarivo","3|n|03/29:03->10/25:04":"2/famagusta,2/nicosia,8/athens,8/bucharest,8/helsinki,8/kiev,8/mariehamn,8/nicosia,8/riga,8/sofia,8/tallinn,8/uzhgorod,8/vilnius,8/zaporozhye","3|n|03/29:02->10/25:03":"8/chisinau,8/tiraspol","3|n|03/29:00->10/24:24":"2/beirut","3|n|03/27:02->10/25:02":"2/jerusalem,2/tel_aviv","3|n|03/27:00->10/31:01":"2/gaza,2/hebron","3|n|03/27:00->10/30:01":"2/amman","3|n|03/27:00->10/29:24":"2/damascus","3|n":"0/addis_ababa,0/asmara,0/asmera,0/dar_es_salaam,0/djibouti,0/juba,0/kampala,0/mogadishu,0/nairobi,2/aden,2/baghdad,2/bahrain,2/istanbul,2/kuwait,2/qatar,2/riyadh,8/istanbul,8/kirov,8/minsk,8/moscow,8/simferopol,9/comoro,9/mayotte","2|s|03/29:02->10/25:02":"12/troll","2|s":"0/gaborone,0/harare,0/johannesburg,0/lubumbashi,0/lusaka,0/maputo,0/maseru,0/mbabane","2|n|03/29:02->10/25:03":"0/ceuta,arctic/longyearbyen,3/jan_mayen,8/amsterdam,8/andorra,8/belgrade,8/berlin,8/bratislava,8/brussels,8/budapest,8/busingen,8/copenhagen,8/gibraltar,8/ljubljana,8/luxembourg,8/madrid,8/malta,8/monaco,8/oslo,8/paris,8/podgorica,8/prague,8/rome,8/san_marino,8/sarajevo,8/skopje,8/stockholm,8/tirane,8/vaduz,8/vatican,8/vienna,8/warsaw,8/zagreb,8/zurich","2|n":"0/blantyre,0/bujumbura,0/cairo,0/khartoum,0/kigali,0/tripoli,8/kaliningrad","1|s|04/02:01->09/03:03":"0/windhoek","1|s":"0/kinshasa,0/luanda","1|n|04/19:03->05/31:02":"0/casablanca,0/el_aaiun","1|n|03/29:01->10/25:02":"3/canary,3/faeroe,3/faroe,3/madeira,8/belfast,8/dublin,8/guernsey,8/isle_of_man,8/jersey,8/lisbon,8/london","1|n":"0/algiers,0/bangui,0/brazzaville,0/douala,0/lagos,0/libreville,0/malabo,0/ndjamena,0/niamey,0/porto-novo,0/tunis","14|n":"11/kiritimati","13|s|04/05:04->09/27:03":"11/apia","13|s|01/15:02->11/05:03":"11/tongatapu","13|n":"11/enderbury,11/fakaofo","12|s|04/05:03->09/27:02":"12/mcmurdo,12/south_pole,11/auckland","12|s|01/12:03->11/08:02":"11/fiji","12|n":"2/anadyr,2/kamchatka,2/srednekolymsk,11/funafuti,11/kwajalein,11/majuro,11/nauru,11/tarawa,11/wake,11/wallis","12.75|s|04/05:03->04/05:02":"11/chatham","11|s":"12/macquarie,11/bougainville","11|n":"2/magadan,2/sakhalin,11/efate,11/guadalcanal,11/kosrae,11/noumea,11/pohnpei,11/ponape","11.5|n|04/05:03->10/04:02":"11/norfolk","10|s|04/05:03->10/04:02":"4/act,4/canberra,4/currie,4/hobart,4/melbourne,4/nsw,4/sydney,4/tasmania,4/victoria","10|s":"12/dumontdurville,4/brisbane,4/lindeman,4/queensland","10|n":"2/ust-nera,2/vladivostok,2/yakutsk,11/chuuk,11/guam,11/port_moresby,11/saipan,11/truk,11/yap","10.5|s|04/05:01->10/04:02":"4/lhi,4/lord_howe","0|n|03/29:00->10/25:01":"1/scoresbysund,3/azores","0|n":"0/abidjan,0/accra,0/bamako,0/banjul,0/bissau,0/conakry,0/dakar,0/freetown,0/lome,0/monrovia,0/nouakchott,0/ouagadougou,0/sao_tome,0/timbuktu,1/danmarkshavn,3/reykjavik,3/st_helena,13/gmt,13/gmt+0,13/gmt-0,13/gmt0,13/greenwich,13/utc,13/universal,13/zulu","-9|n|03/08:02->11/01:02":"1/adak,1/atka","-9|n":"11/gambier","-9.5|n":"11/marquesas","-8|n|03/08:02->11/01:02":"1/anchorage,1/juneau,1/metlakatla,1/nome,1/sitka,1/yakutat","-8|n":"11/pitcairn","-7|n|03/08:02->11/01:02":"1/dawson,1/ensenada,1/los_angeles,1/santa_isabel,1/tijuana,1/vancouver,1/whitehorse,6/pacific,6/yukon,10/bajanorte","-7|n":"1/creston,1/dawson_creek,1/hermosillo,1/phoenix","-6|s|04/04:22->09/05:22":"7/easterisland,11/easter","-6|n|04/05:02->10/25:02":"1/chihuahua,1/mazatlan,10/bajasur","-6|n|03/08:02->11/01:02":"1/boise,1/cambridge_bay,1/denver,1/edmonton,1/inuvik,1/ojinaga,1/shiprock,1/yellowknife,6/mountain","-6|n":"1/belize,1/costa_rica,1/el_salvador,1/guatemala,1/managua,1/regina,1/swift_current,1/tegucigalpa,6/east-saskatchewan,6/saskatchewan,11/galapagos","-5|s":"1/lima,1/rio_branco,5/acre","-5|n|04/05:02->10/25:02":"1/bahia_banderas,1/merida,1/mexico_city,1/monterrey,10/general","-5|n|03/12:03->11/05:01":"1/north_dakota","-5|n|03/08:02->11/01:02":"1/chicago,1/knox_in,1/matamoros,1/menominee,1/rainy_river,1/rankin_inlet,1/resolute,1/winnipeg,6/central","-5|n":"1/atikokan,1/bogota,1/cancun,1/cayman,1/coral_harbour,1/eirunepe,1/guayaquil,1/jamaica,1/panama,1/porto_acre","-4|s|05/13:23->08/13:01":"12/palmer","-4|s|04/04:24->09/06:00":"1/santiago,7/continental","-4|s|03/21:24->10/04:00":"1/asuncion","-4|s|02/16:24->11/03:00":"1/campo_grande,1/cuiaba","-4|s":"1/la_paz,1/manaus,5/west","-4|n|03/12:03->11/05:01":"1/indiana,1/kentucky","-4|n|03/08:02->11/01:02":"1/detroit,1/fort_wayne,1/grand_turk,1/indianapolis,1/iqaluit,1/louisville,1/montreal,1/nassau,1/new_york,1/nipigon,1/pangnirtung,1/port-au-prince,1/thunder_bay,1/toronto,6/eastern","-4|n|03/08:00->11/01:01":"1/havana","-4|n":"1/anguilla,1/antigua,1/aruba,1/barbados,1/blanc-sablon,1/boa_vista,1/caracas,1/curacao,1/dominica,1/grenada,1/guadeloupe,1/guyana,1/kralendijk,1/lower_princes,1/marigot,1/martinique,1/montserrat,1/port_of_spain,1/porto_velho,1/puerto_rico,1/santo_domingo,1/st_barthelemy,1/st_kitts,1/st_lucia,1/st_thomas,1/st_vincent,1/tortola,1/virgin","-3|s":"1/argentina,1/buenos_aires,1/cordoba,1/fortaleza,1/montevideo,1/punta_arenas,1/sao_paulo,12/rothera,3/stanley,5/east","-3|n|03/08:02->11/01:02":"1/glace_bay,1/goose_bay,1/halifax,1/moncton,1/thule,3/bermuda,6/atlantic","-3|n":"1/araguaina,1/bahia,1/belem,1/catamarca,1/cayenne,1/jujuy,1/maceio,1/mendoza,1/paramaribo,1/recife,1/rosario,1/santarem","-2|s":"5/denoronha","-2|n|03/28:22->10/24:23":"1/godthab","-2|n|03/08:02->11/01:02":"1/miquelon","-2|n":"1/noronha,3/south_georgia","-2.5|n|03/08:02->11/01:02":"1/st_johns,6/newfoundland","-1|n":"3/cape_verde","-11|n":"11/midway,11/niue,11/pago_pago,11/samoa","-10|n":"11/honolulu,11/johnston,11/rarotonga,11/tahiti"}}))&&e.default||e,u={};Object.keys(i).forEach((function(e){var n=e.split("|"),t={offset:Number(n[0]),hem:n[1]};n[2]&&(t.dst=n[2]),i[e].split(",").forEach((function(e){e=e.replace(/(^[0-9]+)\//,(function(e,n){return n=Number(n),o[n]+"/"})),u[e]=t}))})),u.utc={offset:0,hem:"n"};for(var s=-14;s<=14;s+=.5){var c=s;c>0&&(c="+"+c);var h="etc/gmt"+c;u[h]={offset:-1*s,hem:"n"},u[h="utc/gmt"+c]={offset:-1*s,hem:"n"}}var d=u,f=/(\-?[0-9]+)h(rs)?/i,l=/(\-?[0-9]+)/,m=/utc([\-+]?[0-9]+)/i,p=/gmt([\-+]?[0-9]+)/i,y=function(e){return(e=Number(e))>-13&&e<13?"etc/gmt"+(e=((e*=-1)>0?"+":"")+e):null},v=function(e){var n=e.match(f);if(null!==n)return y(n[1]);if(null!==(n=e.match(m)))return y(n[1]);if(null!==(n=e.match(p))){var t=-1*Number(n[1]);return y(t)}return null!==(n=e.match(l))?y(n[1]):null},g=function(){var e=function(){if("undefined"==typeof Intl||void 0===Intl.DateTimeFormat)return null;var e=Intl.DateTimeFormat();if(void 0===e||void 0===e.resolvedOptions)return null;var n=e.resolvedOptions().timeZone;return n?n.toLowerCase():null}();return null===e?"utc":e}(),b=Object.keys(d).reduce((function(e,n){var t=n.split("/")[1]||"";return e[t=t.replace(/_/g," ")]=n,e}),{}),k=function(e,n){if(!e)return g;var t=e.trim(),r=e.split("/");if(r.length>2&&!1===n.hasOwnProperty(t)&&(t=r[0]+"/"+r[1]),t=t.toLowerCase(),!0===n.hasOwnProperty(t))return t;if(t=function(e){return(e=(e=(e=(e=(e=e.replace(/ time/g,"")).replace(/ (standard|daylight|summer)/g,"")).replace(/\b(east|west|north|south)ern/g,"$1")).replace(/\b(africa|america|australia)n/g,"$1")).replace(/\beuropean/g,"europe")).replace(/\islands/g,"island")}(t),!0===n.hasOwnProperty(t))return t;if(!0===b.hasOwnProperty(t))return b[t];if(!0===/[0-9]/.test(t)){var a=v(t);if(a)return a}throw new Error("Spacetime: Cannot find timezone named: '"+e+"'. Please enter an IANA timezone id.")},w={millisecond:1,second:1e3,minute:6e4,hour:36e5,day:864e5};w.date=w.day,w.month=25488e5,w.week=6048e5,w.year=3154e7,Object.keys(w).forEach((function(e){w[e+"s"]=w[e]}));var z=w,_=function(e,n,t,r,a){var o=e.d[t]();if(o!==n){var i=null===a?null:e.d[a](),u=e.epoch,s=n-o;e.epoch+=z[r]*s,"day"===r&&Math.abs(s)>28&&n<28&&(e.epoch+=z.hour),null!==a&&i!==e.d[a]()&&(e.epoch=u);for(var c=z[r]/2;e.d[t]()n;)e.epoch-=c;null!==a&&i!==e.d[a]()&&(e.epoch=u)}},j={year:{valid:function(e){return e>-4e3&&e<4e3},walkTo:function(e,n){return _(e,n,"getFullYear","year",null)}},month:{valid:function(e){return e>=0&&e<=11},walkTo:function(e,n){var t=e.d,r=t.getMonth(),a=e.epoch,o=t.getFullYear();if(r!==n){var i=n-r;for(e.epoch+=z.day*(28*i),o!==e.d.getFullYear()&&(e.epoch=a);e.d.getMonth()n;)e.epoch-=z.day}}},date:{valid:function(e){return e>0&&e<=31},walkTo:function(e,n){return _(e,n,"getDate","day","getMonth")}},hour:{valid:function(e){return e>=0&&e<24},walkTo:function(e,n){return _(e,n,"getHours","hour","getDate")}},minute:{valid:function(e){return e>=0&&e<60},walkTo:function(e,n){return _(e,n,"getMinutes","minute","getHours")}},second:{valid:function(e){return e>=0&&e<60},walkTo:function(e,n){e.epoch=e.seconds(n).epoch}},millisecond:{valid:function(e){return e>=0&&e<1e3},walkTo:function(e,n){e.epoch=e.milliseconds(n).epoch}}},O=function(e,n){for(var t=Object.keys(j),r=e.clone(),a=0;a100&&(t/=100),(t*=-1)>=0&&(t="+"+t);var r="etc/gmt"+t;return e.timezones[r]&&(e.tz=r),e},I=function(e){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",t=(n=n.replace(/^\s+/,"").toLowerCase()).match(/([0-9]{1,2}):([0-9]{1,2}):?([0-9]{1,2})?[:\.]?([0-9]{1,4})?/);if(null!==t){var r=Number(t[1]);if(r<0||r>24)return e.startOf("day");var a=Number(t[2]);if(t[2].length<2||a<0||a>59)return e.startOf("day");e=(e=(e=(e=e.hour(r)).minute(a)).seconds(t[3]||0)).millisecond(t[4]||0);var o=n.match(/[\b0-9](am|pm)\b/);return null!==o&&o[1]&&(e=e.ampm(o[1])),e}if(null!==(t=n.match(/([0-9]+) ?(am|pm)/))&&t[1]){var i=Number(t[1]);return i>12||i<1?e.startOf("day"):e=(e=(e=e.hour(t[1]||0)).ampm(t[2])).startOf("hour")}return e=e.startOf("day")},T=[31,28,31,30,31,30,31,31,30,31,30,31],N=n.isLeapYear,A=function(e){if(!0!==T.hasOwnProperty(e.month))return!1;if(1===e.month)return!!(N(e.year)&&e.date<=29)||e.date<=28;var n=T[e.month]||0;return e.date<=n},$=E(),x=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",n=arguments.length>1?arguments[1]:void 0,t=parseInt(e.trim(),10);return!t&&n&&(t=n.year),t=t||(new Date).getFullYear()},Y=[{reg:/^(\-?0?0?[0-9]{3,4})-([0-9]{1,2})-([0-9]{1,2})[T| ]([0-9.:]+)(Z|[0-9\-\+:]+)?$/,parse:function(e,n,t,r){var a=parseInt(n[2],10)-1,o={year:n[1],month:a,date:n[3]};return!1===A(o)?(e.epoch=null,e):(C(e,n[5]),O(e,o),e=I(e,n[4]))}},{reg:/^([0-9]{4})[\-\/]([0-9]{1,2})[\-\/]([0-9]{1,2}),?( [0-9]{1,2}:[0-9]{2}:?[0-9]{0,2}? ?(am|pm|gmt))?$/i,parse:function(e,n){var t={year:n[1],month:parseInt(n[2],10)-1,date:parseInt(n[3],10)};return t.month>=12&&(t.date=parseInt(n[2],10),t.month=parseInt(n[3],10)-1),!1===A(t)?(e.epoch=null,e):(O(e,t),e=I(e,n[4]))}},{reg:/^([0-9]{1,2})[\-\/]([0-9]{1,2})[\-\/]?([0-9]{4})?,?( [0-9]{1,2}:[0-9]{2}:?[0-9]{0,2}? ?(am|pm|gmt))?$/i,parse:function(e,n){var t=parseInt(n[1],10)-1,r=parseInt(n[2],10);(e.british||t>=12)&&(r=parseInt(n[1],10),t=parseInt(n[2],10)-1);var a={year:n[3]||(new Date).getFullYear(),month:t,date:r};return!1===A(a)?(e.epoch=null,e):(O(e,a),e=I(e,n[4]))}},{reg:/^([0-9]{1,2})[\-\/]([a-z]+)[\-\/]?([0-9]{4})?$/i,parse:function(e,t){var r=$[t[2].toLowerCase()],a={year:x(t[3],e._today),month:r,date:n.toCardinal(t[1]||"")};return!1===A(a)?(e.epoch=null,e):(O(e,a),e=I(e,t[4]))}},{reg:/^([a-z]+) ([0-9]{1,2}(?:st|nd|rd|th)?),?( [0-9]{4})?( ([0-9:]+( ?am| ?pm| ?gmt)?))?$/i,parse:function(e,t){var r=$[t[1].toLowerCase()],a={year:x(t[3],e._today),month:r,date:n.toCardinal(t[2]||"")};return!1===A(a)?(e.epoch=null,e):(O(e,a),e=I(e,t[4]))}},{reg:/^([a-z]+) ([0-9]{4})$/i,parse:function(e,n){var t=$[n[1].toLowerCase()],r={year:x(n[2],e._today),month:t,date:e._today.date||1};return!1===A(r)?(e.epoch=null,e):(O(e,r),e=I(e,n[4]))}},{reg:/^([0-9]{1,2}(?:st|nd|rd|th)?) ([a-z]+),?( [0-9]{4})?,? ?([0-9]{1,2}:[0-9]{2}:?[0-9]{0,2}? ?(am|pm|gmt))?$/i,parse:function(e,t){var r=$[t[2].toLowerCase()];if(!r)return null;var a={year:x(t[3],e._today),month:r,date:n.toCardinal(t[1])};return!1===A(a)?(e.epoch=null,e):(O(e,a),e=I(e,t[4]))}},{reg:/^[0-9,]+ ?b\.?c\.?$/i,parse:function(e,n){var t=n[0]||"";t=(t=t.replace(/^([0-9,]+) ?b\.?c\.?$/i,"-$1")).replace(/,/g,"");var r=parseInt(t.trim(),10),a=new Date,o={year:r,month:a.getMonth(),date:a.getDate()};return!1===A(o)?(e.epoch=null,e):(O(e,o),e=I(e))}},{reg:/^[0-9,]+ ?(a\.?d\.?|c\.?e\.?)$/i,parse:function(e,n){var t=n[0]||"";t=t.replace(/,/g,"");var r=parseInt(t.trim(),10),a=new Date,o={year:r,month:a.getMonth(),date:a.getDate()};return!1===A(o)?(e.epoch=null,e):(O(e,o),e=I(e))}},{reg:/^[0-9]{4}( ?a\.?d\.?)?$/i,parse:function(e,n){var t=e._today,r=x(n[0],t),a=new Date;t.month&&!t.date&&(t.date=1);var o={year:r,month:t.month||a.getMonth(),date:t.date||a.getDate()};return!1===A(o)?(e.epoch=null,e):(O(e,o),e=I(e))}}],L=function(e){return e.epoch=Date.now(),Object.keys(e._today||{}).forEach((function(n){"function"==typeof e[n]&&(e=e[n](e._today[n]))})),e},F={now:function(e){return L(e)},today:function(e){return L(e)},tonight:function(e){return e=(e=L(e)).hour(18)},tomorrow:function(e){return e=(e=(e=L(e)).add(1,"day")).startOf("day")},yesterday:function(e){return e=(e=(e=L(e)).subtract(1,"day")).startOf("day")},christmas:function(e){var n=L(e).year();return e=e.set([n,11,25,18,0,0])},"new years":function(e){var n=L(e).year();return e=e.set([n,11,31,18,0,0])}};F["new years eve"]=F["new years"];var Z=F,H={year:(new Date).getFullYear(),month:0,date:1},B=function(e,n,t){n=Object.assign({},H,t,n);for(var r=Object.keys(n),a=0;a0&&t<25e8&&!1===e.silent&&(console.warn(" - Warning: You are setting the date to January 1970."),console.warn(" - did input seconds instead of milliseconds?")),e.epoch=t,e;if(e.epoch=Date.now(),e._today&&n.isObject(e._today)&&Object.keys(e._today).length>0){var o=B(e,a,H);o.isValid()&&(e.epoch=o.epoch)}if(null==t||""===t)return e;if(!0===n.isDate(t))return e.epoch=t.getTime(),e;if(!0===n.isArray(t))return e=function(e,n,t){for(var r=["year","month","date","hour","minute","second","millisecond"],a=0;a0?n:(n=Math.abs(n),n+" BC")},"year-short":function(e){var n=e.year();return n>0?"'".concat(String(e.year()).substr(2,4)):(n=Math.abs(n))+" BC"},"iso-year":function(e){var t=e.year(),r=t<0,a=n.zeroPad(Math.abs(t),4);return r&&(a="-"+(a=n.zeroPad(a,6))),a},time:function(e){return e.time()},"time-24":function(e){return"".concat(e.hour24(),":").concat(n.zeroPad(e.minute()))},hour:function(e){return e.hour12()},"hour-pad":function(e){return n.zeroPad(e.hour12())},"hour-24":function(e){return e.hour24()},"hour-24-pad":function(e){return n.zeroPad(e.hour24())},minute:function(e){return e.minute()},"minute-pad":function(e){return n.zeroPad(e.minute())},second:function(e){return e.second()},"second-pad":function(e){return n.zeroPad(e.second())},ampm:function(e){return e.ampm()},quarter:function(e){return"Q"+e.quarter()},season:function(e){return e.season()},era:function(e){return e.era()},json:function(e){return e.json()},timezone:function(e){return e.timezone().name},offset:function(e){return K(e)},numeric:function(e){return"".concat(e.year(),"/").concat(n.zeroPad(e.month()+1),"/").concat(n.zeroPad(e.date()))},"numeric-us":function(e){return"".concat(n.zeroPad(e.month()+1),"/").concat(n.zeroPad(e.date()),"/").concat(e.year())},"numeric-uk":function(e){return"".concat(n.zeroPad(e.date()),"/").concat(n.zeroPad(e.month()+1),"/").concat(e.year())},"mm/dd":function(e){return"".concat(n.zeroPad(e.month()+1),"/").concat(n.zeroPad(e.date()))},iso:function(e){var t=e.format("iso-year"),r=n.zeroPad(e.month()+1),a=n.zeroPad(e.date()),o=n.zeroPad(e.h24()),i=n.zeroPad(e.minute()),u=n.zeroPad(e.second()),s=n.zeroPad(e.millisecond(),3),c=K(e);return"".concat(t,"-").concat(r,"-").concat(a,"T").concat(o,":").concat(i,":").concat(u,".").concat(s).concat(c)},"iso-short":function(e){var t=n.zeroPad(e.month()+1),r=n.zeroPad(e.date());return"".concat(e.year(),"-").concat(t,"-").concat(r)},"iso-utc":function(e){return new Date(e.epoch).toISOString()},nice:function(e){return"".concat(P()[e.month()]," ").concat(n.ordinal(e.date()),", ").concat(e.time())},"nice-year":function(e){return"".concat(P()[e.month()]," ").concat(n.ordinal(e.date()),", ").concat(e.year())},"nice-day":function(e){return"".concat(V()[e.day()]," ").concat(n.titleCase(P()[e.month()])," ").concat(n.ordinal(e.date()))},"nice-full":function(e){return"".concat(e.dayName()," ").concat(n.titleCase(e.monthName())," ").concat(n.ordinal(e.date()),", ").concat(e.time())}},X={"day-name":"day","month-name":"month","iso 8601":"iso","time-h24":"time-24","time-12":"time","time-h12":"time",tz:"timezone","day-num":"day-number","month-num":"month-number","month-iso":"iso-month","year-iso":"iso-year","nice-short":"nice",mdy:"numeric-us",dmy:"numeric-uk",ymd:"numeric","yyyy/mm/dd":"numeric","mm/dd/yyyy":"numeric-us","dd/mm/yyyy":"numeric-us","little-endian":"numeric-uk","big-endian":"numeric","day-nice":"nice-day"};Object.keys(X).forEach((function(e){return R[e]=R[X[e]]}));var ee=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(!0!==e.isValid())return"";if(R.hasOwnProperty(t)){var r=R[t](e)||"";return"json"!==t&&(r=String(r),"ampm"!==t&&(r=n.titleCase(r))),r}if(-1!==t.indexOf("{")){var a=/\{(.+?)\}/g;return t=t.replace(a,(function(n,t){return t=t.toLowerCase().trim(),R.hasOwnProperty(t)?String(R[t](e)):""}))}return e.format("iso-short")},ne=n.zeroPad,te=n.formatTimezone,re={G:function(e){return e.era()},GG:function(e){return e.era()},GGG:function(e){return e.era()},GGGG:function(e){return"AD"===e.era()?"Anno Domini":"Before Christ"},y:function(e){return e.year()},yy:function(e){return parseInt(String(e.year()).substr(2,4),10)},yyy:function(e){return e.year()},yyyy:function(e){return e.year()},yyyyy:function(e){return"0"+e.year()},Q:function(e){return e.quarter()},QQ:function(e){return e.quarter()},QQQ:function(e){return e.quarter()},QQQQ:function(e){return e.quarter()},M:function(e){return e.month()+1},MM:function(e){return ne(e.month()+1)},MMM:function(e){return e.format("month-short")},MMMM:function(e){return e.format("month")},w:function(e){return e.week()},ww:function(e){return ne(e.week())},d:function(e){return e.date()},dd:function(e){return ne(e.date())},D:function(e){return e.dayOfYear()},DD:function(e){return ne(e.dayOfYear())},DDD:function(e){return ne(e.dayOfYear(),3)},E:function(e){return e.format("day-short")},EE:function(e){return e.format("day-short")},EEE:function(e){return e.format("day-short")},EEEE:function(e){return e.format("day")},EEEEE:function(e){return e.format("day")[0]},e:function(e){return e.day()},ee:function(e){return e.day()},eee:function(e){return e.format("day-short")},eeee:function(e){return e.format("day")},eeeee:function(e){return e.format("day")[0]},a:function(e){return e.ampm().toUpperCase()},aa:function(e){return e.ampm().toUpperCase()},aaa:function(e){return e.ampm().toUpperCase()},aaaa:function(e){return e.ampm().toUpperCase()},h:function(e){return e.h12()},hh:function(e){return ne(e.h12())},H:function(e){return e.hour()},HH:function(e){return ne(e.hour())},m:function(e){return e.minute()},mm:function(e){return ne(e.minute())},s:function(e){return e.second()},ss:function(e){return ne(e.second())},A:function(e){return e.epoch-e.startOf("day").epoch},z:function(e){return e.timezone().name},zz:function(e){return e.timezone().name},zzz:function(e){return e.timezone().name},zzzz:function(e){return e.timezone().name},Z:function(e){return te(e.timezone().current.offset)},ZZ:function(e){return te(e.timezone().current.offset)},ZZZ:function(e){return te(e.timezone().current.offset)},ZZZZ:function(e){return te(e.timezone().current.offset,":")}},ae=function(e,n,t){for(var r=e,a=n,o=0;o.5&&(e=e.add(1,t)),e=e.startOf(t)):!1===e.silent&&console.warn("no known unit '"+t+"'"),e},he=function(e,n,t){var r=0;for(e=e.clone();e.isBefore(n);)e=e.add(1,t),r+=1;return e.isAfter(n,t)&&(r-=1),r},de=function(e,n,t){return e.isBefore(n)?he(e,n,t):-1*he(n,e,t)},fe=function(e,n){var t=n.epoch-e.epoch,r={milliseconds:t,seconds:parseInt(t/1e3,10)};r.minutes=parseInt(r.seconds/60,10),r.hours=parseInt(r.minutes/60,10);var a=e.clone();return r.years=function(e,n){var t=n.year()-e.year();return(e=e.year(n.year())).isAfter(n)&&(t-=1),t}(a,n),a=e.add(r.years,"year"),r.months=12*r.years,a=e.add(r.months,"month"),r.months+=de(a,n,"month"),r.weeks=52*r.years,a=e.add(r.weeks,"week"),r.weeks+=de(a,n,"week"),r.days=7*r.weeks,a=e.add(r.days,"day"),r.days+=de(a,n,"day"),r},le=function(e,t,r){t=n.beADate(t,e);var a=!1;if(e.isAfter(t)){var o=e;e=t,t=o,a=!0}var i=fe(e,t);return a&&(i=function(e){return Object.keys(e).forEach((function(n){e[n]*=-1})),e}(i)),r?(r=n.normalize(r),!0!==/s$/.test(r)&&(r+="s"),"dates"===r&&(r="days"),i[r]):i},me={months:{almost:10,over:4},days:{almost:25,over:10},hours:{almost:20,over:8},minutes:{almost:50,over:20},seconds:{almost:50,over:20}};function pe(e,n){return 1===e&&(n=n.slice(0,-1)),e+" "+n}var ye=function(e,t){var r,a,o,i=function(e,n){var t=e.isBefore(n),r=t?n:e,a=t?e:n;a=a.clone();var o={years:0,months:0,days:0,hours:0,minutes:0,seconds:0};return Object.keys(o).forEach((function(e){if(!a.isSame(r,e)){var n=a.diff(r,e);a=a.add(n,e),o[e]=n}})),t&&Object.keys(o).forEach((function(e){0!==o[e]&&(o[e]*=-1)})),o}(e,t=n.beADate(t,e));if(!0===Object.keys(i).every((function(e){return!i[e]})))return{diff:i,rounded:"now",qualified:"now",precise:"now"};var u=[];return Object.keys(i).forEach((function(e,n,t){var o=Math.abs(i[e]);if(0!==o){var s=pe(o,e);if(u.push(s),!r){if(r=a=s,n>4)return;var c=t[n+1],h=Math.abs(i[c]);h>me[c].almost?(r=pe(o+1,e),a="almost "+r):h>me[c].over&&(a="over "+s)}}})),o=u.splice(0,2).join(", "),!0===e.isAfter(t)?(r+=" ago",a+=" ago",o+=" ago"):(r="in "+r,a="in "+a,o="in "+o),{diff:i,rounded:r,qualified:a,precise:o}},ve={north:[["spring",2,1],["summer",5,1],["fall",8,1],["autumn",8,1],["winter",11,1]],south:[["fall",2,1],["autumn",2,1],["winter",5,1],["spring",8,1],["summer",11,1]]},ge=[null,[0,1],[3,1],[6,1],[9,1]],be={minute:function(e){return O(e,{second:0,millisecond:0}),e},quarterhour:function(e){var n=e.minutes();return e=n>=45?e.minutes(45):n>=30?e.minutes(30):n>=15?e.minutes(15):e.minutes(0),O(e,{second:0,millisecond:0}),e},hour:function(e){return O(e,{minute:0,second:0,millisecond:0}),e},day:function(e){return O(e,{hour:0,minute:0,second:0,millisecond:0}),e},week:function(e){var n=e.clone();return(e=e.day(e._weekStart)).isAfter(n)&&(e=e.subtract(1,"week")),O(e,{hour:0,minute:0,second:0,millisecond:0}),e},month:function(e){return O(e,{date:1,hour:0,minute:0,second:0,millisecond:0}),e},quarter:function(e){var n=e.quarter();return ge[n]&&O(e,{month:ge[n][0],date:ge[n][1],hour:0,minute:0,second:0,millisecond:0}),e},season:function(e){var n=e.season(),t="north";"South"===e.hemisphere()&&(t="south");for(var r=0;r1&&void 0!==arguments[1]?arguments[1]:"",r=arguments.length>2?arguments[2]:void 0;if(!t||!r)return[];if(t=n.normalize(t),r=e.clone().set(r),e.isAfter(r)){var a=e;e=r,r=a}var o=e.clone();ze(t)?(o=o.next(t),t="week"):o=o.next(t);for(var i=[];o.isBefore(r);)i.push(o),o=o.add(1,t);return i},je=function(e){var n=e.timezones,t=e.tz;if(!1===n.hasOwnProperty(t)&&(t=k(e.tz,n)),null===t)return!1===e.silent&&console.warn("Warn: could not find given or local timezone - '"+e.tz+"'"),{current:{epochShift:0}};var a,o,i=n[t],u={name:(a=t,a=(a=(a=a[0].toUpperCase()+a.substr(1)).replace(/\/gmt/,"/GMT")).replace(/[\/_]([a-z])/gi,(function(e){return e.toUpperCase()}))),hasDst:Boolean(i.dst),default_offset:i.offset,hemisphere:"s"===i.hem?"South":"North",current:{}};if(u.hasDst){var s=(o=i.dst)?o.split("->"):[];u.change={start:s[0],back:s[1]}}var c=i.offset,h=c;return!0===u.hasDst&&(h="North"===u.hemisphere?c-1:i.offset+1),!1===u.hasDst?(u.current.offset=c,u.current.isDST=!1):!0===r(e.epoch,u.change.start,u.change.back,c)?(u.current.offset=c,u.current.isDST="North"===u.hemisphere):(u.current.offset=h,u.current.isDST="South"===u.hemisphere),u},Oe=["century","decade","year","month","date","day","hour","minute","second","millisecond"],De={set:function(e,n){var t=this.clone();return t=Q(t,e,null),n&&(this.tz=k(n)),t},timezone:function(){return je(this)},isDST:function(){return je(this).current.isDST},hasDST:function(){return je(this).hasDst},offset:function(){return 60*je(this).current.offset},hemisphere:function(){return je(this).hemisphere},format:function(e){return ee(this,e)},unixFmt:function(e){return oe(this,e)},startOf:function(e){return ke(this,e)},endOf:function(e){return we(this,e)},leapYear:function(){var e=this.year();return n.isLeapYear(e)},progress:function(e){return se(this,e)},nearest:function(e){return ce(this,e)},diff:function(e,n){return le(this,e,n)},since:function(e){return e||(e=this.clone().set()),ye(this,e)},next:function(e){return this.add(1,e).startOf(e)},last:function(e){return this.subtract(1,e).startOf(e)},isValid:function(){return!(!this.epoch&&0!==this.epoch)&&!isNaN(this.d.getTime())},goto:function(e){var n=this.clone();return n.tz=k(e,n.timezones),n},every:function(e,n){return _e(this,e,n)},isAwake:function(){var e=this.hour();return!(e<8||e>22)},isAsleep:function(){return!this.isAwake()},log:function(){return console.log(""),console.log(ee(this,"nice-short")),this},logYear:function(){return console.log(""),console.log(ee(this,"full-short")),this},json:function(){var e=this;return Oe.reduce((function(n,t){return n[t]=e[t](),n}),{})},debug:function(){var e=this.timezone(),n=this.format("MM")+" "+this.format("date-ordinal")+" "+this.year();return n+="\n - "+this.format("time"),console.log("\n\n",n+"\n - "+e.name+" ("+e.current.offset+")"),this},from:function(e){return(e=this.clone().set(e)).since(this)},fromNow:function(){return this.clone().set(Date.now()).since(this)},weekStart:function(e){if("number"==typeof e)return this._weekStart=e,this;if("string"==typeof e){e=e.toLowerCase().trim();var n=V().indexOf(e);-1===n&&(n=W().indexOf(e)),-1===n&&(n=1),this._weekStart=n}else console.warn("Spacetime Error: Cannot understand .weekStart() input:",e);return this}};De.inDST=De.isDST,De.round=De.nearest,De.each=De.every;var Me=De,Pe=n.isLeapYear,Se=function(e){return"string"==typeof e&&(e=parseInt(e,10)),e},Ee=["year","month","date","hour","minute","second","millisecond"],qe=function(e,n,t){for(var r=Ee.indexOf(t),a=Ee.slice(r,Ee.length),o=0;o=24?n=24:n<0&&(n=0);var t=e.clone(),r=(e.hour()-n)*z.hour;return e.epoch-=r,O(e,{hour:n}),qe(e,t,"minute"),e.epoch},Ae=function(e,n){var t=n.match(/([0-9]{1,2}):([0-9]{1,2})(am|pm)?/);if(!t){if(!(t=n.match(/([0-9]{1,2})(am|pm)/)))return e.epoch;t.splice(2,0,"0")}var r=!1,a=parseInt(t[1],10),o=parseInt(t[2],10);return a>12&&(r=!0),!1===r&&("am"===t[3]&&12===a&&(a=0),"pm"===t[3]&&a<12&&(a+=12)),(e=(e=(e=(e=e.hour(a)).minute(o)).second(0)).millisecond(0)).epoch},$e=function(e,n){if((n=Se(n))>28){var t=e.month(),r=T[t];1===t&&29===n&&Pe(e.year())&&(r=29),n>r&&(n=r)}return n<=0&&(n=1),O(e,{date:n}),e.epoch},xe=function(e,n){"string"==typeof n&&(n=E()[n.toLowerCase()]),(n=Se(n))>=12&&(n=11),n<=0&&(n=0);var t=e.date();return t>T[n]&&(t=T[n]),O(e,{month:n,date:t}),e.epoch},Ye=function(e,n){return n=Se(n),O(e,{year:n}),e.epoch},Le=function(e,n){n=Se(n);var t=e.clone();return(n-=1)<=0?n=0:n>=365&&(n=364),e=(e=e.startOf("year")).add(n,"day"),qe(e,t,"hour"),e.epoch},Fe={millisecond:function(e){if(void 0!==e){var n=this.clone();return n.epoch=Ce(n,e),n}return this.d.getMilliseconds()},second:function(e){if(void 0!==e){var n=this.clone();return n.epoch=Ie(n,e),n}return this.d.getSeconds()},minute:function(e){if(void 0!==e){var n=this.clone();return n.epoch=Te(n,e),n}return this.d.getMinutes()},hour:function(e){var n=this.d;if(void 0!==e){var t=this.clone();return t.epoch=Ne(t,e),t}return n.getHours()},hourFloat:function(e){if(void 0!==e){var n=this.clone(),t=e%1;t*=60;var r=parseInt(e,10);return n.epoch=Ne(n,r),n.epoch=Te(n,t),n}var a=this.d,o=a.getHours(),i=a.getMinutes();return o+(i/=60)},hour12:function(e){var n=this.d;if(void 0!==e){var t=this.clone(),r=(e=""+e).match(/^([0-9]+)(am|pm)$/);if(r){var a=parseInt(r[1],10);"pm"===r[2]&&(a+=12),t.epoch=Ne(t,a)}return t}var o=n.getHours();return o>12&&(o-=12),0===o&&(o=12),o},time:function(e){if(void 0!==e){var t=this.clone();return t.epoch=Ae(t,e),t}return"".concat(this.h12(),":").concat(n.zeroPad(this.minute())).concat(this.ampm())},ampm:function(e){var n="am",t=this.hour();if(t>=12&&(n="pm"),"string"!=typeof e)return n;var r=this.clone();return e=e.toLowerCase().trim(),t>=12&&"am"===e?(t-=12,r.hour(t)):t<12&&"pm"===e?(t+=12,r.hour(t)):r},dayTime:function(e){if(void 0!==e){var n={morning:"7:00am",breakfast:"7:00am",noon:"12:00am",lunch:"12:00pm",afternoon:"2:00pm",evening:"6:00pm",dinner:"6:00pm",night:"11:00pm",midnight:"23:59pm"},t=this.clone();return e=(e=e||"").toLowerCase(),!0===n.hasOwnProperty(e)&&(t=t.time(n[e])),t}var r=this.hour();return r<6?"night":r<12?"morning":r<17?"afternoon":r<22?"evening":"night"},iso:function(e){return void 0!==e?this.set(e):this.format("iso")}},Ze={date:function(e){if(void 0!==e){var n=this.clone();return n.epoch=$e(n,e),n}return this.d.getDate()},day:function(e){if(void 0===e)return this.d.getDay();var n=this.clone(),t=e;"string"==typeof e&&(e=e.toLowerCase(),-1===(t=V().indexOf(e))&&(t=W().indexOf(e)));var r=this.d.getDay(),a=r-t,o=this.subtract(24*a,"hours");return O(o,{hour:n.hour(),minute:n.minute(),second:n.second()}),o},dayName:function(e){if(void 0===e)return W()[this.day()];var n=this.clone();return n=n.day(e)},month:function(e){if(void 0!==e){var n=this.clone();return n.epoch=xe(n,e),n}return this.d.getMonth()}},He=function(e){return e=(e=(e=e.minute(0)).second(0)).millisecond(1)},Be={dayOfYear:function(e){if(void 0!==e){var n=this.clone();return n.epoch=Le(n,e),n}for(var t,r=0,a=this.d.getMonth(),o=1;o<=a;o++)(t=new Date).setDate(1),t.setFullYear(this.d.getFullYear()),t.setHours(1),t.setMinutes(1),t.setMonth(o),t.setHours(-2),r+=t.getDate();return r+this.d.getDate()},week:function(e){if(void 0!==e){var n=this.clone();return n=(n=(n=n.month(0)).date(1)).day("monday"),"december"===(n=He(n)).monthName()&&(n=n.add(1,"week")),e-=1,n=n.add(e,"weeks")}var t=this.clone();t=(t=t.month(0)).date(1),"december"===(t=(t=He(t)).day("monday")).monthName()&&(t=t.add(1,"week"));var r=1;1===t.date()&&(r=0),t=t.minus(1,"second");var a=this.epoch;if(t.epoch>a)return 1;var o=0,i=4*this.month();for(t.epoch+=z.week*i,o+=i;o<52;o++){if(t.epoch>a)return o+r;t=t.add(1,"week")}return 52},monthName:function(e){if(void 0===e)return S()[this.month()];var n=this.clone();return n=n.month(e)},quarter:function(e){if(void 0!==e&&("string"==typeof e&&(e=e.replace(/^q/i,""),e=parseInt(e,10)),ge[e])){var n=this.clone(),t=ge[e][0];return n=(n=(n=n.month(t)).date(1)).startOf("day")}for(var r=this.d.getMonth(),a=1;a=ve[n][o][1]&&a0&&(n.epoch=Ye(n,-1*t)),"ad"===e&&t<0&&(n.epoch=Ye(n,-1*t)),n}return this.d.getFullYear()<0?"BC":"AD"},decade:function(e){if(void 0!==e){if(!(e=(e=(e=String(e)).replace(/([0-9])'?s$/,"$1")).replace(/([0-9])(th|rd|st|nd)/,"$1")))return console.warn("Spacetime: Invalid decade input"),this;2===e.length&&/[0-9][0-9]/.test(e)&&(e="19"+e);var n=Number(e);return isNaN(n)?this:(n=10*Math.floor(n/10),this.year(n))}return this.startOf("decade").year()},century:function(e){if(void 0!==e){"string"==typeof e&&(e=(e=(e=e.replace(/([0-9])(th|rd|st|nd)/,"$1")).replace(/([0-9]+) ?(b\.?c\.?|a\.?d\.?)/i,(function(e,n,t){return t.match(/b\.?c\.?/i)&&(n="-"+n),n}))).replace(/c$/,""));var n=Number(e);return isNaN(e)?(console.warn("Spacetime: Invalid century input"),this):(0===n&&(n=1),n=n>=0?100*(n-1):100*(n+1),this.year(n))}var t=this.startOf("century").year();return(t=Math.floor(t/100))<0?t-1:t+1},millenium:function(e){if(void 0!==e){if("string"==typeof e&&(e=e.replace(/([0-9])(th|rd|st|nd)/,"$1"),e=Number(e),isNaN(e)))return console.warn("Spacetime: Invalid millenium input"),this;e>0&&(e-=1);var n=1e3*e;return 0===n&&(n=1),this.year(n)}var t=Math.floor(this.year()/1e3);return t>=0&&(t+=1),t}},Qe=Object.assign({},Fe,Ze,Be);Qe.milliseconds=Qe.millisecond,Qe.seconds=Qe.second,Qe.minutes=Qe.minute,Qe.hours=Qe.hour,Qe.hour24=Qe.hour,Qe.h12=Qe.hour12,Qe.h24=Qe.hour24,Qe.days=Qe.day;var Ge=function(e){Object.keys(Qe).forEach((function(n){e.prototype[n]=Qe[n]}))},Ue=n.isLeapYear,Ve=function(e,n){return 1===e&&Ue(n)?29:T[e]},We=function(e,n){if(e.month>0){var t=parseInt(e.month/12,10);e.year=n.year()+t,e.month=e.month%12}else if(e.month<0){var r=Math.floor(Math.abs(e.month)/13,10);r=Math.abs(r)+1,e.year=n.year()-r,e.month=e.month%12,e.month=e.month+12,12===e.month&&(e.month=0)}return e},Je=function(e,n,t){for(var r=n.year(),a=n.month(),o=Ve(a,r);t>o;)t-=o,(a+=1)>=12&&(a-=12,r+=1),o=Ve(a,r);return e.month=a,e.date=t,e},Ke=function(e,n,t){e.year=n.year(),e.month=n.month();var r=n.date();for(e.date=r-Math.abs(t);e.date<1;){e.month-=1,e.month<0&&(e.month=11,e.year-=1);var a=Ve(e.month,e.year);e.date+=a}return e},Re=["millisecond","second","minute","hour","date","month"],Xe={second:Re.slice(0,1),minute:Re.slice(0,2),quarterhour:Re.slice(0,2),hour:Re.slice(0,3),date:Re.slice(0,4),month:Re.slice(0,4),quarter:Re.slice(0,4),season:Re.slice(0,4),year:Re,decade:Re,century:Re};Xe.week=Xe.hour,Xe.season=Xe.date,Xe.quarter=Xe.date;var en={year:!0,quarter:!0,season:!0,month:!0,week:!0,day:!0},nn={month:!0,quarter:!0,season:!0,year:!0},tn=function(e){e.prototype.add=function(e,t){var r=this.clone();if(!t||0===e)return r;var a=this.clone();t=n.normalize(t),z[t]?r.epoch+=z[t]*e:"week"===t?r.epoch+=z.day*(7*e):"quarter"===t||"season"===t||"season"===t?r.epoch+=z.month*(4*e):"quarterhour"===t&&(r.epoch+=15*z.minute*e);var o={};if(Xe[t]&&Xe[t].forEach((function(e){o[e]=a[e]()})),en[t]){var i=a.timezone().current.offset-r.timezone().current.offset;r.epoch+=3600*i*1e3}if("month"===t&&(o.month=a.month()+e,o=We(o,a)),"week"===t){var u=a.date()+7*e;u<=28&&u>1&&(o.date=u)}else if("date"===t){if(e<0)o=Ke(o,a,e);else{var s=a.date()+e;o=Je(o,a,s)}0!==e&&a.isSame(r,"day")&&(o.date=a.date()+e)}else"year"===t&&r.year()===a.year()?r.epoch+=z.week:"decade"===t?o.year=r.year()+10:"century"===t&&(o.year=r.year()+100);if(nn[t]){var c=T[o.month];o.date=a.date(),o.date>c&&(o.date=c)}return O(r,o),r},e.prototype.subtract=function(e,n){return this.clone().add(-1*e,n)},e.prototype.minus=e.prototype.subtract,e.prototype.plus=e.prototype.add},rn={millisecond:function(e){return e.epoch},second:function(e){return[e.year(),e.month(),e.date(),e.hour(),e.minute(),e.second()].join("-")},minute:function(e){return[e.year(),e.month(),e.date(),e.hour(),e.minute()].join("-")},hour:function(e){return[e.year(),e.month(),e.date(),e.hour()].join("-")},day:function(e){return[e.year(),e.month(),e.date()].join("-")},week:function(e){return[e.year(),e.week()].join("-")},month:function(e){return[e.year(),e.month()].join("-")},quarter:function(e){return[e.year(),e.quarter()].join("-")},year:function(e){return e.year()}};rn.date=rn.day;var an=function(e){e.prototype.isSame=function(n,t){return t?("string"!=typeof n&&"number"!=typeof n||(n=new e(n,this.timezone.name)),t=t.replace(/s$/,""),rn[t]?rn[t](this)===rn[t](n):null):null}},on=function(e){var t={isAfter:function(e){e=n.beADate(e,this);var t=n.getEpoch(e);return null===t?null:this.epoch>t},isBefore:function(e){e=n.beADate(e,this);var t=n.getEpoch(e);return null===t?null:this.epoch2&&void 0!==arguments[2]&&arguments[2];e=n.beADate(e,this),t=n.beADate(t,this);var a=n.getEpoch(e);if(null===a)return null;var o=n.getEpoch(t);return null===o?null:r?this.isBetween(e,t)||this.isEqual(e)||this.isEqual(t):a2&&void 0!==arguments[2]?arguments[2]:{};this.epoch=null,this.tz=k(n,sn),this.silent=t.silent||!0,this.british=t.dmy||t.british,this._weekStart=1,void 0!==t.weekStart&&(this._weekStart=t.weekStart),this._today={},void 0!==t.today&&(this._today=t.today),Object.defineProperty(this,"d",{get:function(){var e=a(this),n=(new Date(this.epoch).getTimezoneOffset()||0)+60*e;n=60*n*1e3;var t=this.epoch+n;return new Date(t)}}),Object.defineProperty(this,"timezones",{get:function(){return sn},set:function(e){return sn=e,e}});var r=Q(this,e,n);this.epoch=r.epoch};Object.keys(Me).forEach((function(e){cn.prototype[e]=Me[e]})),cn.prototype.clone=function(){return new cn(this.epoch,this.tz,{silent:this.silent,weekStart:this._weekStart,today:this._today})},cn.prototype.toLocalDate=function(){return new Date(this.epoch)},Ge(cn),tn(cn),an(cn),on(cn),un(cn);var hn=cn,dn=function(e,n){var t=new hn(null),r=new hn(null);t=t.time(e),r=n?r.time(n):t.add(59,"minutes");var a=t.hour(),o=r.hour();return Object.keys(t.timezones).filter((function(e){if(-1===e.indexOf("/"))return!1;var n=new hn(null,e),i=n.hour();return i>=a&&i<=o&&(!(i===a&&n.minute()r.minute()))}))},fn=function(e,n,t){return new hn(e,n,t)},ln=function(e){var n=e._today||{};return Object.keys(n).forEach((function(t){e=e[t](n[t])})),e};return fn.now=function(e,n){var t=new hn((new Date).getTime(),e,n);return t=ln(t)},fn.today=function(e,n){var t=new hn((new Date).getTime(),e,n);return(t=ln(t)).startOf("day")},fn.tomorrow=function(e,n){var t=new hn((new Date).getTime(),e,n);return(t=ln(t)).add(1,"day").startOf("day")},fn.yesterday=function(e,n){var t=new hn((new Date).getTime(),e,n);return(t=ln(t)).subtract(1,"day").startOf("day")},fn.extend=function(e){return Object.keys(e).forEach((function(n){hn.prototype[n]=e[n]})),this},fn.whereIts=dn,fn.version="6.6.4",fn.plugin=fn.extend,fn})); diff --git a/builds/spacetime.mjs b/builds/spacetime.mjs index e3f3b244..c09c963a 100644 --- a/builds/spacetime.mjs +++ b/builds/spacetime.mjs @@ -1,4 +1,4 @@ -/* spencermountain/spacetime 6.6.3 Apache 2.0 */ +/* spencermountain/spacetime 6.6.4 Apache 2.0 */ function createCommonjsModule(fn, module) { return module = { exports: {} }, fn(module, module.exports), module.exports; } @@ -112,9 +112,11 @@ var fns = createCommonjsModule(function (module, exports) { exports.formatTimezone = function (offset) { var delimiter = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ''; - var absOffset = Math.abs(offset); var sign = offset > 0 ? '+' : '-'; - return "".concat(sign).concat(exports.zeroPad(absOffset)).concat(delimiter, "00"); + var absOffset = Math.abs(offset); + var hours = exports.zeroPad(parseInt('' + absOffset, 10)); + var minutes = exports.zeroPad(absOffset % 1 * 60); + return "".concat(sign).concat(hours).concat(delimiter).concat(minutes); }; }); var fns_1 = fns.isLeapYear; @@ -1384,36 +1386,7 @@ var days = { var isoOffset = function isoOffset(s) { var offset = s.timezone().current.offset; - var isNegative = offset < 0; - var minute = '00'; //handle 5.5 → '5:30' - - if (Math.abs(offset % 1) === 0.5) { - minute = '30'; - - if (offset >= 0) { - offset = Math.floor(offset); - } else { - offset = Math.ceil(offset); - } - } - - if (isNegative) { - //handle negative sign - offset *= -1; - offset = fns.zeroPad(offset, 2); - offset = '-' + offset; - } else { - offset = fns.zeroPad(offset, 2); - offset = '+' + offset; - } - - offset = offset + ':' + minute; //'Z' means 00 - - if (offset === '+00:00') { - offset = 'Z'; - } - - return offset; + return !offset ? 'Z' : fns.formatTimezone(offset, ':'); }; var _offset = isoOffset; @@ -4066,7 +4039,7 @@ var whereIts = function whereIts(a, b) { var whereIts_1 = whereIts; -var _version = '6.6.3'; +var _version = '6.6.4'; var main$1 = function main(input, tz, options) { return new spacetime(input, tz, options); diff --git a/changelog.md b/changelog.md index 663f6338..caf5fa9a 100644 --- a/changelog.md +++ b/changelog.md @@ -8,6 +8,11 @@ This project follows semVer, where: * don't reverse dates for .every() method --> +### v6.6.4 + +- [fix] 45m offset formatting issue +- update deps + ### v6.6.3 - support for 'today' param with null inputs diff --git a/package-lock.json b/package-lock.json index 2d65eadf..5de6f697 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "spacetime", - "version": "6.6.2", + "version": "6.6.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -25,19 +25,19 @@ } }, "@babel/core": { - "version": "7.11.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz", - "integrity": "sha512-5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg==", + "version": "7.11.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz", + "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.4", + "@babel/generator": "^7.11.6", "@babel/helper-module-transforms": "^7.11.0", "@babel/helpers": "^7.10.4", - "@babel/parser": "^7.11.4", + "@babel/parser": "^7.11.5", "@babel/template": "^7.10.4", - "@babel/traverse": "^7.11.0", - "@babel/types": "^7.11.0", + "@babel/traverse": "^7.11.5", + "@babel/types": "^7.11.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -48,27 +48,10 @@ "source-map": "^0.5.0" }, "dependencies": { - "@babel/generator": { - "version": "7.11.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz", - "integrity": "sha512-Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g==", - "dev": true, - "requires": { - "@babel/types": "^7.11.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/parser": { - "version": "7.11.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz", - "integrity": "sha512-MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -85,26 +68,20 @@ } }, "@babel/generator": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz", - "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==", + "version": "7.11.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz", + "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==", "dev": true, "requires": { - "@babel/types": "^7.11.0", + "@babel/types": "^7.11.5", "jsesc": "^2.5.1", "source-map": "^0.5.0" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -113,9 +90,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -129,16 +106,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -147,9 +118,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -164,16 +135,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -182,9 +147,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -238,16 +203,10 @@ "lodash": "^4.17.19" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -256,33 +215,26 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } }, "@babel/helper-explode-assignable-expression": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz", - "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==", + "version": "7.11.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz", + "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==", "dev": true, "requires": { - "@babel/traverse": "^7.10.4", "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -291,9 +243,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -309,16 +261,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -327,9 +273,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -343,16 +289,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -361,9 +301,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -377,16 +317,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -395,9 +329,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -411,16 +345,10 @@ "@babel/types": "^7.11.0" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -429,9 +357,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -469,16 +397,10 @@ "@babel/types": "^7.10.4" } }, - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -487,9 +409,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -503,16 +425,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -521,9 +437,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -544,36 +460,29 @@ }, "dependencies": { "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } }, "@babel/helper-remap-async-to-generator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz", - "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==", + "version": "7.11.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz", + "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.10.4", "@babel/helper-wrap-function": "^7.10.4", "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -582,9 +491,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -601,16 +510,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -619,9 +522,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -636,16 +539,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -654,9 +551,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -670,16 +567,10 @@ "@babel/types": "^7.11.0" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -688,9 +579,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -704,16 +595,10 @@ "@babel/types": "^7.11.0" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -722,9 +607,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -747,16 +632,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -765,9 +644,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -784,9 +663,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -814,9 +693,9 @@ } }, "@babel/parser": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz", - "integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz", + "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { @@ -1089,16 +968,10 @@ "@babel/types": "^7.10.4" } }, - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1107,9 +980,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -1124,9 +997,9 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.5.tgz", - "integrity": "sha512-6Ycw3hjpQti0qssQcA6AMSFDHeNJ++R6dIMnpRqUjFeBBTmTDPa8zgF90OVfTvAo11mXZTlVUViY1g8ffrURLg==", + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz", + "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" @@ -1410,9 +1283,9 @@ } }, "@babel/preset-env": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz", - "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz", + "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==", "dev": true, "requires": { "@babel/compat-data": "^7.11.0", @@ -1477,7 +1350,7 @@ "@babel/plugin-transform-unicode-escapes": "^7.10.4", "@babel/plugin-transform-unicode-regex": "^7.10.4", "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.11.0", + "@babel/types": "^7.11.5", "browserslist": "^4.12.0", "core-js-compat": "^3.6.2", "invariant": "^2.2.2", @@ -1494,16 +1367,10 @@ "@babel/types": "^7.10.4" } }, - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1512,17 +1379,17 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } }, "@babel/preset-modules": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz", - "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", + "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -1533,9 +1400,9 @@ } }, "@babel/runtime": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.0.tgz", - "integrity": "sha512-qArkXsjJq7H+T86WrIFV0Fnu/tNOkZ4cgXmjkzAu3b/58D5mFIO8JH/y77t7C9q0OdDRdh9s7Ue5GasYssxtXw==", + "version": "7.11.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", + "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" @@ -1552,36 +1419,10 @@ "@babel/types": "^7.10.4" }, "dependencies": { - "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1590,60 +1431,34 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } }, "@babel/traverse": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz", - "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz", + "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.0", + "@babel/generator": "^7.11.5", "@babel/helper-function-name": "^7.10.4", "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.11.0", - "@babel/types": "^7.11.0", + "@babel/parser": "^7.11.5", + "@babel/types": "^7.11.5", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.19" }, "dependencies": { - "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, "@babel/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz", - "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.10.4", @@ -1652,9 +1467,9 @@ } }, "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -1784,15 +1599,15 @@ } }, "browserslist": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz", - "integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==", + "version": "4.14.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz", + "integrity": "sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001093", - "electron-to-chromium": "^1.3.488", - "escalade": "^3.0.1", - "node-releases": "^1.1.58" + "caniuse-lite": "^1.0.30001125", + "electron-to-chromium": "^1.3.564", + "escalade": "^3.0.2", + "node-releases": "^1.1.61" } }, "buffer-from": { @@ -1808,9 +1623,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001109", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz", - "integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ==", + "version": "1.0.30001129", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001129.tgz", + "integrity": "sha512-9945fTVKS810DZITpsAbuhQG7Lam0tEfVbZlsBaCFZaszepbryrArS05PWmJSBQ6mta+v9iz0pUIAbW1eBILIg==", "dev": true }, "chalk": { @@ -1970,9 +1785,9 @@ } }, "electron-to-chromium": { - "version": "1.3.515", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.515.tgz", - "integrity": "sha512-C9h2yLQwNSK/GTtWQsA9O6mLKv0ubmiAQgmz1HvHnAIH8g5Sje1shWxcooumbGiwgqvZ9yrTYULe4seMTgMYqQ==", + "version": "1.3.567", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.567.tgz", + "integrity": "sha512-1aKkw0Hha1Bw9JA5K5PT5eFXC/TXbkJvUfNSNEciPUMgSIsRJZM1hF2GUEAGZpAbgvd8En21EA+Lv820KOhvqA==", "dev": true }, "es-abstract": { @@ -2029,9 +1844,9 @@ } }, "escalade": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz", - "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz", + "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==", "dev": true }, "escape-string-regexp": { @@ -2445,9 +2260,9 @@ "dev": true }, "node-releases": { - "version": "1.1.60", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz", - "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==", + "version": "1.1.61", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz", + "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==", "dev": true }, "normalize-path": { @@ -2621,7 +2436,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -2646,9 +2461,9 @@ } }, "rollup": { - "version": "2.26.7", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.26.7.tgz", - "integrity": "sha512-3/aXJ+ibw2fqj6KBX4ioYcx8s3kseYXzyxLR6Xmm7Zakzd7WNvn9XDUahBCQ/oPVHmVO9gEeIYKHgFaZWqsJzg==", + "version": "2.26.11", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.26.11.tgz", + "integrity": "sha512-xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw==", "dev": true, "requires": { "fsevents": "~2.1.2" @@ -2746,9 +2561,9 @@ } }, "rollup-plugin-terser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.0.tgz", - "integrity": "sha512-p/N3lLiFusCjYTLfVkoaiRTOGr5AESEaljMPH12MhOtoMkmTBhIAfuadrcWy4am1U0vU4WTxO9fi0K09O4CboQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz", + "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==", "dev": true, "requires": { "@babel/code-frame": "^7.10.4", @@ -3028,9 +2843,9 @@ } }, "terser": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.2.1.tgz", - "integrity": "sha512-/AOtjRtAMNGO0fIF6m8HfcvXTw/2AKpsOzDn36tA5RfhRdeXyb4RvHxJ5Pah7iL6dFkLk+gOnCaNHGwJPl6TrQ==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.1.tgz", + "integrity": "sha512-yD80f4hdwCWTH5mojzxe1q8bN1oJbsK/vfJGLcPZM/fl+/jItIVNKhFIHqqR71OipFWMLgj3Kc+GIp6CeIqfnA==", "dev": true, "requires": { "commander": "^2.20.0", diff --git a/package.json b/package.json index 976f122e..e7c0460d 100644 --- a/package.json +++ b/package.json @@ -37,16 +37,16 @@ }, "dependencies": {}, "devDependencies": { - "@babel/core": "7.11.4", - "@babel/preset-env": "7.11.0", + "@babel/core": "7.11.6", + "@babel/preset-env": "7.11.5", "amble": "1.1.0", - "rollup": "2.26.7", + "rollup": "2.26.11", "rollup-plugin-babel": "4.4.0", "rollup-plugin-commonjs": "10.1.0", "rollup-plugin-filesize-check": "0.0.1", "rollup-plugin-json": "^4.0.0", "rollup-plugin-node-resolve": "5.2.0", - "rollup-plugin-terser": "7.0.0", + "rollup-plugin-terser": "7.0.2", "shelljs": "0.8.4", "tap-dancer": "0.2.0", "tape": "5.0.1",