fixed formatting issue

iamkun · Mar 17, 2019 · 9b3ba88 · 9b3ba88
1 parent eeb20fa
commit 9b3ba88
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/plugin/customParseFormat/index.js b/src/plugin/customParseFormat/index.js
@@ -9,7 +9,7 @@ const matchUpperCaseAMPM = /[AP]M/
 const matchLowerCaseAMPM = /[ap]m/
 const matchSigned = /[+-]?\d+/ // -inf - inf
 const matchOffset = /[+-]\d\d:?\d\d/ // +00:00 -00:00 +0000 or -0000
-const matchWord = /\d*[^\s\d]+/ // Word
+const matchWord = /\d*[^\s\d-:/.()]+/ // Word
 
 let locale
 

diff --git a/test/plugin/customParseFormat.test.js b/test/plugin/customParseFormat.test.js
@@ -26,6 +26,12 @@ it('parse padded string', () => {
   expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf())
 })
 
+it('parse string for MMM month format', () => {
+  const input = '4/Mar/2019:11:16:26 +0800'
+  const format = 'D/MMM/YYYY:H:m:s zz'
+  expect(dayjs(input, format).valueOf()).toBe(moment(input, format).valueOf())
+})
+
 it('parse string January (getMonth() = 0)', () => {
   const input = '01/01/2019'
   const format = 'DD/MM/YYYY'