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/core/src/config/index.js
pull/67/head
xiaojunnuo 2020-12-08 23:34:42 +08:00
parent 31d64d802c 21d9081378
commit 31a8ec5dd5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,7 @@ module.exports = {
} }
}, },
mapping: { mapping: {
'assets.fastgit.org': 'usa',
'*yarnpkg.com': 'usa', '*yarnpkg.com': 'usa',
'*cloudfront.net': 'usa', '*cloudfront.net': 'usa',
'*github.io': 'usa', '*github.io': 'usa',

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

@ -95,7 +95,7 @@ function updateHandle (app, win, beforeQuit, updateUrl, log) {
export default { export default {
install (context) { install (context) {
const { app, win, beforeQuit, log } = context const { app, win, beforeQuit, log } = context
let updateUrl = 'https://dev-sidecar.docmirror.cn/update/' let updateUrl = 'http://dev-sidecar.docmirror.cn/update/'
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
Object.defineProperty(app, 'isPackaged', { Object.defineProperty(app, 'isPackaged', {
get () { get () {