Merge branch 'master' into develop

moment · Jul 6, 2022 · 6374fd8 · 6374fd8
2 parents b4e6153 + 57c9062
commit 6374fd8
Show file tree

Hide file tree

Showing 22 changed files with 57 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+### 2.29.3 [Full changelog](https://gist.github.com/ichernev/edebd440f49adcaec72e5e77b791d8be)
+
+* Release Apr 17, 2022
+  * [#5995](https://github.com/moment/moment/pull/5995) [bugfix] Remove const usage
+  * [#5990](https://github.com/moment/moment/pull/5990) misc: fix advisory link
+
+
 ### 2.29.2 [See full changelog](https://gist.github.com/ichernev/1904b564f6679d9aac1ae08ce13bc45c)
 
 * Release Apr 3 2022

diff --git a/Moment.js.nuspec b/Moment.js.nuspec
@@ -2,14 +2,14 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Moment.js</id>
-        <version>2.29.2</version>
+        <version>2.29.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 Oct 6, 2020
-
-            Updated deprecation message, bugfix in hi locale
+            * Release Apr 17, 2022
+              * [#5995](https://github.com/moment/moment/pull/5995) [bugfix] Remove const usage
+              * [#5990](https://github.com/moment/moment/pull/5990) misc: fix advisory link
         </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
@@ -1,6 +1,6 @@
 {
   "name": "moment",
-  "version": "2.29.2",
+  "version": "2.29.3",
   "main": "moment.js",
   "description": "Parse, validate, manipulate, and display dates in JavaScript.",
   "files": [

diff --git a/dist/locale/sr-cyrl.js b/dist/locale/sr-cyrl.js
@@ -31,15 +31,16 @@ var translator = {
         return wordKey[2];
     },
     translate: function (number, withoutSuffix, key, isFuture) {
-        var wordKey = translator.words[key];
+        var wordKey = translator.words[key],
+            word;
 
         if (key.length === 1) {
             // Nominativ
             if (key === 'y' && withoutSuffix) return 'једна година';
             return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
         }
 
-        const word = translator.correctGrammaticalCase(number, wordKey);
+        word = translator.correctGrammaticalCase(number, wordKey);
         // Nominativ
         if (key === 'yy' && withoutSuffix && word === 'годину') {
             return number + ' година';

diff --git a/dist/locale/sr.js b/dist/locale/sr.js
@@ -31,15 +31,16 @@ var translator = {
         return wordKey[2];
     },
     translate: function (number, withoutSuffix, key, isFuture) {
-        var wordKey = translator.words[key];
+        var wordKey = translator.words[key],
+            word;
 
         if (key.length === 1) {
             // Nominativ
             if (key === 'y' && withoutSuffix) return 'jedna godina';
             return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
         }
 
-        const word = translator.correctGrammaticalCase(number, wordKey);
+        word = translator.correctGrammaticalCase(number, wordKey);
         // Nominativ
         if (key === 'yy' && withoutSuffix && word === 'godinu') {
             return number + ' godina';

diff --git a/dist/moment.js b/dist/moment.js
@@ -1,5 +1,5 @@
 //! moment.js
-//! version : 2.29.2
+//! version : 2.29.3
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
@@ -5629,7 +5629,7 @@ addParseToken('x', function (input, array, config) {
 
 //! moment.js
 
-hooks.version = '2.29.2';
+hooks.version = '2.29.3';
 
 setHookCallback(createLocal);
 

diff --git a/locale/sr-cyrl.js b/locale/sr-cyrl.js
@@ -38,15 +38,16 @@
             return wordKey[2];
         },
         translate: function (number, withoutSuffix, key, isFuture) {
-            var wordKey = translator.words[key];
+            var wordKey = translator.words[key],
+                word;
 
             if (key.length === 1) {
                 // Nominativ
                 if (key === 'y' && withoutSuffix) return 'једна година';
                 return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
             }
 
-            const word = translator.correctGrammaticalCase(number, wordKey);
+            word = translator.correctGrammaticalCase(number, wordKey);
             // Nominativ
             if (key === 'yy' && withoutSuffix && word === 'годину') {
                 return number + ' година';

diff --git a/locale/sr.js b/locale/sr.js
@@ -38,15 +38,16 @@
             return wordKey[2];
         },
         translate: function (number, withoutSuffix, key, isFuture) {
-            var wordKey = translator.words[key];
+            var wordKey = translator.words[key],
+                word;
 
             if (key.length === 1) {
                 // Nominativ
                 if (key === 'y' && withoutSuffix) return 'jedna godina';
                 return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
             }
 
-            const word = translator.correctGrammaticalCase(number, wordKey);
+            word = translator.correctGrammaticalCase(number, wordKey);
             // Nominativ
             if (key === 'yy' && withoutSuffix && word === 'godinu') {
                 return number + ' godina';

diff --git 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.29.2',
+  version: '2.29.3',
   git: 'https://github.com/moment/moment.git'
 });
 

diff --git a/min/locales.js b/min/locales.js
@@ -10097,15 +10097,16 @@
             return wordKey[2];
         },
         translate: function (number, withoutSuffix, key, isFuture) {
-            var wordKey = translator$1.words[key];
+            var wordKey = translator$1.words[key],
+                word;
 
             if (key.length === 1) {
                 // Nominativ
                 if (key === 'y' && withoutSuffix) return 'једна година';
                 return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
             }
 
-            const word = translator$1.correctGrammaticalCase(number, wordKey);
+            word = translator$1.correctGrammaticalCase(number, wordKey);
             // Nominativ
             if (key === 'yy' && withoutSuffix && word === 'годину') {
                 return number + ' година';
@@ -10219,15 +10220,16 @@
             return wordKey[2];
         },
         translate: function (number, withoutSuffix, key, isFuture) {
-            var wordKey = translator$2.words[key];
+            var wordKey = translator$2.words[key],
+                word;
 
             if (key.length === 1) {
                 // Nominativ
                 if (key === 'y' && withoutSuffix) return 'jedna godina';
                 return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
             }
 
-            const word = translator$2.correctGrammaticalCase(number, wordKey);
+            word = translator$2.correctGrammaticalCase(number, wordKey);
             // Nominativ
             if (key === 'yy' && withoutSuffix && word === 'godinu') {
                 return number + ' godina';

diff --git a/min/locales.min.js b/min/locales.min.js
diff --git a/min/locales.min.js.map b/min/locales.min.js.map
diff --git a/min/moment-with-locales.js b/min/moment-with-locales.js
@@ -5629,7 +5629,7 @@
 
     //! moment.js
 
-    hooks.version = '2.29.2';
+    hooks.version = '2.29.3';
 
     setHookCallback(createLocal);
 
@@ -15766,15 +15766,16 @@
             return wordKey[2];
         },
         translate: function (number, withoutSuffix, key, isFuture) {
-            var wordKey = translator$1.words[key];
+            var wordKey = translator$1.words[key],
+                word;
 
             if (key.length === 1) {
                 // Nominativ
                 if (key === 'y' && withoutSuffix) return 'једна година';
                 return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
             }
 
-            const word = translator$1.correctGrammaticalCase(number, wordKey);
+            word = translator$1.correctGrammaticalCase(number, wordKey);
             // Nominativ
             if (key === 'yy' && withoutSuffix && word === 'годину') {
                 return number + ' година';
@@ -15888,15 +15889,16 @@
             return wordKey[2];
         },
         translate: function (number, withoutSuffix, key, isFuture) {
-            var wordKey = translator$2.words[key];
+            var wordKey = translator$2.words[key],
+                word;
 
             if (key.length === 1) {
                 // Nominativ
                 if (key === 'y' && withoutSuffix) return 'jedna godina';
                 return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
             }
 
-            const word = translator$2.correctGrammaticalCase(number, wordKey);
+            word = translator$2.correctGrammaticalCase(number, wordKey);
             // Nominativ
             if (key === 'yy' && withoutSuffix && word === 'godinu') {
                 return number + ' godina';

diff --git a/min/moment-with-locales.min.js b/min/moment-with-locales.min.js
diff --git a/min/moment-with-locales.min.js.map b/min/moment-with-locales.min.js.map
diff --git a/min/moment.min.js b/min/moment.min.js
diff --git a/min/tests.js b/min/tests.js
@@ -34195,7 +34195,7 @@
 
     // Concrete test for Locale#weekdaysMin
     test('Weekdays sort by locale', function (assert) {
-        const weekdays = 'domingo_lunes_martes_miércoles_jueves_viernes_sábado',
+        var weekdays = 'domingo_lunes_martes_miércoles_jueves_viernes_sábado',
             weekdaysShort = 'dom._lun._mar._mié._jue._vie._sáb.',
             weekdaysMin = 'do_lu_ma_mi_ju_vi_sá';
 

diff --git a/moment.js b/moment.js
@@ -1,5 +1,5 @@
 //! moment.js
-//! version : 2.29.2
+//! version : 2.29.3
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
@@ -5635,7 +5635,7 @@
 
     //! moment.js
 
-    hooks.version = '2.29.2';
+    hooks.version = '2.29.3';
 
     setHookCallback(createLocal);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "moment",
-    "version": "2.29.2",
+    "version": "2.29.3",
     "description": "Parse, validate, manipulate, and display dates",
     "homepage": "https://momentjs.com",
     "author": "Iskren Ivov Chernev <iskren.chernev@gmail.com> (https://github.com/ichernev)",

diff --git a/src/locale/sr-cyrl.js b/src/locale/sr-cyrl.js
@@ -31,15 +31,16 @@ var translator = {
         return wordKey[2];
     },
     translate: function (number, withoutSuffix, key, isFuture) {
-        var wordKey = translator.words[key];
+        var wordKey = translator.words[key],
+            word;
 
         if (key.length === 1) {
             // Nominativ
             if (key === 'y' && withoutSuffix) return 'једна година';
             return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
         }
 
-        var word = translator.correctGrammaticalCase(number, wordKey);
+        word = translator.correctGrammaticalCase(number, wordKey);
         // Nominativ
         if (key === 'yy' && withoutSuffix && word === 'годину') {
             return number + ' година';

diff --git a/src/locale/sr.js b/src/locale/sr.js
@@ -31,15 +31,16 @@ var translator = {
         return wordKey[2];
     },
     translate: function (number, withoutSuffix, key, isFuture) {
-        var wordKey = translator.words[key];
+        var wordKey = translator.words[key],
+            word;
 
         if (key.length === 1) {
             // Nominativ
             if (key === 'y' && withoutSuffix) return 'jedna godina';
             return isFuture || withoutSuffix ? wordKey[0] : wordKey[1];
         }
 
-        var word = translator.correctGrammaticalCase(number, wordKey);
+        word = translator.correctGrammaticalCase(number, wordKey);
         // Nominativ
         if (key === 'yy' && withoutSuffix && word === 'godinu') {
             return number + ' godina';

diff --git a/src/moment.js b/src/moment.js
@@ -1,12 +1,12 @@
 //! moment.js
-//! version : 2.29.2
+//! version : 2.29.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.29.2';
+moment.version = '2.29.3';
 
 import {
     min,