fix: locale moment bug [在 locale 插件中引入 moment 相关文件]

packages/umi-plugin-locale/package.json

@@ -24,6 +24,7 @@
     "umi"
   ],
   "dependencies": {
+    "moment": "2.x",
     "mustache": "^2.3.0",
     "prop-types": "^15.6.2",
     "react-intl": "^2.4.0",

packages/umi-plugin-locale/src/index.js

@@ -15,6 +15,24 @@ import {
 import { winPath } from 'umi-utils';
 import Mustache from 'mustache';
 
+const momentLocation = require
+  .resolve('moment/locale/zh-cn')
+  .replace(/zh\-cn\.js$/, '');
+
+function getMomentLocale(lang, country) {
+  if (
+    existsSync(
+      join(momentLocation, `${lang}-${country.toLocaleLowerCase()}.js`),
+    )
+  ) {
+    return `${lang}-${country.toLocaleLowerCase()}`;
+  }
+  if (existsSync(join(momentLocation, `${lang}.js`))) {
+    return lang;
+  }
+  return '';
+}
+
 // export for test
 export function getLocaleFileList(absSrcPath, singular) {
   const localeList = [];
@@ -31,6 +49,7 @@ export function getLocaleFileList(absSrcPath, singular) {
           country: fileInfo[2],
           name: `${fileInfo[1]}-${fileInfo[2]}`,
           path: winPath(fullname),
+          momentLocale: getMomentLocale(fileInfo[1], fileInfo[2]),
         });
       }
     }
@@ -57,15 +76,17 @@ export default function(api, options = {}) {
       'utf-8',
     );
     const defaultLocale = options.default || 'zh-CN';
+    const [lang, country] = defaultLocale.split('-');
     const wrapperContent = Mustache.render(wrapperTpl, {
       localeList: localeFileList,
       antd: options.antd === undefined ? true : options.antd,
       baseNavigator:
         options.baseNavigator === undefined ? true : options.baseNavigator,
       useLocalStorage: true,
       defaultLocale,
-      defaultLang: defaultLocale.split('-')[0],
-      defaultAntdLocale: defaultLocale.replace('-', '_'),
+      defaultLang: lang,
+      defaultAntdLocale: `${lang}_${country}`,
+      defaultMomentLocale: getMomentLocale(lang, country),
     });
     const wrapperPath = join(paths.absTmpDirPath, './LocaleWrapper.jsx');
     writeFileSync(wrapperPath, wrapperContent, 'utf-8');

packages/umi-plugin-locale/template/wrapper.jsx.tpl

@@ -9,11 +9,23 @@ const InjectedWrapper = injectIntl(function(props) {
 })
 {{/localeList.length}}
 
+{{#localeList}}
+{{#antd}}
+{{#momentLocale}}
+import 'moment/locale/{{momentLocale}}';
+{{/momentLocale}}
+{{/antd}}
+{{/localeList}}
+
 const baseNavigator = {{{baseNavigator}}};
 const useLocalStorage = {{{useLocalStorage}}};
 
 {{#antd}}
 import { LocaleProvider } from 'antd';
+import moment from 'moment';
+{{#defaultMomentLocale}}
+import 'moment/locale/{{defaultMomentLocale}}';
+{{/defaultMomentLocale}}
 const defaultAntd = require('antd/lib/locale-provider/{{defaultAntdLocale}}');
 {{/antd}}
 
@@ -24,14 +36,16 @@ const localeInfo = {
     locale: '{{name}}',
     {{#antd}}antd: require('antd/lib/locale-provider/{{lang}}_{{country}}'),{{/antd}}
     data: require('react-intl/locale-data/{{lang}}'),
+    momentLocale: '{{momentLocale}}',
   },
   {{/localeList}}
 };
 
 let appLocale = {
   locale: '{{defaultLocale}}',
   messages: {},
-  data: require('react-intl/locale-data/{{defaultLang}}')
+  data: require('react-intl/locale-data/{{defaultLang}}'),
+  momentLocale: '{{defaultMomentLocale}}',
 };
 if (useLocalStorage && localStorage.getItem('umi_locale') && localeInfo[localStorage.getItem('umi_locale')]) {
   appLocale = localeInfo[localStorage.getItem('umi_locale')];

packages/umi-plugin-locale/test/index.test.js

@@ -39,7 +39,7 @@ describe('test plugin', () => {
     expect(ret).toEqual(
       expect.stringContaining('antd/lib/locale-provider/en_US'),
     );
-
+    expect(ret).toEqual(expect.stringContaining('moment/locale/zh-cn'));
     unlinkSync(wrapperFile);
   });
 });
@@ -58,7 +58,7 @@ test('antd is false', () => {
   expect(ret).not.toEqual(
     expect.stringContaining('antd/lib/locale-provider/zh_CN'),
   );
-
+  expect(ret).not.toEqual(expect.stringContaining('moment/locale/zh-cn'));
   unlinkSync(wrapperFile);
 });
 
@@ -71,12 +71,14 @@ describe('test func with singular true', () => {
         country: 'US',
         name: 'en-US',
         path: `${absSrcPath}/locale/en-US.js`,
+        momentLocale: '',
       },
       {
         lang: 'zh',
         country: 'CN',
         name: 'zh-CN',
         path: `${absSrcPath}/locale/zh-CN.js`,
+        momentLocale: 'zh-cn',
       },
     ]);
   });