diff --git a/package.json b/package.json index 338eb47..8a914fd 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "jest-canvas-mock": "^1.1.0", "lint-staged": "^7.2.0", "mkdirp": "^0.5.1", - "node-sass": "^4.9.2", "pug": "^2.0.3", "pug-loader": "^2.4.0", "pug-plain-loader": "^1.0.0", @@ -55,7 +54,7 @@ "rollup-plugin-node-resolve": "^3.3.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-uglify": "^4.0.0", - "rollup-plugin-vue": "^4.3.1", + "rollup-plugin-vue": "^5.0.0", "sass-loader": "^7.0.3", "stylus": "^0.54.5", "vue-jest": "^2.6.0", @@ -102,4 +101,4 @@ "git add" ] } -} +} \ No newline at end of file diff --git a/scripts/config.js b/scripts/config.js index 6b442e3..4db9b81 100644 --- a/scripts/config.js +++ b/scripts/config.js @@ -1,7 +1,7 @@ const path = require('path'); const fs = require('fs'); const replace = require('rollup-plugin-replace'); -const vue = require('rollup-plugin-vue').default; +const vue = require('rollup-plugin-vue'); const resolve = require('rollup-plugin-node-resolve'); const css = require('rollup-plugin-css-only'); const buble = require('rollup-plugin-buble'); @@ -51,7 +51,7 @@ function genConfig (options) { plugins: [ replace({ __VERSION__: version }), css({ output: 'dist/verte.css' }), - vue({ css: false }), + vue(), resolve(), buble() ] diff --git a/src/components/Picker.vue b/src/components/Picker.vue index 482255a..4db0fa4 100644 --- a/src/components/Picker.vue +++ b/src/components/Picker.vue @@ -135,10 +135,10 @@ export default { const normalized = { x: Math.min(Math.max(x - left, 0), width), y: Math.min(Math.max(y - top, 0), height) - } + }; if ( - this.mode === 'wheel'&& + this.mode === 'wheel' && !this.ctx.isPointInPath(this.circle.path, normalized.x, normalized.y) ) { return; @@ -230,7 +230,7 @@ export default { lum = 100 - (y * 100 / height); hue = this.currentHue; } - + return new Colors.HslColor({ alpha: this.alpha, hue: Math.round(hue), @@ -244,9 +244,9 @@ export default { this.updateCursorPosition(getEventCords(event)); const tempFunc = (evnt) => { window.requestAnimationFrame(() => { - this.updateCursorPosition(getEventCords(evnt)) + this.updateCursorPosition(getEventCords(evnt)); }); - } + }; const handleRelase = () => { document.removeEventListener('mousemove', tempFunc); document.removeEventListener('touchmove', tempFunc); @@ -275,7 +275,7 @@ export default {