Skip to content
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.

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

deps: Bump eslint suite to v9 #1565

Merged
merged 6 commits into from
Mar 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions .eslintignore

This file was deleted.

69 changes: 0 additions & 69 deletions .eslintrc.json

This file was deleted.

90 changes: 90 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
// @ts-check

import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';
import html from 'eslint-plugin-html';
import { FlatCompat } from '@eslint/eslintrc';

const compat = new FlatCompat({});

export default tseslint.config(
{
files: ['**/*.{js,mjs,ts}'],
ignores: [
'packages/*/docs/',
'packages/*/lib/',
'packages/*/node_modules/',
'packages/*/types/',

'packages/*/examples/**/*.{js,html}',

'**/jest.config.js',
],
extends: [
eslint.configs.recommended,
tseslint.configs.recommended,
],
rules: {
curly: ['error', 'multi-line'],

['no-console']: ['error', {
allow: ['info', 'warn', 'error'],
}],

['@typescript-eslint/naming-convention']: ['error', {
selector: 'default',
format: ['camelCase'],
}, {
selector: 'variable',
format: ['camelCase', 'UPPER_CASE'],
leadingUnderscore: 'allow',
}, {
selector: 'typeLike',
format: ['PascalCase'],
}, {
selector: 'memberLike',
modifiers: ['public'],
format: ['camelCase', 'UPPER_CASE'],
leadingUnderscore: 'forbid',
}, {
selector: 'memberLike',
modifiers: ['protected'],
format: ['camelCase', 'UPPER_CASE'],
leadingUnderscore: 'require',
}, {
selector: 'memberLike',
modifiers: ['private'],
format: ['camelCase', 'UPPER_CASE'],
leadingUnderscore: 'require',
}, {
selector: 'enumMember',
format: ['PascalCase'],
}, {
selector: 'import',
format: ['camelCase', 'PascalCase', 'UPPER_CASE'],
}],

['@typescript-eslint/no-unused-vars']: ['warn', {
args: 'none',
}],

['@typescript-eslint/no-explicit-any']: 'off',
['@typescript-eslint/no-non-null-assertion']: ['off'],
},
},

{
files: ['packages/*/examples/**/*.{js,html}'],
extends: [
eslint.configs.recommended,
...compat.extends('mdcs'),
],
plugins: {
html,
},
rules: {
['padded-blocks']: 'off',
['no-unused-vars']: 'off',
},
},
);
2 changes: 1 addition & 1 deletion jest.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// it's required to make vscode-jest work properly...
export default {
transform: {
'^.+\\.ts$': 'ts-jest',
['^.+\\.ts$']: 'ts-jest',
},
};
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
"prepare": "husky"
},
"devDependencies": {
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.17.0",
"@gltf-transform/core": "^4.0.8",
"@types/jest": "^29.5.12",
"@types/node": "^22.7.5",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"cross-env": "^7.0.2",
"esbuild": "^0.25.0",
"eslint": "8",
"eslint": "^9.17.0",
"eslint-config-mdcs": "^5.0.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-html": "^8.1.1",
"eslint-plugin-html": "^8.1.2",
"globals": "^15.14.0",
"husky": "^9.1.5",
"jest": "^29.7.0",
"lerna": "^8.1.8",
Expand All @@ -39,7 +39,8 @@
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"typedoc": "^0.27.7",
"typescript": "^5.4.5"
"typescript": "^5.4.5",
"typescript-eslint": "^8.18.2"
},
"name": "three-vrm"
}
11 changes: 0 additions & 11 deletions packages/three-vrm-animation/examples/.eslintrc

This file was deleted.

4 changes: 3 additions & 1 deletion packages/three-vrm-animation/src/VRMAnimationLoaderPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ export class VRMAnimationLoaderPlugin implements GLTFLoaderPlugin {
while (parentBoneName != null && worldMatrixMap.get(parentBoneName) == null) {
parentBoneName = VRMHumanBoneParentMap[parentBoneName];
}
parentBoneName ?? (parentBoneName = 'hipsParent');
if (parentBoneName == null) {
parentBoneName = 'hipsParent';
}
Comment on lines -208 to +210
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean

Suggested change
parentBoneName ?? (parentBoneName = 'hipsParent');
if (parentBoneName == null) {
parentBoneName = 'hipsParent';
}
parentBoneName ??= 'hipsParent'


if (path === 'translation') {
if (boneName !== 'hips') {
Expand Down
11 changes: 0 additions & 11 deletions packages/three-vrm-core/examples/.eslintrc

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions packages/three-vrm-materials-mtoon/examples/.eslintrc

This file was deleted.

11 changes: 0 additions & 11 deletions packages/three-vrm-node-constraint/examples/.eslintrc

This file was deleted.

11 changes: 0 additions & 11 deletions packages/three-vrm-springbone/examples/.eslintrc

This file was deleted.

11 changes: 0 additions & 11 deletions packages/three-vrm/examples/.eslintrc

This file was deleted.

Loading