diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..f2ddd9c --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,3 @@ +module.exports = { + "extends": "google" +}; \ No newline at end of file diff --git a/manager/manager.js b/manager/manager.js index 9e856c0..7700a29 100644 --- a/manager/manager.js +++ b/manager/manager.js @@ -6,6 +6,8 @@ const dialog = electronRemote.dialog const AdmZip = require('adm-zip') const os = require('os') +const app = electronRemote.app + // 注入脚本根文件根目录 const executeRootDir = path.join(__dirname, '../', configs.EXECUTE_DIR) const executeSettingsFile = path.join(executeRootDir, './active.json') @@ -1091,11 +1093,10 @@ const isLater = (taga, tagb) => { } const checkUpdate = userConfig => { return new Promise((resolve, reject) => { - const locakPackage = require('../package.json') /** * @type {string} */ - const versionLocal = locakPackage.version + const versionLocal = 'v' + app.getVersion() const xhr = new XMLHttpRequest() if ( @@ -1126,7 +1127,7 @@ const checkUpdate = userConfig => { version: result.tag_name, time: result.published_at, body: result.body, - local: 'v' + locakPackage.version, + local: app.getVersion(), html_url: result.html_url }) } else { @@ -1237,7 +1238,7 @@ const userConfigInit = () => { const versionH3 = document.createElement('h3') versionH3.innerText = getKeyText('loaclVersion') const versionInfo = document.createElement('p') - versionInfo.innerText = require('../package.json').version + versionInfos.innerText = app.getVersion() settingInner.append(versionH3) settingInner.append(versionInfo) } diff --git a/package.json b/package.json index 7b7f57d..2a763da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "majsoul-plus-client", - "version": "1.6.1", + "version": "1.6.2-alpha.1", "productName": "Majsoul Plus", "author": "MajsoulPlus Team", "description": "Majsoul Plus", @@ -31,6 +31,8 @@ "devDependencies": { "cross-env": "^5.2.0", "electron": "^2.0.12", - "electron-packager": "^13.0.1" + "electron-packager": "^13.0.1", + "eslint": "^5.12.0", + "eslint-config-google": "^0.11.0" } }