[Pkg-javascript-commits] [node-moment] 01/04: New upstream version 2.19.3+ds
Julien Puydt
julien.puydt at laposte.net
Sun Dec 3 01:43:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository node-moment.
commit f150620d5aaa2acbf1fc2f5a2c142ac09c34c0f2
Author: Julien Puydt <julien.puydt at laposte.net>
Date: Sun Dec 3 02:31:31 2017 +0100
New upstream version 2.19.3+ds
---
CHANGELOG.md | 7 +
Moment.js.nuspec | 8 +-
component.json | 2 +-
locale/es-us.js | 2 +-
locale/hu.js | 3 +-
meteor/package.js | 2 +-
min/locales.js | 5 +-
min/moment-with-locales.js | 11 +-
min/tests.js | 427 ++++++---------------------------------------
moment.js | 6 +-
package.json | 2 +-
src/lib/parse/regex.js | 2 +-
src/locale/es-us.js | 2 +-
src/moment.js | 4 +-
14 files changed, 83 insertions(+), 400 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f56995c..d4e9a7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
Changelog
=========
+### 2.19.3 [See changelog](https://gist.github.com/marwahaha/3654006bc0c2e522451c08d12c0bfabf)
+
+* Release Nov 29, 2017
+
+* [#4326](https://github.com/moment/moment/pull/4326) [bugfix] Fix for ReDOS vulnerability (see [#4163](https://github.com/moment/moment/issues/4163))
+* [#4289](https://github.com/moment/moment/pull/4289) [misc] Fix spelling and formatting for U.S. for es-us
+
### 2.19.2 [See changelog (it's the same >:D)](https://gist.github.com/ichernev/76b1a3f33d3a8ff9665ce434a45221d0)
* Release Nov 11, 2017
diff --git a/Moment.js.nuspec b/Moment.js.nuspec
index bf5c860..a71d8e1 100644
--- a/Moment.js.nuspec
+++ b/Moment.js.nuspec
@@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Moment.js</id>
- <version>2.19.2</version>
+ <version>2.19.3</version>
<authors>Tim Wood, Iskren Chernev, Moment.js contributors</authors>
<owners>Cory Deppen, Iskren Chernev</owners>
<description>A lightweight JavaScript date library for parsing, manipulating, and formatting dates.</description>
<releaseNotes>
- * Release Nov 11, 2017
+ * Release Nov 29, 2017
- * [#4255](https://github.com/moment/moment/pull/4255) [bugfix] Fix year setter for random days in a leap year, fixes [#4238](https://github.com/moment/moment/issues/4238)
- * [#4242](https://github.com/moment/moment/pull/4242) [bugfix] updateLocale now tries to load parent, fixes [#3626](https://github.com/moment/moment/issues/3626)
+ * [#4326](https://github.com/moment/moment/pull/4326) [bugfix] Fix for ReDOS vulnerability (see [#4163](https://github.com/moment/moment/issues/4163))
+ * [#4289](https://github.com/moment/moment/pull/4289) [misc] Fix spelling and formatting for U.S. for es-us
</releaseNotes>
<projectUrl>http://momentjs.com/</projectUrl>
<iconUrl>http://pbs.twimg.com/profile_images/482670411402858496/Xrtdc94q_normal.png</iconUrl>
diff --git a/component.json b/component.json
index aa803c8..4ce6043 100644
--- a/component.json
+++ b/component.json
@@ -1,6 +1,6 @@
{
"name": "moment",
- "version": "2.19.2",
+ "version": "2.19.3",
"main": "moment.js",
"description": "Parse, validate, manipulate, and display dates in JavaScript.",
"files": [
diff --git a/locale/es-us.js b/locale/es-us.js
index d5661ef..c7d2f97 100644
--- a/locale/es-us.js
+++ b/locale/es-us.js
@@ -1,5 +1,5 @@
//! moment.js locale configuration
-//! locale : Spanish(United State) [es-us]
+//! locale : Spanish (United States) [es-us]
//! author : bustta : https://github.com/bustta
;(function (global, factory) {
diff --git a/locale/hu.js b/locale/hu.js
index e215874..8460392 100644
--- a/locale/hu.js
+++ b/locale/hu.js
@@ -12,8 +12,7 @@
var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
function translate(number, withoutSuffix, key, isFuture) {
- var num = number,
- suffix;
+ var num = number;
switch (key) {
case 's':
return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
diff --git a/meteor/package.js b/meteor/package.js
index 8a3b487..0b8b4e0 100644
--- a/meteor/package.js
+++ b/meteor/package.js
@@ -6,7 +6,7 @@ var packageName = 'momentjs:moment'; // https://atmospherejs.com/momentjs/momen
Package.describe({
name: packageName,
summary: 'Moment.js (official): parse, validate, manipulate, and display dates - official Meteor packaging',
- version: '2.19.2',
+ version: '2.19.3',
git: 'https://github.com/moment/moment.git'
});
diff --git a/min/locales.js b/min/locales.js
index 5d390fd..7163058 100644
--- a/min/locales.js
+++ b/min/locales.js
@@ -2597,7 +2597,7 @@ moment.defineLocale('es-do', {
});
//! moment.js locale configuration
-//! locale : Spanish(United State) [es-us]
+//! locale : Spanish (United States) [es-us]
//! author : bustta : https://github.com/bustta
var monthsShortDot$1 = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_');
@@ -4076,8 +4076,7 @@ moment.defineLocale('hr', {
var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
function translate$4(number, withoutSuffix, key, isFuture) {
- var num = number,
- suffix;
+ var num = number;
switch (key) {
case 's':
return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
diff --git a/min/moment-with-locales.js b/min/moment-with-locales.js
index 5a3c3db..54550f5 100644
--- a/min/moment-with-locales.js
+++ b/min/moment-with-locales.js
@@ -653,7 +653,7 @@ var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
// any word (or two) characters or numbers including two/three word month in arabic.
// includes scottish gaelic two word and hyphenated months
-var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
+var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
var regexes = {};
@@ -4472,12 +4472,12 @@ addParseToken('x', function (input, array, config) {
// Side effect imports
//! moment.js
-//! version : 2.19.2
+//! version : 2.19.3
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
-hooks.version = '2.19.2';
+hooks.version = '2.19.3';
setHookCallback(createLocal);
@@ -7097,7 +7097,7 @@ hooks.defineLocale('es-do', {
});
//! moment.js locale configuration
-//! locale : Spanish(United State) [es-us]
+//! locale : Spanish (United States) [es-us]
//! author : bustta : https://github.com/bustta
var monthsShortDot$1 = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_');
@@ -8576,8 +8576,7 @@ hooks.defineLocale('hr', {
var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
function translate$4(number, withoutSuffix, key, isFuture) {
- var num = number,
- suffix;
+ var num = number;
switch (key) {
case 's':
return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
diff --git a/min/tests.js b/min/tests.js
index e6da26b..2c593bb 100644
--- a/min/tests.js
+++ b/min/tests.js
@@ -57703,7 +57703,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -57855,7 +57855,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -59181,7 +59181,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -59310,7 +59310,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -59337,11 +59337,9 @@ function hasOwnProp(a, b) {
return Object.prototype.hasOwnProperty.call(a, b);
}
-var aliases = {};
-
function addUnitAlias (unit, shorthand) {
var lowerCase = unit.toLowerCase();
- aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
+
}
var hookCallback;
@@ -59536,41 +59534,10 @@ hooks.parseTwoDigitYear = function (input) {
// MOMENTS
-function isArray(input) {
- return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
-}
-
function mod(n, x) {
return ((n % x) + x) % x;
}
-var indexOf;
-
-if (Array.prototype.indexOf) {
- indexOf = Array.prototype.indexOf;
-} else {
- indexOf = function (o) {
- // I know
- var i;
- for (i = 0; i < this.length; ++i) {
- if (this[i] === o) {
- return i;
- }
- }
- return -1;
- };
-}
-
-function isObject(input) {
- // IE8 will treat undefined and null as object if it wasn't for
- // input != null
- return input != null && Object.prototype.toString.call(input) === '[object Object]';
-}
-
-function isUndefined(input) {
- return input === void 0;
-}
-
function extend(a, b) {
for (var i in b) {
if (hasOwnProp(b, i)) {
@@ -59616,24 +59583,6 @@ function getParsingFlags(m) {
return m._pf;
}
-var some;
-if (Array.prototype.some) {
- some = Array.prototype.some;
-} else {
- some = function (fun) {
- var t = Object(this);
- var len = t.length >>> 0;
-
- for (var i = 0; i < len; i++) {
- if (i in t && fun.call(this, t[i], i, t)) {
- return true;
- }
- }
-
- return false;
- };
-}
-
// Plugins that add properties should also add the key here (null value),
// so we can properly clone ourselves.
var momentProperties = hooks.momentProperties = [];
@@ -59642,21 +59591,6 @@ var momentProperties = hooks.momentProperties = [];
// Moment prototype object
-// compare two arrays, return the number of differences
-function compareArrays(array1, array2, dontConvert) {
- var len = Math.min(array1.length, array2.length),
- lengthDiff = Math.abs(array1.length - array2.length),
- diffs = 0,
- i;
- for (i = 0; i < len; i++) {
- if ((dontConvert && array1[i] !== array2[i]) ||
- (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
- diffs++;
- }
- }
- return diffs + lengthDiff;
-}
-
function warn(msg) {
if (hooks.suppressDeprecationWarnings === false &&
(typeof console !== 'undefined') && console.warn) {
@@ -59694,109 +59628,11 @@ function deprecate(msg, fn) {
}, fn);
}
-var deprecations = {};
-function deprecateSimple(name, msg) {
- if (hooks.deprecationHandler != null) {
- hooks.deprecationHandler(name, msg);
- }
- if (!deprecations[name]) {
- warn(msg);
- deprecations[name] = true;
- }
-}
hooks.suppressDeprecationWarnings = false;
hooks.deprecationHandler = null;
-function mergeConfigs(parentConfig, childConfig) {
- var res = extend({}, parentConfig), prop;
- for (prop in childConfig) {
- if (hasOwnProp(childConfig, prop)) {
- if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
- res[prop] = {};
- extend(res[prop], parentConfig[prop]);
- extend(res[prop], childConfig[prop]);
- } else if (childConfig[prop] != null) {
- res[prop] = childConfig[prop];
- } else {
- delete res[prop];
- }
- }
- }
- for (prop in parentConfig) {
- if (hasOwnProp(parentConfig, prop) &&
- !hasOwnProp(childConfig, prop) &&
- isObject(parentConfig[prop])) {
- // make sure changes to properties don't modify parent config
- res[prop] = extend({}, res[prop]);
- }
- }
- return res;
-}
-
-function Locale(config) {
- if (config != null) {
- this.set(config);
- }
-}
-
-var keys;
-
-if (Object.keys) {
- keys = Object.keys;
-} else {
- keys = function (obj) {
- var i, res = [];
- for (i in obj) {
- if (hasOwnProp(obj, i)) {
- res.push(i);
- }
- }
- return res;
- };
-}
-
-var defaultCalendar = {
- sameDay : '[Today at] LT',
- nextDay : '[Tomorrow at] LT',
- nextWeek : 'dddd [at] LT',
- lastDay : '[Yesterday at] LT',
- lastWeek : '[Last] dddd [at] LT',
- sameElse : 'L'
-};
-
-var defaultLongDateFormat = {
- LTS : 'h:mm:ss A',
- LT : 'h:mm A',
- L : 'MM/DD/YYYY',
- LL : 'MMMM D, YYYY',
- LLL : 'MMMM D, YYYY h:mm A',
- LLLL : 'dddd, MMMM D, YYYY h:mm A'
-};
-
-var defaultInvalidDate = 'Invalid date';
-
-var defaultOrdinal = '%d';
-var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
-
-var defaultRelativeTime = {
- future : 'in %s',
- past : '%s ago',
- s : 'a few seconds',
- ss : '%d seconds',
- m : 'a minute',
- mm : '%d minutes',
- h : 'an hour',
- hh : '%d hours',
- d : 'a day',
- dd : '%d days',
- M : 'a month',
- MM : '%d months',
- y : 'a year',
- yy : '%d years'
-};
-
// https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
// FORMATTING
@@ -59826,10 +59662,7 @@ addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token)
-var defaultLocaleWeek = {
- dow : 0, // Sunday is the first day of the week.
- doy : 6 // The week that contains Jan 1st is the first week of the year.
-};
+
@@ -60015,7 +59848,7 @@ addParseToken('Hmmss', function (input, array, config) {
-var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
+
@@ -60030,171 +59863,17 @@ var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
// week
// weekdays
// meridiem
-var baseConfig = {
- calendar: defaultCalendar,
- longDateFormat: defaultLongDateFormat,
- invalidDate: defaultInvalidDate,
- ordinal: defaultOrdinal,
- dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
- relativeTime: defaultRelativeTime,
-
- months: defaultLocaleMonths,
- monthsShort: defaultLocaleMonthsShort,
-
- week: defaultLocaleWeek,
-
- weekdays: defaultLocaleWeekdays,
- weekdaysMin: defaultLocaleWeekdaysMin,
- weekdaysShort: defaultLocaleWeekdaysShort,
-
- meridiemParse: defaultLocaleMeridiemParse
-};
-
-// internal storage for locale config files
-var locales = {};
-var localeFamilies = {};
-var globalLocale;
-
-function normalizeLocale(key) {
- return key ? key.toLowerCase().replace('_', '-') : key;
-}
-
-// pick the locale from the array
-// try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
-// substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
-function chooseLocale(names) {
- var i = 0, j, next, locale, split;
-
- while (i < names.length) {
- split = normalizeLocale(names[i]).split('-');
- j = split.length;
- next = normalizeLocale(names[i + 1]);
- next = next ? next.split('-') : null;
- while (j > 0) {
- locale = loadLocale(split.slice(0, j).join('-'));
- if (locale) {
- return locale;
- }
- if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
- //the next array item is better than a shallower substring of this one
- break;
- }
- j--;
- }
- i++;
- }
- return null;
-}
-
-function loadLocale(name) {
- var oldLocale = null;
- // TODO: Find a better way to register and load all the locales in Node
- if (!locales[name] && (typeof module !== 'undefined') &&
- module && module.exports) {
- try {
- oldLocale = globalLocale._abbr;
- var aliasedRequire = require;
- aliasedRequire('./locale/' + name);
- getSetGlobalLocale(oldLocale);
- } catch (e) {}
- }
- return locales[name];
-}
// This function will load locale and then set the global locale. If
// no arguments are passed in, it will simply return the current global
// locale key.
-function getSetGlobalLocale (key, values) {
- var data;
- if (key) {
- if (isUndefined(values)) {
- data = getLocale(key);
- }
- else {
- data = defineLocale(key, values);
- }
- if (data) {
- // moment.duration._locale = moment._locale = data;
- globalLocale = data;
- }
- }
- return globalLocale._abbr;
-}
-function defineLocale (name, config) {
- if (config !== null) {
- var parentConfig = baseConfig;
- config.abbr = name;
- if (locales[name] != null) {
- deprecateSimple('defineLocaleOverride',
- 'use moment.updateLocale(localeName, config) to change ' +
- 'an existing locale. moment.defineLocale(localeName, ' +
- 'config) should only be used for creating a new locale ' +
- 'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
- parentConfig = locales[name]._config;
- } else if (config.parentLocale != null) {
- if (locales[config.parentLocale] != null) {
- parentConfig = locales[config.parentLocale]._config;
- } else {
- if (!localeFamilies[config.parentLocale]) {
- localeFamilies[config.parentLocale] = [];
- }
- localeFamilies[config.parentLocale].push({
- name: name,
- config: config
- });
- return null;
- }
- }
- locales[name] = new Locale(mergeConfigs(parentConfig, config));
-
- if (localeFamilies[name]) {
- localeFamilies[name].forEach(function (x) {
- defineLocale(x.name, x.config);
- });
- }
-
- // backwards compat for now: also set the locale
- // make sure we set the locale AFTER all child locales have been
- // created, so we won't end up with the child locale set.
- getSetGlobalLocale(name);
-
-
- return locales[name];
- } else {
- // useful for testing
- delete locales[name];
- return null;
- }
-}
// returns locale data
-function getLocale (key) {
- var locale;
-
- if (key && key._locale && key._locale._abbr) {
- key = key._locale._abbr;
- }
-
- if (!key) {
- return globalLocale;
- }
-
- if (!isArray(key)) {
- //short-circuit everything else
- locale = loadLocale(key);
- if (locale) {
- return locale;
- }
- key = [key];
- }
-
- return chooseLocale(key);
-}
// convert an array to a date.
// the array should mirror the parameters below
@@ -60407,7 +60086,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -60692,7 +60371,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -61034,7 +60713,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -61893,7 +61572,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -62033,7 +61712,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -62214,7 +61893,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -62813,7 +62492,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -62960,7 +62639,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -63439,7 +63118,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -63562,7 +63241,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -63838,7 +63517,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -64052,6 +63731,8 @@ test('is after invalid', function (assert) {
var test = QUnit.test;
+var expect = QUnit.expect;
+
function isArray(input) {
return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
}
@@ -64146,7 +63827,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -64418,7 +64099,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -64870,7 +64551,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -64991,7 +64672,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -65071,6 +64752,8 @@ test('is moment with hacked hasOwnProperty', function (assert) {
var test = QUnit.test;
+var expect = QUnit.expect;
+
function isNumber(input) {
return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
}
@@ -65174,7 +64857,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -65420,7 +65103,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -65697,7 +65380,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -65976,7 +65659,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -66354,7 +66037,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -66460,7 +66143,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -66589,11 +66272,7 @@ test('with locale data', function (assert) {
weekdaysMin = '1_2_3_4_5_6_7'.split('_'),
weekdaysLocale = 'four_five_six_seven_one_two_three'.split('_'),
weekdaysShortLocale = 'fo_fi_si_se_on_tw_th'.split('_'),
- weekdaysMinLocale = '4_5_6_7_1_2_3'.split('_'),
- week = {
- dow : 3,
- doy : 6
- };
+ weekdaysMinLocale = '4_5_6_7_1_2_3'.split('_');
var customLocale = moment.localeData('numerologists');
@@ -66678,7 +66357,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -67293,7 +66972,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -67570,7 +67249,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -67839,7 +67518,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -67982,7 +67661,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -68103,7 +67782,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -68229,7 +67908,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -68406,7 +68085,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -68675,7 +68354,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -68843,7 +68522,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -69039,7 +68718,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -69354,7 +69033,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -69844,7 +69523,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -70103,7 +69782,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -70276,7 +69955,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -70855,7 +70534,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -71258,7 +70937,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -71504,7 +71183,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -71823,7 +71502,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
@@ -72212,7 +71891,7 @@ function matchedDeprecation(name, msg, deprecations) {
var test = QUnit.test;
-
+var expect = QUnit.expect;
function module$1 (name, lifecycle) {
QUnit.module(name, {
diff --git a/moment.js b/moment.js
index f806995..9dd31d1 100644
--- a/moment.js
+++ b/moment.js
@@ -1,5 +1,5 @@
//! moment.js
-//! version : 2.19.2
+//! version : 2.19.3
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
@@ -659,7 +659,7 @@ var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
// any word (or two) characters or numbers including two/three word month in arabic.
// includes scottish gaelic two word and hyphenated months
-var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
+var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
var regexes = {};
@@ -4478,7 +4478,7 @@ addParseToken('x', function (input, array, config) {
// Side effect imports
-hooks.version = '2.19.2';
+hooks.version = '2.19.3';
setHookCallback(createLocal);
diff --git a/package.json b/package.json
index 71406d0..46d3311 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "moment",
- "version": "2.19.2",
+ "version": "2.19.3",
"description": "Parse, validate, manipulate, and display dates",
"homepage": "http://momentjs.com",
"author": "Iskren Ivov Chernev <iskren.chernev at gmail.com> (https://github.com/ichernev)",
diff --git a/src/lib/parse/regex.js b/src/lib/parse/regex.js
index b1dc752..5076548 100644
--- a/src/lib/parse/regex.js
+++ b/src/lib/parse/regex.js
@@ -20,7 +20,7 @@ export var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
// any word (or two) characters or numbers including two/three word month in arabic.
// includes scottish gaelic two word and hyphenated months
-export var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
+export var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
import hasOwnProp from '../utils/has-own-prop';
diff --git a/src/locale/es-us.js b/src/locale/es-us.js
index a9c341c..931c594 100644
--- a/src/locale/es-us.js
+++ b/src/locale/es-us.js
@@ -1,5 +1,5 @@
//! moment.js locale configuration
-//! locale : Spanish(United State) [es-us]
+//! locale : Spanish (United States) [es-us]
//! author : bustta : https://github.com/bustta
import moment from '../moment';
diff --git a/src/moment.js b/src/moment.js
index 00444d5..2b78152 100644
--- a/src/moment.js
+++ b/src/moment.js
@@ -1,12 +1,12 @@
//! moment.js
-//! version : 2.19.2
+//! version : 2.19.3
//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
//! license : MIT
//! momentjs.com
import { hooks as moment, setHookCallback } from './lib/utils/hooks';
-moment.version = '2.19.2';
+moment.version = '2.19.3';
import {
min,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-moment.git
More information about the Pkg-javascript-commits
mailing list