From 4e2fd68670e6cf7d27f12682a1707e541f75dd08 Mon Sep 17 00:00:00 2001
From: iamkun <kunhello@outlook.com>
Date: Wed, 30 May 2018 15:56:36 +0800
Subject: [PATCH 1/2] chore: small bug fix but not perfect

---
 package.json       | 2 +-
 src/index.js       | 4 +++-
 test/parse.test.js | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 47e652960..1404f2166 100644
--- a/package.json
+++ b/package.json
@@ -81,4 +81,4 @@
     "typescript": "^2.8.3"
   },
   "dependencies": {}
-}
\ No newline at end of file
+}
diff --git a/src/index.js b/src/index.js
index 996695d70..2d89a6421 100644
--- a/src/index.js
+++ b/src/index.js
@@ -49,7 +49,9 @@ const parseDate = (date) => {
   if (Utils.isUndefined(date)) return new Date()
   if (date instanceof Date) return date
   // eslint-disable-next-line no-cond-assign
-  if ((typeof date === 'string') && (reg = date.match(C.REGEX_PARSE))) {
+  if ((typeof date === 'string')
+    && (/.*[^Z]$/i.test(date)) // looking for a better way
+    && (reg = date.match(C.REGEX_PARSE))) {
     // 2018-08-08 or 20180808
     return new Date(
       reg[1], reg[2] - 1, reg[3] || 1,
diff --git a/test/parse.test.js b/test/parse.test.js
index 0a2708d89..395d36882 100644
--- a/test/parse.test.js
+++ b/test/parse.test.js
@@ -33,6 +33,8 @@ describe('Parse', () => {
     expect(dayjs(d).valueOf()).toBe(moment(d).valueOf()) // not recommend
     d = '2018'
     expect(dayjs(d).format()).toBe(moment(d).format()) // not recommend
+    d = '2018-05-02T11:12:13Z' // should go direct to new Date() rather our regex
+    expect(dayjs(d).format()).toBe(moment(d).format()) // not recommend
   })
 
   it('String ISO 8601 date, time and zone', () => {

From ff02ce09dc7d80149e0ea79c7fb14e7fb3458805 Mon Sep 17 00:00:00 2001
From: Orinami Olatunji <orinamiolatunji@gmail.com>
Date: Wed, 30 May 2018 20:25:05 +0100
Subject: [PATCH 2/2] (#171) Fixed API-Reference typo

```js
dayjs('2000-10-25')
  .set('month', 3)
  .set('year', 2020).toString(); // Sat, 25 Apr 2020 00:00:00 GMT
```

to

```js
dayjs('2000-10-25')
  .set('month', 3)
  .set('year', 2020).toString(); // Sat, 25 Mar 2020 00:00:00 GMT
```
---
 docs/en/API-reference.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/API-reference.md b/docs/en/API-reference.md
index 8cd34d73e..1296f59fc 100644
--- a/docs/en/API-reference.md
+++ b/docs/en/API-reference.md
@@ -168,7 +168,7 @@ Returns a `Dayjs` with the applied changes.
 ```js
 dayjs('2000-10-25')
   .set('month', 3)
-  .set('year', 2020).toString(); // Sat, 25 Apr 2020 00:00:00 GMT
+  .set('year', 2020).toString(); // Sat, 25 Mar 2020 00:00:00 GMT
 ```
 
 ## Manipulating