Merge branch 'master' of https://github.com/chengcheng84/dev-sidecar into vue-ant-version

Author: chengcheng84

.github/workflows/npm-run-electron.yml

@@ -16,7 +16,7 @@ on:
 
 jobs:
   npm-run-electron:
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ contains(matrix.os, '-arm') && matrix.os || format('{0}-latest', matrix.os) }}
     env:
       ELECTRON_CACHE: ${{ github.workspace }}/.cache/electron
       ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder

packages/core/src/config/index.js

@@ -23,7 +23,7 @@ const defaultConfig = {
     remoteConfig: {
       enabled: true,
       // 共享远程配置地址
-      url: 'https://gitee.com/wangliang181230/dev-sidecar-config/raw/main/remote_config.json',
+      url: 'https://raw.giteeusercontent.com/wangliang181230/dev-sidecar-config/raw/main/remote_config.json',
       // 个人远程配置地址
       personalUrl: '',
     },
@@ -108,9 +108,9 @@ const defaultConfig = {
         },
         '^(/[\\w-.]+){2,}/?(\\?.*)?$': {
           // 篡改猴插件地址，以下是高速镜像地址
-          tampermonkeyScript: 'https://gitee.com/wangliang181230/dev-sidecar-config/raw/main/tampermonkey.js',
+          tampermonkeyScript: 'https://raw.giteeusercontent.com/wangliang181230/dev-sidecar-config/raw/main/tampermonkey.js',
           // Github油猴脚本地址，以下是高速镜像地址
-          script: 'https://gitee.com/wangliang181230/dev-sidecar-config/raw/main/GithubEnhanced-High-Speed-Download.user.js',
+          script: 'https://raw.giteeusercontent.com/wangliang181230/dev-sidecar-config/raw/main/GithubEnhanced-High-Speed-Download.user.js',
           remark: '注：上面所使用的脚本地址，为高速镜像地址。',
           desc: '油猴脚本：高速下载 Git Clone/SSH、Release、Raw、Code(ZIP) 等文件 (公益加速)、项目列表单文件快捷下载、添加 git clone 命令',
         },
@@ -221,7 +221,7 @@ const defaultConfig = {
       },
       'ajax.googleapis.com': {
         '.*': {
-          proxy: 'ajax.lug.ustc.edu.cn',
+          proxy: 'ajax.proxy.ustclug.org',
           backup: ['gapis.geekzu.org'],
           test: 'ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js',
         },
@@ -253,7 +253,7 @@ const defaultConfig = {
       // mapbox-node-binary.s3.amazonaws.com/sqlite3/v5.0.0/napi-v3-win32-x64.tar.gz
       '*.s3.1amazonaws1.com': {
         '/sqlite3/.*': {
-          redirect: 'npm.taobao.org/mirrors',
+          redirect: 'npmmirror.com/mirrors',
         },
       },
       // 'packages.elastic.co': { '.*': { proxy: 'elastic.proxy.ustclug.org' } },

packages/core/src/config/remote_config.json5

@@ -15,8 +15,8 @@
     "intercepts": {
       "github.com": {
         "^(/[\\w-.]+){2,}/?(\\?.*)?$": {
-          "tampermonkeyScript": "https://gitee.com/wangliang181230/dev-sidecar-config/raw/main/tampermonkey.js",
-          "script": "https://gitee.com/wangliang181230/dev-sidecar-config/raw/main/GithubEnhanced-High-Speed-Download.user.js"
+          "tampermonkeyScript": "https://raw.giteeusercontent.com/wangliang181230/dev-sidecar-config/raw/main/tampermonkey.js",
+          "script": "https://raw.giteeusercontent.com/wangliang181230/dev-sidecar-config/raw/main/GithubEnhanced-High-Speed-Download.user.js"
         },
         "^(/[^/]+){2}/releases/download/.*$": {
           "redirect": "ghp.ci/https://github.com",

packages/core/src/shell/shell.js

@@ -59,16 +59,36 @@ class WindowsSystemShell extends SystemShell {
         ps.dispose()
       }
     } else {
-      let compose = 'chcp 65001' // 'chcp 65001  '
+      await childExecCmdWindows('chcp 65001', args)
+      let ret
       for (const cmd of cmds) {
-        compose += ` && ${cmd}`
+        ret = await childExecCmdWindows(cmd, args)
       }
-      // compose += '&& exit'
-      return await childExec(compose, args)
+      return ret
     }
   }
 }
 
+function childExecCmdWindows (cmd, options = {}) {
+  return new Promise((resolve, reject) => {
+    const execOptions = { ...options }
+    delete execOptions.type
+    delete execOptions.printErrorLog
+
+    log.info('shell:', cmd)
+    childProcess.execFile('cmd.exe', ['/d', '/s', '/c', cmd], execOptions, (error, stdout, stderr) => {
+      if (error) {
+        if (options.printErrorLog !== false) {
+          log.error('cmd 命令执行错误：\n===>\ncommands:', cmd, '\n   error:', error, '\n<===')
+        }
+        reject(new Error(stderr))
+      } else {
+        resolve(stdout.replace('Active code page: 65001\r\n', ''))
+      }
+    })
+  })
+}
+
 function childExec (composeCmds, options = {}) {
   return new Promise((resolve, reject) => {
     log.info('shell:', composeCmds)

packages/core/test/requestTest.js

@@ -3,7 +3,7 @@ const request = require('request')
 
 const options = {
   url: 'https://raw.githubusercontent.com/docmirror/dev-sidecar/refs/heads/master/packages/core/src/config/remote_config.json5',
-  // url: 'https://gitee.com/wangliang181230/dev-sidecar-config/raw/main/remote_config.json',
+  // url: 'https://raw.giteeusercontent.com/wangliang181230/dev-sidecar-config/raw/main/remote_config.json',
   servername: 'baidu.com',
   agent: new HttpsAgent({
     keepAlive: true,

packages/gui/README.md

@@ -2,27 +2,7 @@
 
 ## Project setup
 
-```
-yarn install
-```
-
-### Compiles and hot-reloads for development
-
-```
-yarn serve
-```
-
-### Compiles and minifies for production
-
-```
-yarn build
-```
-
-### Lints and fixes files
-
-```
-yarn lint
-```
+You should always refer to the [main README](../../README.md) for instructions on how to set up the project.
 
 ### Customize configuration
 

packages/gui/src/view/App.vue

@@ -68,6 +68,10 @@ export default {
         }
       })
     },
+    isPreRelease () {
+      const version = this.info && this.info.version
+      return typeof version === 'string' && version.includes('-')
+    },
   },
 
   created() {