Skip to content

Commit

Permalink
feat(eslint): rollback versions for ESLint's tools until they solve t…
Browse files Browse the repository at this point in the history
…he problems with the Vue
  • Loading branch information
iliyaZelenko committed Oct 6, 2019
1 parent 98fe711 commit e0a29ef
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 129 deletions.
22 changes: 8 additions & 14 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,32 @@ const ERROR = 'error'
module.exports = {
root: true,
env: {
es6: true,
node: true,
browser: true
},
extends: [
// add more generic rulesets here, such as:
'standard',
'eslint:recommended',
'plugin:@typescript-eslint/eslint-recommended',
'standard',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'plugin:vue/recommended',
],
plugins: [
'vue',
'@typescript-eslint'
// '@typescript-eslint/tslint'
],
parser: 'vue-eslint-parser',
// plugins: [
// '@typescript-eslint'
// // '@typescript-eslint/tslint'
// ],
parserOptions: {
parser: '@typescript-eslint/parser',
project: './tsconfig.json',
sourceType: 'module',
extraFileExtensions: ['.vue']
project: './tsconfig.json'
},
rules: {
// работает через @typescript-eslint/indent
'indent': OFF,
// не правильно работает для конструктора typescript: constructor (public text) {}
'no-useless-constructor': OFF,
'no-console': OFF,

'@typescript-eslint/explicit-member-accessibility': [ERROR, { accessibility: 'no-public' }],
'@typescript-eslint/explicit-member-accessibility': 'no-public',
'@typescript-eslint/no-use-before-define': OFF,
'@typescript-eslint/explicit-function-return-type': OFF,
'@typescript-eslint/indent': [ERROR, 2],
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
"dev": "vue-cli-service serve ./demo/main.js",
"build": "rollup -c --environment BUILD:production",
"build-watch": "rollup -w -c",
"lint": "eslint . --ext .ts,.js,.vue --ignore-path .gitignore",
"lint": "eslint ./src --ext .ts,.js,.vue --ignore-path .gitignore",
"lint-fix": "yarn lint --fix"
},
"dependencies": {
"tiptap": "1.16.2",
"tiptap-extensions": "^1.14.0"
},
"devDependencies": {
"vue-eslint-parser": "^6.0.4",
"@babel/plugin-proposal-optional-chaining": "^7.2.0",
"@fortawesome/fontawesome-free": "^5.8.1",
"@mdi/font": "^4.4.95",
Expand All @@ -23,18 +24,18 @@
"@semantic-release/git": "^7.0.8",
"@semantic-release/npm": "^5.1.4",
"@semantic-release/release-notes-generator": "^7.1.4",
"@typescript-eslint/eslint-plugin": "^2.3.2",
"@typescript-eslint/eslint-plugin-tslint": "^2.3.2",
"@typescript-eslint/parser": "^2.3.2",
"@typescript-eslint/eslint-plugin": "^1.5.0",
"@typescript-eslint/eslint-plugin-tslint": "^1.5.0",
"@typescript-eslint/parser": "^1.5.0",
"@vue/cli-plugin-typescript": "^3.5.1",
"@vue/cli-service": "^3.5.1",
"@zerollup/ts-transform-paths": "^1.7.0",
"commitizen": "^4.0.3",
"cross-env": "^6.0.3",
"eslint": "^6.5.1",
"eslint-config-standard": "^14.1.0",
"eslint": "^5.16.0",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-node": "^8.0.1",
"eslint-plugin-promise": "^4.1.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^5.2.2",
Expand Down
3 changes: 2 additions & 1 deletion src/components/ActionsRender.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ export default class ActionsRender extends Vue {
PROPS = PROPS
isBtn (action: ExtensionActionInterface): boolean {
// action: ExtensionActionInterface
isBtn (): boolean {
// TODO action.render instanceof ExtensionActionRenderBtn не срабатывает, может из-за того, что это как prop
return true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
@click="options.onClick({ context: $props[PROPS.CONTEXT], editor: $props[PROPS.EDITOR] })"
>
<component
class="tiptap-vuetify-editor__btn-icon"
:is="isTextIcon ? 'b' : isVuetifyIcon ? 'v-icon' : null"
class="tiptap-vuetify-editor__btn-icon"
>
{{ buttonIcon }}
</component>
Expand Down
Loading

0 comments on commit e0a29ef

Please sign in to comment.