fix: update plugin advancedFormat isValid validation (#1566)

iamkun · Jul 7, 2021 · 755fc8b · 755fc8b
1 parent eb087f5
commit 755fc8b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/plugin/advancedFormat/index.js b/src/plugin/advancedFormat/index.js
@@ -11,6 +11,11 @@ export default (o, c, d) => { // locale needed later
   // extend en locale here
   proto.format = function (formatStr) {
     const locale = this.$locale()
+
+    if (!this.isValid()) {
+      return oldFormat.bind(this)(formatStr)
+    }
+
     const utils = this.$utils()
     const str = formatStr || FORMAT_DEFAULT
     const result = str.replace(/\[([^\]]+)]|Q|wo|ww|w|WW|W|zzz|z|gggg|GGGG|Do|X|x|k{1,2}|S/g, (match) => {

diff --git a/test/plugin/advancedFormat.test.js b/test/plugin/advancedFormat.test.js
@@ -24,6 +24,10 @@ afterEach(() => {
   MockDate.reset()
 })
 
+it('Format of invalid date', () => {
+  expect(dayjs(null).format('z').toLowerCase()).toEqual(moment(null).format('z').toLowerCase())
+})
+
 it('Format empty string', () => {
   expect(dayjs().format()).toBe(moment().format())
 })