From feb07a43e126aa21a83a0b2aef413daa7004487d Mon Sep 17 00:00:00 2001 From: Dr_rOot Date: Mon, 27 Apr 2020 23:28:38 +0800 Subject: [PATCH] chore: upgrade babel & eslint --- .babelrc | 24 +++++++----------------- .eslintignore | 7 +++++++ .eslintrc.js | 41 ++++++++++++++++++++++++----------------- package.json | 38 +++++++++++++++++--------------------- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/.babelrc b/.babelrc index 494effc..7387822 100644 --- a/.babelrc +++ b/.babelrc @@ -2,19 +2,11 @@ "comments": false, "env": { "main": { - "presets": [ - ["env", { - "targets": { "node": 7 } - }], - "stage-0" - ] + "presets": ["@babel/preset-env"] }, "renderer": { "presets": [ - ["env", { - "modules": false - }], - "stage-0" + "@babel/preset-env" ], "plugins": [ [ @@ -27,12 +19,7 @@ ] }, "web": { - "presets": [ - ["env", { - "modules": false - }], - "stage-0" - ], + "presets": ["@babel/preset-env"], "plugins": [ [ "component", @@ -44,5 +31,8 @@ ] } }, - "plugins": ["transform-runtime"] + "plugins": [ + "@babel/plugin-proposal-class-properties", + "@babel/plugin-transform-runtime" + ] } diff --git a/.eslintignore b/.eslintignore index e69de29..4bb2a4b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -0,0 +1,7 @@ +src/renderer/components/Icons/*.js + +src/shared/locales/* +!src/shared/locales/all.js +!src/shared/locales/app.js +!src/shared/locales/index.js +!src/shared/locales/LocalManager.js diff --git a/.eslintrc.js b/.eslintrc.js index 1f38288..1dfa6e0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,27 +1,34 @@ module.exports = { root: true, - parser: 'babel-eslint', - parserOptions: { - sourceType: 'module' - }, env: { browser: true, node: true }, - extends: 'standard', + extends: [ + 'plugin:vue/essential', + '@vue/standard' + ], + parserOptions: { + parser: 'babel-eslint' + }, globals: { appId: true, __static: true }, - plugins: [ - 'html' - ], - 'rules': { - // allow paren-less arrow functions - 'arrow-parens': 0, - // allow async-await - 'generator-star-spacing': 0, - // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0 - } -} + rules: { + 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'indent': ['error', 2], + 'vue/script-indent': ['error', 2, { + 'baseIndent': 1 + }], + }, + overrides: [ + { + 'files': ['*.vue'], + 'rules': { + 'indent': 'off' + } + } + ] +}; diff --git a/package.json b/package.json index 3ac0f26..3db931c 100644 --- a/package.json +++ b/package.json @@ -166,6 +166,7 @@ ] }, "dependencies": { + "@babel/runtime": "^7.9.2", "@panter/vue-i18next": "^0.15.2", "aria2": "^4.1.0", "axios": "^0.19.2", @@ -178,7 +179,7 @@ "electron-updater": "^4.2.5", "element-ui": "^2.13.1", "forever-monitor": "^2.0.0", - "i18next": "^19.4.3", + "i18next": "^19.4.4", "lodash": "^4.17.15", "nat-api": "^0.1.3", "node-fetch": "^2.6.0", @@ -189,28 +190,25 @@ "vue": "^2.6.11", "vue-electron": "^1.0.6", "vue-router": "^3.1.6", - "vuex": "^3.2.0", + "vuex": "^3.3.0", "vuex-router-sync": "^5.0.0" }, "devDependencies": { - "@vue/cli-plugin-babel": "^4.3.1", - "@vue/cli-plugin-eslint": "^4.3.1", - "@vue/cli-service": "^4.3.1", + "@babel/core": "^7.9.0", + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.9.0", + "@babel/preset-env": "^7.9.5", + "@babel/register": "^7.9.0", "@vue/eslint-config-standard": "^5.1.2", "ajv": "^6.12.2", - "babel-core": "^6.26.3", "babel-eslint": "^10.1.0", - "babel-loader": "^7.1.5", + "babel-loader": "^8.1.0", "babel-plugin-component": "^1.1.1", - "babel-plugin-transform-runtime": "^6.23.0", - "babel-preset-env": "^1.7.0", - "babel-preset-stage-0": "^6.24.1", - "babel-register": "^6.26.0", "cfonts": "^2.8.1", "chalk": "^4.0.0", "copy-webpack-plugin": "^5.1.1", "cross-env": "^7.0.2", - "css-loader": "^3.5.2", + "css-loader": "^3.5.3", "del": "^5.1.0", "devtron": "^1.4.0", "electron": "^8.2.3", @@ -218,16 +216,14 @@ "electron-devtools-installer": "^3.0.0", "electron-notarize": "^0.3.0", "electron-osx-sign": "^0.4.15", - "eslint": "^5.16.0", - "eslint-config-standard": "^12.0.0", + "eslint": "^6.7.2", "eslint-friendly-formatter": "^4.0.1", - "eslint-loader": "^2.1.2", - "eslint-plugin-html": "^4.0.6", + "eslint-loader": "^4.0.2", "eslint-plugin-import": "^2.20.2", - "eslint-plugin-node": "^8.0.1", + "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-standard": "^4.0.1", - "eslint-plugin-vue": "^5.2.2", + "eslint-plugin-standard": "^4.0.0", + "eslint-plugin-vue": "^6.2.2", "file-loader": "^6.0.0", "html-webpack-plugin": "^4.2.0", "mini-css-extract-plugin": "0.9.0", @@ -236,8 +232,8 @@ "optimize-css-assets-webpack-plugin": "^5.0.3", "sass": "^1.26.5", "sass-loader": "^8.0.2", - "style-loader": "^1.1.4", - "terser-webpack-plugin": "^2.3.5", + "style-loader": "^1.2.0", + "terser-webpack-plugin": "^2.3.6", "url-loader": "^4.1.0", "vue-html-loader": "^1.2.4", "vue-loader": "^15.9.1",