Skip to content

Upgrade Dependencies to make build M1 / arm64 compatible #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
P-James wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade Dependencies to make build M1 / arm64 compatible #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
083499c
make build m1 compatible
P-James Sep 9, 2021
e6f5b11
remove package-lock
P-James Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -102,4 +101,4 @@
"git add"
]
}
}
}
4 changes: 2 additions & 2 deletions scripts/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
Expand Down Expand Up @@ -51,7 +51,7 @@ function genConfig (options) {
plugins: [
replace({ __VERSION__: version }),
css({ output: 'dist/verte.css' }),
vue({ css: false }),
vue(),
resolve(),
buble()
]
Expand Down
12 changes: 6 additions & 6 deletions src/components/Picker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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),
Expand All @@ -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);
Expand Down Expand Up @@ -275,7 +275,7 @@ export default {
</script>

<style lang="sass">
@import '../sass/variables';
@import '../sass/variables'

.verte-picker
width: 100%
Expand Down
5 changes: 2 additions & 3 deletions src/components/Slider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,12 @@ export default {
},
destroyed () {
window.removeEventListener('resize', this.handleResize);
},
}
};
</script>

<style lang="sass">
@import '../sass/variables';
@import '../sass/variables'

.slider
position: relative
Expand All @@ -326,7 +326,6 @@ export default {
visibility: visible
opacity: 1


.slider__input
margin-bottom: 0
padding: 0.3em
Expand Down
6 changes: 3 additions & 3 deletions src/components/Verte.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,10 @@ export default {
</script>

<style lang="sass">
@import '../sass/variables';
@import '../sass/variables'

$dot-size: 2px;
$dot-space: 4px;
$dot-size: 2px
$dot-space: 4px

.verte
position: relative
Expand Down
Loading