github
/
dev-sidecar
mirror of https://github.com/docmirror/dev-sidecar
1
0
Fork 0
Code Issues Releases Wiki Activity

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
pull/88/head
xiaojunnuo 2021-08-18 00:01:50 -07:00
parent 53dbd1707b 4a951ca636
commit 48eec1470d
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/config/index.js
View File

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

2
packages/gui/package.json
View File

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

15
packages/gui/src/bridge/update/backend.js
View File

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

3
packages/gui/src/bridge/update/front.js
View File

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