[locale] fix: importing locales using path.resolve

moment · Oct 25, 2019 · 9bcd450 · 9bcd450
1 parent 13a61b2
commit 9bcd450
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/moment.js b/moment.js
@@ -1850,7 +1850,8 @@
             try {
                 oldLocale = globalLocale._abbr;
                 var aliasedRequire = require;
-                aliasedRequire('./locale/' + name);
+                var path = aliasedRequire('path');
+                aliasedRequire(path.resolve(__dirname, './locale/' + name));
                 getSetGlobalLocale(oldLocale);
             } catch (e) {}
         }

diff --git a/src/lib/locale/locales.js b/src/lib/locale/locales.js
@@ -53,7 +53,8 @@ function loadLocale(name) {
         try {
             oldLocale = globalLocale._abbr;
             var aliasedRequire = require;
-            aliasedRequire('./locale/' + name);
+            var path = aliasedRequire('path');
+            aliasedRequire(path.resolve(__dirname, './locale/' + name));
             getSetGlobalLocale(oldLocale);
         } catch (e) {}
     }