Skip to content

Commit 215f3a4

Browse files
committed
fix: fix conflicts in react:ts configs
1 parent c03866f commit 215f3a4

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

src/categories/js/eslint/config/react:ts.config.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ export const reactTsConfig: Config = {
3131
'@typescript-eslint/no-explicit-any': 'warn',
3232
'@typescript-eslint/no-floating-promises': 'warn',
3333
'@typescript-eslint/no-empty-interface': 'warn',
34-
'no-param-reassign': 'warn',
3534
'@typescript-eslint/ban-types': 'warn',
36-
'max-classes-per-file': ['error', 2],
3735

3836
'react/react-in-jsx-scope': 'off',
3937
'react/jsx-props-no-spreading': 'off',
@@ -44,6 +42,7 @@ export const reactTsConfig: Config = {
4442
'react/require-default-props': 'off',
4543
'react/no-array-index-key': 'warn',
4644

45+
'import/order': 'off',
4746
'beautiful-sort/import': [
4847
'error',
4948
{

src/categories/js/lint-staged/config/react:ts.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export const reactTsConfig: Config = {
55
config: {},
66
mutations: [
77
prettierMutation,
8-
stylelintMutation('*.{ts,tsx}'),
8+
stylelintMutation('*.{css,ts,tsx}'),
99
eslintMutation('*.{ts,tsx}'),
1010
jestMutation('*.{ts,tsx}'),
1111
],

src/categories/js/lint-staged/lint-staged.utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { isEslintInstalled } from '../eslint/eslint.utils';
1010
import { isStylelintInstalled } from '../stylelint/stylelint.utils';
1111
import { STYLELINT_CLI_NAME } from '../stylelint/stylelint.const';
1212

13-
type ScriptFileExtension = '*.js' | '*.ts' | '*.css' | '*.{ts,tsx}';
13+
type ScriptFileExtension = '*.js' | '*.ts' | '*.css' | '*.{ts,tsx}' | '*.{css,ts,tsx}';
1414

1515
interface OptionMutation {
1616
check: (config: LintStagedConfig, key: string, value: string) => boolean;

src/categories/js/stylelint/config/default.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const stylelintConfig: Config['stylelintConfig'] = {
1313
true,
1414
{
1515
'border-in-box-model': false,
16-
'empty-line-between-groups': false,
16+
'empty-line-between-groups': true,
1717
},
1818
],
1919
},

src/categories/js/stylelint/config/react:ts.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const stylelintConfig: Config['stylelintConfig'] = {
1313
true,
1414
{
1515
'border-in-box-model': false,
16-
'empty-line-between-groups': false,
16+
'empty-line-between-groups': true,
1717
},
1818
],
1919
},

src/categories/js/stylelint/stylelint.entrypoint.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ export const stylelint = async () => {
1515
await installDevelopmentDependencies(...devDependencies);
1616
await addScripts(...scripts);
1717

18-
await addFileToRoot(STYLELINT_CONFIG_NAME, JSON.stringify(stylelintConfig));
18+
await addFileToRoot(STYLELINT_CONFIG_NAME, JSON.stringify(stylelintConfig, null, 2));
1919
await addFileToRoot(STYLELINT_IGNORE_NAME, stylelintIgnore);
2020
};

0 commit comments

Comments
 (0)