Skip to content

Commit 1e7e3b1

Browse files
committed
Merge branch 'release/2.4.4'
2 parents ecd5acc + e609d9c commit 1e7e3b1

File tree

81 files changed

+4377
-7893
lines changed

Some content is hidden

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

81 files changed

+4377
-7893
lines changed

.eslintrc.cjs

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,56 @@
11
module.exports = {
22
extends: '@studiometa/eslint-config',
33
rules: {
4-
'import/extensions': [ 'error', 'always', { ignorePackages: true }],
4+
'import/extensions': ['error', 'always', { ignorePackages: true }],
55
'no-underscore-dangle': 'off',
66
'jsdoc/valid-types': 'off',
77
},
8+
settings: {
9+
'import/extensions': ['.js', '.mjs', '.jsx', '.ts', '.mts'],
10+
},
811
overrides: [
912
{
10-
files: [ '**/*.spec.js', '**/spec.js', 'packages/tests/**/*.js' ],
11-
extends: [ 'plugin:jest/recommended', 'plugin:jest/style' ],
13+
files: ['**/*.spec.js', '**/spec.js', 'packages/tests/**/*.js'],
14+
extends: ['plugin:jest/recommended', 'plugin:jest/style'],
1215
rules: {
1316
'max-classes-per-file': 'off',
1417
'jest/no-test-callback': 'off',
1518
'require-jsdoc': 'off',
1619
},
1720
},
1821
{
19-
files: [ '**/*.ts' ],
22+
files: ['**/*.ts', 'packages/js-toolkit/**/*.ts'],
2023
parser: '@typescript-eslint/parser',
21-
plugins: [ '@typescript-eslint' ],
22-
extends: [ 'eslint:recommended', 'plugin:@typescript-eslint/recommended' ],
24+
parserOptions: {
25+
project: './tsconfig.json',
26+
},
27+
plugins: ['@typescript-eslint'],
28+
extends: [
29+
'eslint:recommended',
30+
'plugin:@typescript-eslint/recommended',
31+
'eslint-config-airbnb-typescript/base',
32+
],
33+
rules: {
34+
'@typescript-eslint/ban-ts-comment': 'off',
35+
'@typescript-eslint/indent': 'off',
36+
'@typescript-eslint/brace-style': 'off',
37+
'require-jsdoc': 'off',
38+
'jsdoc/require-returns': 'off',
39+
'jsdoc/require-param': 'off',
40+
'import/extensions': 'off',
41+
'@typescript-eslint/naming-convention': [
42+
'warn',
43+
{
44+
selector: ['classProperty', 'classMethod'],
45+
format: ['camelCase'],
46+
leadingUnderscore: 'allowDouble',
47+
trailingUnderscore: 'forbid',
48+
},
49+
],
50+
},
2351
},
2452
{
25-
files: [ 'packages/docs/**/*.js' ],
53+
files: ['packages/docs/**/*.js'],
2654
rules: {
2755
'require-jsdoc': 'off',
2856
},

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ jobs:
6060
verbose: true
6161

6262
Export-Size:
63-
runs-on: ubuntu-latest
63+
runs-on: macos-latest
6464
steps:
6565
- uses: actions/checkout@v2
6666
with:
6767
fetch-depth: '0'
6868
- uses: antfu/export-size-action@v1
6969
with:
7070
github_token: ${{ secrets.GITHUB_TOKEN }}
71-
build_script: node ./scripts/add-utils-export.js
72-
paths: packages/js-toolkit
71+
build_script: npm run build-for-export-size
72+
paths: dist

.prettierrc.cjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
module.exports = require('@studiometa/prettier-config');
1+
module.exports = {
2+
...require('@studiometa/prettier-config'),
3+
trailingComma: 'all',
4+
};

0 commit comments

Comments
 (0)