diff --git a/.eslintrc b/.eslintrc index f198be7..2248208 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,5 +1,5 @@ { - "extends": ["plugin:vue-libs/recommended", "plugin:jest/recommended"], + "extends": ["eslint:recommended", "plugin:vue-libs/recommended", "plugin:jest/recommended"], "rules": { "no-cond-assign": 0, "eqeqeq": 0 diff --git a/package.json b/package.json index 18ad7c9..6ef951e 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "homepage": "https://amsik.github.io/liquor-tree/", "scripts": { "dev": "cross-env NODE_ENV=development rollup -w -c rollup.config.js", - "build": "cross-env NODE_ENV=production rollup -c rollup.config.js -- --environment BUILD:production", - "lint": "eslint --fix src test", + "build": "cross-env NODE_ENV=production rollup -c rollup.config.js", + "lint": "eslint --fix src tests", "test": "npm run lint && npm run unit", "unit": "jest", "storybook": "start-storybook -p 9001 -c ./docs/storybook -s ./docs/storybook/public" @@ -33,30 +33,34 @@ ], "devDependencies": { "@rollup/plugin-alias": "^2.2.0", - "@storybook/addon-notes": "^3.4.12", - "@storybook/addon-options": "^3.4.12", - "@storybook/vue": "^3.4.12", - "@vue/test-utils": "^1.0.0-beta.25", + "@storybook/addon-notes": "^5.2.8", + "@storybook/addon-options": "^5.2.8", + "@storybook/vue": "^5.2.8", + "@vue/test-utils": "^1.0.0-beta.30", "babel-core": "^6.26.3", - "babel-jest": "^22.4.4", + "babel-jest": "^25.0.0", + "babel-loader": "^8.0.6", "babel-plugin-transform-builtin-extend": "^1.1.2", "babel-preset-env": "^1.7.0", + "canvas": "^2.6.0", "cross-env": "^6.0.3", - "eslint": "^4.19.1", - "eslint-plugin-jest": "^21.22.1", - "eslint-plugin-vue-libs": "^2.1.0", - "jest": "^22.4.4", - "rollup": "^0.66.6", + "eslint": "^6.7.2", + "eslint-plugin-jest": "^23.1.1", + "eslint-plugin-vue-libs": "^4.0.0", + "jest": "^25.0.0", + "rollup": "^1.27.10", "rollup-plugin-buble": "^0.19.8", "rollup-plugin-serve": "^1.0.1", "rollup-plugin-uglify": "^6.0.4", "rollup-plugin-vue": "4.6.1", + "typescript": "^3.7.3", "vue": "^2.6.10", "vue-jest": "^3.0.5", "vue-loader": "^15.7.2", "vue-template-compiler": "^2.6.10" }, "jest": { + "testEnvironment": "node", "setupFiles": [ "./tests/setupTests.js" ], @@ -71,6 +75,13 @@ "^.+\\.js$": "/node_modules/babel-jest", ".*\\.(vue)$": "/node_modules/vue-jest" }, - "testEnvironment": "node" + "collectCoverage": true, + "collectCoverageFrom": [ + "./src/**" + ], + "coverageReporters": [ + "text", + "text-summary" + ] } } diff --git a/src/utils/keyboardNavigation.js b/src/utils/keyboardNavigation.js index 905c665..3b7a79e 100644 --- a/src/utils/keyboardNavigation.js +++ b/src/utils/keyboardNavigation.js @@ -123,4 +123,4 @@ export default function (tree) { } } }, true) -}; +} diff --git a/src/utils/request.js b/src/utils/request.js index c7b543b..f935e27 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,7 +13,7 @@ function request (url) { resolve(response) } catch (e) { reject(e) - }; + } }) xhr.send(null)