Skip to content

Commit

Permalink
chore: update deps; use more standard pretter and eslint config; use …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
taye authored and interactjs-ci committed Dec 3, 2023
1 parent 63920ea commit 038af17
Show file tree
Hide file tree
Showing 133 changed files with 4,588 additions and 4,817 deletions.
109 changes: 109 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
module.exports = {
extends: [
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
'plugin:react/all',
'standard',
'prettier',
],
settings: {
'import/resolver': { typescript: null },
react: { version: '16' },
},
env: {
commonjs: true,
es6: true,
node: true,
},
parser: '@typescript-eslint/parser',
parserOptions: {
sourceType: 'module',
ecmaVersion: 2020,
},
plugins: ['@typescript-eslint', 'eslint-plugin-tsdoc', 'markdown'],
globals: {
globalThis: false,
},
rules: {
'linebreak-style': ['error', 'unix'],
'lines-between-class-members': 'off',
'no-caller': 'error',
'no-console': 'off',
'no-empty': 'off',
'no-prototype-builtins': 'off',
'no-shadow': 'error',
'no-useless-constructor': 'off',
'no-var': 'error',
'import/no-extraneous-dependencies': ['error', { devDependencies: false }],
'import/order': [
'error',
{
alphabetize: { order: 'asc', caseInsensitive: true },
'newlines-between': 'always',
groups: ['builtin', 'external', 'internal', 'parent', 'index', 'sibling'],
pathGroups: [{ pattern: '@interactjs/**', group: 'internal' }],
},
],
'operator-linebreak': 'off',
'prefer-arrow-callback': ['error', { allowNamedFunctions: true }],
'prefer-const': 'error',
'standard/array-bracket-even-spacing': 'off',
'standard/computed-property-even-spacing': 'off',
'standard/object-curly-even-spacing': 'off',
'tsdoc/syntax': 'warn',
'@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
'@typescript-eslint/consistent-type-imports': 'error',
'@typescript-eslint/explicit-member-accessibility': 'off',
'@typescript-eslint/member-accessibility': 'off',
'@typescript-eslint/no-empty-interface': 'error',
'@typescript-eslint/no-inferrable-types': 'error',
'@typescript-eslint/no-use-before-define': 'off',
},
overrides: [
{
files: '*.{ts{,x},vue}',
rules: {
'import/named': 'off',
'import/no-named-as-default': 'off',
'import/no-unresolved': 'off',
'no-redeclare': 'off',
'no-shadow': 'off',
'no-undef': 'off',
'no-unused-vars': 'off',
'no-use-before-define': 'off',
},
},
{
files: '{,.md/}*.vue',
extends: ['plugin:vue/vue3-essential'],
parserOptions: { parser: '@typescript-eslint/parser' },
},
{
files: '*.spec.ts',
extends: ['plugin:jest/recommended', 'plugin:jest/style'],
rules: {
'array-bracket-spacing': 'off',
'import/no-extraneous-dependencies': 'off',
'jest/consistent-test-it': ['error', { fn: 'test' }],
},
},
{ files: '**/*.md', processor: 'markdown/markdown' },
{
files: '**/*.md/*.{{ts,js}{,x},vue}',
rules: {
'arrow-parens': 'off',
'import/no-named-as-default': 'off',
'import/no-unresolved': 'off',
'no-console': 'off',
'no-redeclare': 'off',
'no-shadow': 'off',
'no-undef': 'off',
'no-unused-vars': 'off',
'no-use-before-define': 'off',
'no-var': 'off',
'prefer-arrow-callback': 'off',
},
},
],
}
126 changes: 0 additions & 126 deletions .eslintrc.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ coverage
cc-test-reporter
lerna-debug.log
.vim
.cjsescache
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
dist
coverage
node_modules
bin
6 changes: 1 addition & 5 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"arrowParens": "avoid",
"embeddedLanguageFormatting": "off",
"printWidth": 110,
"semi": false,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "all",
"useTabs": false
"trailingComma": "all"
}
4 changes: 4 additions & 0 deletions .stylelintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
extends: ['stylelint-config-standard', 'stylelint-config-recess-order', 'stylelint-config-css-modules'],
ignoreFiles: ['dist/**/*', 'coverage/**/*'],
}
9 changes: 4 additions & 5 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
require.resolve('@babel/preset-typescript'),
{ isTsx: false, onlyRemoveTypeImports: true, allExtensions: true, allowDeclareFields: true },
],
].filter(Boolean),
],

plugins: [
require.resolve('./scripts/babel/vue-sfc'),
Expand All @@ -19,9 +19,8 @@ module.exports = {
},
],
isProd && require.resolve('./scripts/babel/for-of-array'),
isProd && require.resolve('@babel/plugin-proposal-optional-catch-binding'),
isProd && [require.resolve('@babel/plugin-proposal-optional-chaining'), { loose: true }],
isProd && [require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'), { loose: true }],
[require.resolve('@babel/plugin-transform-modules-commonjs'), { noInterop: isProd }],
isProd && require.resolve('@babel/plugin-transform-optional-catch-binding'),
isProd && [require.resolve('@babel/plugin-transform-optional-chaining'), { loose: true }],
isProd && [require.resolve('@babel/plugin-transform-nullish-coalescing-operator'), { loose: true }],
].filter(Boolean),
}
5 changes: 5 additions & 0 deletions examples/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
extends: '../.eslintrc.cjs',
globals: { interact: false, _: false, $: false },
rules: { 'no-console': 'off', 'import/no-unresolved': 'off', 'import/no-extraneous-dependencies': 'off' },
}
11 changes: 0 additions & 11 deletions examples/.eslintrc.yml

This file was deleted.

14 changes: 7 additions & 7 deletions examples/dropzones/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ interact.maxInteractions(Infinity)
// setup draggable elements.
interact('.js-drag').draggable({
listeners: {
start (event) {
start(event) {
const position = dragPositions[event.target.id]
position.x = parseInt(event.target.getAttribute('data-x'), 10) || 0
position.y = parseInt(event.target.getAttribute('data-y'), 10) || 0
},
move (event) {
move(event) {
const position = dragPositions[event.target.id]
position.x += event.dx
position.y += event.dy
Expand All @@ -29,7 +29,7 @@ interact('.js-drag').draggable({
event.target.style.top = position.y + 'px'
}
},
end (event) {
end(event) {
const position = dragPositions[event.target.id]
event.target.setAttribute('data-x', position.x)
event.target.setAttribute('data-y', position.y)
Expand All @@ -51,10 +51,10 @@ setupDropzone('.js-drop', '#drag3')
* @param {HTMLElement|String} target
* @param {String} accept
*/
function setupDropzone (target, accept) {
function setupDropzone(target, accept) {
interact(target)
.dropzone({
accept: accept,
accept,
ondropactivate: function (event) {
addClass(event.relatedTarget, '-drop-possible')
},
Expand Down Expand Up @@ -99,15 +99,15 @@ function setupDropzone (target, accept) {
})
}

function addClass (element, className) {
function addClass(element, className) {
if (element.classList) {
return element.classList.add(className)
} else {
element.className += ' ' + className
}
}

function removeClass (element, className) {
function removeClass(element, className) {
if (element.classList) {
return element.classList.remove(className)
} else {
Expand Down
4 changes: 2 additions & 2 deletions examples/events/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ interact('#swipe')

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

function logEvent (event) {
function logEvent(event) {
event.currentTarget.innerHTML = event.pointerType

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

function changeTolerance (event) {
function changeTolerance(event) {
const value = event.target.value | 0

interact.pointerMoveTolerance(value)
Expand Down
4 changes: 2 additions & 2 deletions examples/iframes/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default function setInteractables () {
export default function setInteractables() {
interact('.draggable', { context: document }).draggable({
onmove: onMove,
inertia: { enabled: true },
Expand All @@ -10,7 +10,7 @@ export default function setInteractables () {
autoScroll: true,
})

function onMove (event) {
function onMove(event) {
const target = event.target
const x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx
const y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy
Expand Down
Loading

0 comments on commit 038af17

Please sign in to comment.