Merge remote-tracking branch 'origin/master'

# Conflicts:
#	packages/gui/pkg/after-all-artifact-build.js
#	packages/gui/src/bridge/update/backend.js
#	packages/gui/src/bridge/update/front.js

packages/core/src/config/index.js

@@ -221,7 +221,9 @@ module.exports = {
         'github.com': 'quad9',
         '*github.com': 'usa',
         '*.vuepress.vuejs.org': 'usa',
-        'gh.docmirror.top': 'aliyun'
+        'gh.docmirror.top': 'aliyun',
+        '*cloudflare.com': 'usa',
+        '*v2ex.com': 'usa'
       },
       speedTest: {
         enabled: true,

packages/gui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docmirror/dev-sidecar-gui",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "private": false,
   "license": "MPL-2.0",
   "main": "background.js",

packages/gui/src/bridge/update/backend.js

@@ -48,15 +48,14 @@ function updateHandle (app, api, win, beforeQuit, quit, log) {
     updateNotAva: '当前为最新版本，无需更新'
   }
   // 本地开发环境，改变app-update.yml地址
-  if (process.env.NODE_ENV === 'development' && !isMac) {
-    const publishUrl = process.env.VUE_APP_PUBLISH_URL
-    const publishProvider = process.env.VUE_APP_PUBLISH_PROVIDER
-    autoUpdater.setFeedURL({
-      provider: publishProvider,
-      url: publishUrl
-    })
+  if (process.env.NODE_ENV === 'development') {
+    // const publishUrl = process.env.VUE_APP_PUBLISH_URL
+    // autoUpdater.setFeedURL({
+    //   provider: 'generic',
+    //   url: publishUrl
+    // })
     if (isMac) {
-      autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml')
+    //  autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml')
     } else if (isLinux) {
       // autoUpdater.updateConfigPath = path.join(__dirname, 'mac/DevSidecar.app/Contents/Resources/app-update.yml')
     } else {

packages/gui/src/bridge/update/front.js

@@ -91,6 +91,7 @@ function install (app, api) {
         goManualUpdate(value)
         return
       }
+      updateParams.downloading = true
       api.update.downloadUpdate()
     }
   }
@@ -99,7 +100,7 @@ function install (app, api) {
 
     if (updateParams.autoDownload !== false) {
       app.$message.info('发现新版本，正在下载中...')
-      updateParams.downloading = true
+
       downloadNewVersion(value)
       return
     }