Merge remote-tracking branch 'upstream/master'

Tencent · Aug 17, 2020 · 2463bef · 2463bef
2 parents 17d25a5 + 42210ec
commit 2463bef
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -149,6 +149,25 @@
         "talk",
         "bug"
       ]
+    },
+    {
+      "login": "mirageql",
+      "name": "mirageql",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/69442876?v=4",
+      "profile": "https://github.com/mirageql",
+      "contributions": [
+        "code",
+        "blog"
+      ]
+    },
+    {
+      "login": "TabSpace",
+      "name": "Tab Liang",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/550449?v=4",
+      "profile": "https://github.com/TabSpace",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/README.md b/README.md
@@ -252,7 +252,7 @@ CloudBase Framework 的版本变更日志请参阅 [changelog](https://github.co
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-15-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-17-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -279,6 +279,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="http://evecalm.com"><img src="https://avatars2.githubusercontent.com/u/1655294?v=4" width="100px;" alt=""/><br /><sub><b>Saiya</b></sub></a><br /><a href="#talk-oe" title="Talks">📢</a> <a href="https://github.com/TencentCloudBase/cloudbase-framework/issues?q=author%3Aoe" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/mirageql"><img src="https://avatars1.githubusercontent.com/u/69442876?v=4" width="100px;" alt=""/><br /><sub><b>mirageql</b></sub></a><br /><a href="https://github.com/TencentCloudBase/cloudbase-framework/commits?author=mirageql" title="Code">💻</a> <a href="#blog-mirageql" title="Blogposts">📝</a></td>
+    <td align="center"><a href="https://github.com/TabSpace"><img src="https://avatars0.githubusercontent.com/u/550449?v=4" width="100px;" alt=""/><br /><sub><b>Tab Liang</b></sub></a><br /><a href="https://github.com/TencentCloudBase/cloudbase-framework/commits?author=TabSpace" title="Code">💻</a></td>
   </tr>
 </table>
 

diff --git a/packages/cloudbase-static-builder/src/index.ts b/packages/cloudbase-static-builder/src/index.ts
@@ -79,8 +79,10 @@ export class StaticBuilder extends Builder {
     const url = `https://${options.domain}/${CONFIG_FILE_NAME}`;
     const streamRes = await fetchStream(url);
     let originConfig;
-    if (streamRes && streamRes.status == 200) {
-      originConfig = await streamRes.json();
+    if (streamRes?.status == 200) {
+      originConfig = await streamRes.json().catch(err => {
+        return {};
+      });
     } else {
       originConfig = {};
     }