diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 1919259..0000000 --- a/.babelrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "presets": [ - ["env", { "modules": false }] - ], - "env": { - "test": { - "presets": [ - ["env", { "targets": { "node": "current" }}] - ], - "plugins": [ - ["babel-plugin-transform-builtin-extend", { - "globals": ["Error", "Array"] - }] - ] - } - } -} diff --git a/.eslintrc b/.eslintrc deleted file mode 100644 index 2248208..0000000 --- a/.eslintrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": ["eslint:recommended", "plugin:vue-libs/recommended", "plugin:jest/recommended"], - "rules": { - "no-cond-assign": 0, - "eqeqeq": 0 - }, - "plugins": ["jest"] -} diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..c35cf6f --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,9 @@ +module.exports = { + extends: ['plugin:vue/recommended', 'plugin:prettier/recommended'], + plugins: ['jest', 'prettier'], + rules: { + eqeqeq:: 0 + no-cond-assign: 0, + quotes: [1, 'single'] + } +}; diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 0000000..916db64 --- /dev/null +++ b/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ['@vue/cli-plugin-babel/preset'] +}; diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000..39f4fb4 --- /dev/null +++ b/jest.config.js @@ -0,0 +1,12 @@ +module.exports = { + preset: '@vue/cli-plugin-unit-jest', + setupFiles: ['/tests/setupTests.js'], + testURL: 'http://localhost:8999', + testMatch: ['/tests/*/*.spec.js'], + testEnvironmentOptions: { + pretendToBeVisual: true + }, + collectCoverage: true, + collectCoverageFrom: ['/src/**'], + coverageReporters: ['text', 'text-summary'] +}; diff --git a/package.json b/package.json index 6ef951e..4386f40 100644 --- a/package.json +++ b/package.json @@ -1,87 +1,69 @@ { "name": "liquor-tree", - "description": "A Vue.js tree component.", "version": "0.2.69", + "description": "A Vue.js tree component.", "author": "Kostiantyn ", - "library": "LiquorTree", - "homepage": "https://amsik.github.io/liquor-tree/", "scripts": { + "lint": "vue-cli-service lint", + "test": "vue-cli-service test:unit", "dev": "cross-env NODE_ENV=development rollup -w -c rollup.config.js", "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" }, - "repository": { - "type": "git", - "url": "git+https://github.com/amsik/liquor-tree.git" - }, - "module": "dist/liquor-tree.esm.js", "main": "dist/liquor-tree.umd.js", - "keywords": [ - "vue", - "tree", - "component", - "vue-tree", - "treeview" - ], - "license": "MIT", + "module": "dist/liquor-tree.esm.js", "files": [ "src", "dist/*.js" ], + "dependencies": {}, "devDependencies": { "@rollup/plugin-alias": "^2.2.0", "@storybook/addon-notes": "^5.2.8", "@storybook/addon-options": "^5.2.8", "@storybook/vue": "^5.2.8", + "@vue/cli-plugin-babel": "^4.1.1", + "@vue/cli-plugin-eslint": "^4.1.1", + "@vue/cli-plugin-unit-jest": "^4.1.1", + "@vue/cli-service": "^4.1.1", + "@vue/eslint-config-prettier": "^6.0.0", "@vue/test-utils": "^1.0.0-beta.30", - "babel-core": "^6.26.3", - "babel-jest": "^25.0.0", - "babel-loader": "^8.0.6", - "babel-plugin-transform-builtin-extend": "^1.1.2", - "babel-preset-env": "^1.7.0", + "babel-core": "^7.0.0-bridge.0", "canvas": "^2.6.0", + "core-js": "^3.4.8", "cross-env": "^6.0.3", "eslint": "^6.7.2", "eslint-plugin-jest": "^23.1.1", - "eslint-plugin-vue-libs": "^4.0.0", - "jest": "^25.0.0", + "eslint-plugin-prettier": "^3.1.1", + "eslint-plugin-vue": "^6.0.1", + "html-webpack-plugin": "^3.2.0", + "prettier": "^1.19.1", "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" - ], - "moduleFileExtensions": [ - "js", - "vue" - ], - "moduleNameMapper": { - "^@/(.*)$": "/src/$1" - }, - "transform": { - "^.+\\.js$": "/node_modules/babel-jest", - ".*\\.(vue)$": "/node_modules/vue-jest" - }, - "collectCoverage": true, - "collectCoverageFrom": [ - "./src/**" - ], - "coverageReporters": [ - "text", - "text-summary" - ] + "browserslist": [ + ">= 1%", + "last 1 major version", + "not dead", + "Explorer 11" + ], + "homepage": "https://amsik.github.io/liquor-tree/", + "keywords": [ + "vue", + "tree", + "component", + "vue-tree", + "treeview" + ], + "library": "LiquorTree", + "license": "MIT", + "repository": { + "type": "git", + "url": "git+https://github.com/amsik/liquor-tree.git" } } diff --git a/src/components/TreeNode.vue b/src/components/TreeNode.vue index cad1886..bfee675 100644 --- a/src/components/TreeNode.vue +++ b/src/components/TreeNode.vue @@ -28,15 +28,14 @@
    +
@@ -440,6 +439,4 @@ transform: rotate(360deg); } } - - - + \ No newline at end of file diff --git a/src/components/TreeRoot.vue b/src/components/TreeRoot.vue index b70d0aa..16f5678 100644 --- a/src/components/TreeRoot.vue +++ b/src/components/TreeRoot.vue @@ -6,24 +6,24 @@ @@ -194,4 +194,4 @@ bottom: 0; transform: translateY(50%); } - + \ No newline at end of file