Skip to content

Commit 038af17

Browse files
tayeinteractjs-ci
taye
authored and
interactjs-ci
committed
chore: update deps; use more standard pretter and eslint config; use rollup
# Conflicts: # packages/@interactjs/arrange/ArrangeEvent.ts # packages/@interactjs/arrange/arrange.spec.ts # packages/@interactjs/arrange/beforeEnd.ts # packages/@interactjs/arrange/componentUtils.ts # packages/@interactjs/arrange/end.ts # packages/@interactjs/arrange/getPos.ts # packages/@interactjs/arrange/interactableMethod.ts # packages/@interactjs/arrange/move.ts # packages/@interactjs/arrange/plugin.ts # packages/@interactjs/arrange/setClasses.ts # packages/@interactjs/arrange/start.ts # packages/@interactjs/arrange/types.ts # packages/@interactjs/arrange/updateTree.ts # packages/@interactjs/clone/plugin.ts # packages/@interactjs/dev-tools/visualizer/Visualizer.vue # packages/@interactjs/dev-tools/visualizer/plugin.ts # packages/@interactjs/feedback/dragResize.ts # packages/@interactjs/feedback/plugin.ts # packages/@interactjs/feedback/pointers.ts # packages/@interactjs/iframes/FrameInfo.ts # packages/@interactjs/iframes/plugin.ts # packages/@interactjs/modifiers/avoid/avoid.spec.ts # packages/@interactjs/modifiers/avoid/avoid.ts # packages/@interactjs/modifiers/rubberband/rubberband.spec.ts # packages/@interactjs/modifiers/rubberband/rubberband.ts # packages/@interactjs/modifiers/spring/spring.spec.ts # packages/@interactjs/modifiers/spring/spring.ts # packages/@interactjs/modifiers/transform/transform.spec.ts # packages/@interactjs/modifiers/transform/transform.ts # packages/@interactjs/multi-target/multiTarget.spec.ts # packages/@interactjs/multi-target/plugin.ts # packages/@interactjs/react/InteractableComponent.ts # packages/@interactjs/react/plugin.ts # packages/@interactjs/rebound/index.ts # packages/@interactjs/snappers/edgeTarget.spec.ts # packages/@interactjs/snappers/elements.spec.ts # packages/@interactjs/snappers/elements.ts # packages/@interactjs/symbol-tree/SymbolTree.ts # packages/@interactjs/utils/ElementState.ts # packages/@interactjs/utils/displace.ts # packages/@interactjs/utils/exchange.ts # packages/@interactjs/vue/IDraggable.vue # packages/@interactjs/vue/plugin.ts
1 parent 63920ea commit 038af17

File tree

133 files changed

+4588
-4817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+4588
-4817
lines changed

‎.eslintrc.cjs

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
module.exports = {
2+
extends: [
3+
'plugin:import/errors',
4+
'plugin:import/warnings',
5+
'plugin:import/typescript',
6+
'plugin:react/all',
7+
'standard',
8+
'prettier',
9+
],
10+
settings: {
11+
'import/resolver': { typescript: null },
12+
react: { version: '16' },
13+
},
14+
env: {
15+
commonjs: true,
16+
es6: true,
17+
node: true,
18+
},
19+
parser: '@typescript-eslint/parser',
20+
parserOptions: {
21+
sourceType: 'module',
22+
ecmaVersion: 2020,
23+
},
24+
plugins: ['@typescript-eslint', 'eslint-plugin-tsdoc', 'markdown'],
25+
globals: {
26+
globalThis: false,
27+
},
28+
rules: {
29+
'linebreak-style': ['error', 'unix'],
30+
'lines-between-class-members': 'off',
31+
'no-caller': 'error',
32+
'no-console': 'off',
33+
'no-empty': 'off',
34+
'no-prototype-builtins': 'off',
35+
'no-shadow': 'error',
36+
'no-useless-constructor': 'off',
37+
'no-var': 'error',
38+
'import/no-extraneous-dependencies': ['error', { devDependencies: false }],
39+
'import/order': [
40+
'error',
41+
{
42+
alphabetize: { order: 'asc', caseInsensitive: true },
43+
'newlines-between': 'always',
44+
groups: ['builtin', 'external', 'internal', 'parent', 'index', 'sibling'],
45+
pathGroups: [{ pattern: '@interactjs/**', group: 'internal' }],
46+
},
47+
],
48+
'operator-linebreak': 'off',
49+
'prefer-arrow-callback': ['error', { allowNamedFunctions: true }],
50+
'prefer-const': 'error',
51+
'standard/array-bracket-even-spacing': 'off',
52+
'standard/computed-property-even-spacing': 'off',
53+
'standard/object-curly-even-spacing': 'off',
54+
'tsdoc/syntax': 'warn',
55+
'@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
56+
'@typescript-eslint/consistent-type-imports': 'error',
57+
'@typescript-eslint/explicit-member-accessibility': 'off',
58+
'@typescript-eslint/member-accessibility': 'off',
59+
'@typescript-eslint/no-empty-interface': 'error',
60+
'@typescript-eslint/no-inferrable-types': 'error',
61+
'@typescript-eslint/no-use-before-define': 'off',
62+
},
63+
overrides: [
64+
{
65+
files: '*.{ts{,x},vue}',
66+
rules: {
67+
'import/named': 'off',
68+
'import/no-named-as-default': 'off',
69+
'import/no-unresolved': 'off',
70+
'no-redeclare': 'off',
71+
'no-shadow': 'off',
72+
'no-undef': 'off',
73+
'no-unused-vars': 'off',
74+
'no-use-before-define': 'off',
75+
},
76+
},
77+
{
78+
files: '{,.md/}*.vue',
79+
extends: ['plugin:vue/vue3-essential'],
80+
parserOptions: { parser: '@typescript-eslint/parser' },
81+
},
82+
{
83+
files: '*.spec.ts',
84+
extends: ['plugin:jest/recommended', 'plugin:jest/style'],
85+
rules: {
86+
'array-bracket-spacing': 'off',
87+
'import/no-extraneous-dependencies': 'off',
88+
'jest/consistent-test-it': ['error', { fn: 'test' }],
89+
},
90+
},
91+
{ files: '**/*.md', processor: 'markdown/markdown' },
92+
{
93+
files: '**/*.md/*.{{ts,js}{,x},vue}',
94+
rules: {
95+
'arrow-parens': 'off',
96+
'import/no-named-as-default': 'off',
97+
'import/no-unresolved': 'off',
98+
'no-console': 'off',
99+
'no-redeclare': 'off',
100+
'no-shadow': 'off',
101+
'no-undef': 'off',
102+
'no-unused-vars': 'off',
103+
'no-use-before-define': 'off',
104+
'no-var': 'off',
105+
'prefer-arrow-callback': 'off',
106+
},
107+
},
108+
],
109+
}

‎.eslintrc.yml

Lines changed: 0 additions & 126 deletions
This file was deleted.

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ coverage
2727
cc-test-reporter
2828
lerna-debug.log
2929
.vim
30+
.cjsescache

‎.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
dist
22
coverage
33
node_modules
4-
bin

‎.prettierrc.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
2-
"arrowParens": "avoid",
3-
"embeddedLanguageFormatting": "off",
42
"printWidth": 110,
53
"semi": false,
64
"singleQuote": true,
7-
"tabWidth": 2,
8-
"trailingComma": "all",
9-
"useTabs": false
5+
"trailingComma": "all"
106
}

‎.stylelintrc.cjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
extends: ['stylelint-config-standard', 'stylelint-config-recess-order', 'stylelint-config-css-modules'],
3+
ignoreFiles: ['dist/**/*', 'coverage/**/*'],
4+
}

‎babel.config.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
require.resolve('@babel/preset-typescript'),
88
{ isTsx: false, onlyRemoveTypeImports: true, allExtensions: true, allowDeclareFields: true },
99
],
10-
].filter(Boolean),
10+
],
1111

1212
plugins: [
1313
require.resolve('./scripts/babel/vue-sfc'),
@@ -19,9 +19,8 @@ module.exports = {
1919
},
2020
],
2121
isProd && require.resolve('./scripts/babel/for-of-array'),
22-
isProd && require.resolve('@babel/plugin-proposal-optional-catch-binding'),
23-
isProd && [require.resolve('@babel/plugin-proposal-optional-chaining'), { loose: true }],
24-
isProd && [require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'), { loose: true }],
25-
[require.resolve('@babel/plugin-transform-modules-commonjs'), { noInterop: isProd }],
22+
isProd && require.resolve('@babel/plugin-transform-optional-catch-binding'),
23+
isProd && [require.resolve('@babel/plugin-transform-optional-chaining'), { loose: true }],
24+
isProd && [require.resolve('@babel/plugin-transform-nullish-coalescing-operator'), { loose: true }],
2625
].filter(Boolean),
2726
}

‎examples/.eslintrc.cjs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
extends: '../.eslintrc.cjs',
3+
globals: { interact: false, _: false, $: false },
4+
rules: { 'no-console': 'off', 'import/no-unresolved': 'off', 'import/no-extraneous-dependencies': 'off' },
5+
}

‎examples/.eslintrc.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎examples/dropzones/index.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ interact.maxInteractions(Infinity)
1212
// setup draggable elements.
1313
interact('.js-drag').draggable({
1414
listeners: {
15-
start (event) {
15+
start(event) {
1616
const position = dragPositions[event.target.id]
1717
position.x = parseInt(event.target.getAttribute('data-x'), 10) || 0
1818
position.y = parseInt(event.target.getAttribute('data-y'), 10) || 0
1919
},
20-
move (event) {
20+
move(event) {
2121
const position = dragPositions[event.target.id]
2222
position.x += event.dx
2323
position.y += event.dy
@@ -29,7 +29,7 @@ interact('.js-drag').draggable({
2929
event.target.style.top = position.y + 'px'
3030
}
3131
},
32-
end (event) {
32+
end(event) {
3333
const position = dragPositions[event.target.id]
3434
event.target.setAttribute('data-x', position.x)
3535
event.target.setAttribute('data-y', position.y)
@@ -51,10 +51,10 @@ setupDropzone('.js-drop', '#drag3')
5151
* @param {HTMLElement|String} target
5252
* @param {String} accept
5353
*/
54-
function setupDropzone (target, accept) {
54+
function setupDropzone(target, accept) {
5555
interact(target)
5656
.dropzone({
57-
accept: accept,
57+
accept,
5858
ondropactivate: function (event) {
5959
addClass(event.relatedTarget, '-drop-possible')
6060
},
@@ -99,15 +99,15 @@ function setupDropzone (target, accept) {
9999
})
100100
}
101101

102-
function addClass (element, className) {
102+
function addClass(element, className) {
103103
if (element.classList) {
104104
return element.classList.add(className)
105105
} else {
106106
element.className += ' ' + className
107107
}
108108
}
109109

110-
function removeClass (element, className) {
110+
function removeClass(element, className) {
111111
if (element.classList) {
112112
return element.classList.remove(className)
113113
} else {

‎examples/events/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ interact('#swipe')
2626

2727
const pointerEvents = ['tap', 'doubletap', 'hold', 'down', 'move', 'up']
2828

29-
function logEvent (event) {
29+
function logEvent(event) {
3030
event.currentTarget.innerHTML = event.pointerType
3131

3232
if (/tap|up|click|down/.test(event.type) && event.interaction.prevTap) {
@@ -63,7 +63,7 @@ for (let i = 0; i < pointerEvents.length; i++) {
6363
interact('#swipe').on(eventType, logEvent)
6464
}
6565

66-
function changeTolerance (event) {
66+
function changeTolerance(event) {
6767
const value = event.target.value | 0
6868

6969
interact.pointerMoveTolerance(value)

‎examples/iframes/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export default function setInteractables () {
1+
export default function setInteractables() {
22
interact('.draggable', { context: document }).draggable({
33
onmove: onMove,
44
inertia: { enabled: true },
@@ -10,7 +10,7 @@ export default function setInteractables () {
1010
autoScroll: true,
1111
})
1212

13-
function onMove (event) {
13+
function onMove(event) {
1414
const target = event.target
1515
const x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx
1616
const y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy

0 commit comments

Comments
 (0)