Merge pull request #6 from iamakulov/test-updates

Run real webpack in tests + upgrade webpack and Moment.js
iamakulov · Mar 24, 2018 · e2fc2ba · e2fc2ba
2 parents 8fd6094 + a7f39df
commit e2fc2ba
Show file tree

Hide file tree

Showing 9 changed files with 8,255 additions and 5,429 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1 @@
+test
diff --git a/index.js b/index.js
@@ -50,7 +50,13 @@ function normalizeLocalesToKeep(localesToKeep) {
 
     // Check if has unknown locales
     var absentLocales = localesToKeep.filter(function(localeName) {
-        return moment.localeData(localeName) === null;
+        const localeData = moment.localeData(localeName);
+        return (
+            // For Moment 2.20.1−
+            localeData === null ||
+            // For Moment. 2.21.0+ – this version now returns a default locale instead of null
+            localeData === moment.localeData()
+        );
     });
     if (absentLocales.length > 0) {
         throw new Error(

diff --git a/index.test.js b/index.test.js