From 9bcd450543f29e0b6c7f65e418207c662271a4aa Mon Sep 17 00:00:00 2001 From: Ventsislav Dimitrov Date: Fri, 25 Oct 2019 18:02:23 +0100 Subject: [PATCH] [locale] fix: importing locales using path.resolve --- moment.js | 3 ++- src/lib/locale/locales.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/moment.js b/moment.js index 1b129716ac..ac6aad14c8 100644 --- 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 index b0e030dba8..a689c97e94 100644 --- 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) {} }