Skip to content

Commit

Permalink
feat: singlequote, 120 wrap, semicolon on
Browse files Browse the repository at this point in the history
  • Loading branch information
angeloanan committed Sep 15, 2023
1 parent 24fe904 commit ed4e2b3
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 62 deletions.
6 changes: 3 additions & 3 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ module.exports = {
htmlWhitespaceSensitivity: 'css',
insertPragma: false,
jsxBracketSameLine: false,
jsxSingleQuote: false,
printWidth: 80,
jsxSingleQuote: true,
printWidth: 120,
proseWrap: 'always',
quoteProps: 'as-needed',
requirePragma: false,
semi: false,
semi: true,
singleQuote: true,
tabWidth: 2,
trailingComma: 'all',
Expand Down
4 changes: 2 additions & 2 deletions import.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @see https://github.com/eslint/eslint/issues/3458
* @see https://www.npmjs.com/package/@rushstack/eslint-patch
*/
require('@rushstack/eslint-patch/modern-module-resolution')
require('@rushstack/eslint-patch/modern-module-resolution');

module.exports = {
env: {
Expand Down Expand Up @@ -87,4 +87,4 @@ module.exports = {
},
},
],
}
};
15 changes: 9 additions & 6 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
const fs = require('fs')
const path = require('path')
const { warn } = require('console');
const fs = require('fs');
const path = require('path');

/**
* @see https://github.com/eslint/eslint/issues/3458
* @see https://www.npmjs.com/package/@rushstack/eslint-patch
*/
require('@rushstack/eslint-patch/modern-module-resolution')
require('@rushstack/eslint-patch/modern-module-resolution');

const tsConfig = fs.existsSync('tsconfig.json')
? path.resolve('tsconfig.json')
: fs.existsSync('types/tsconfig.json')
? path.resolve('types/tsconfig.json')
: undefined
? path.resolve('types/tsconfig.json')
: undefined;

module.exports = {
env: {
Expand All @@ -21,7 +22,9 @@ module.exports = {
},
extends: ['prettier', './import.js'],
rules: {
'indent': ['error', 2],
'semi': 'warn',
'quotes': ['error', 'single'],
'accessor-pairs': 'error',
'array-callback-return': 'error',
'arrow-body-style': 'off',
Expand Down Expand Up @@ -432,4 +435,4 @@ module.exports = {
},
},
],
}
};
98 changes: 49 additions & 49 deletions jest.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
const readPkgUp = require('read-pkg-up')
const readPkgUp = require('read-pkg-up');

/**
* @see https://github.com/eslint/eslint/issues/3458
* @see https://www.npmjs.com/package/@rushstack/eslint-patch
*/
require('@rushstack/eslint-patch/modern-module-resolution')
require('@rushstack/eslint-patch/modern-module-resolution');

let hasJestDom = false
let hasTestingLibrary = false
let hasJestDom = false;
let hasTestingLibrary = false;

try {
const {packageJson} = readPkgUp.sync({normalize: true})
const {packageJson} = readPkgUp.sync({normalize: true});
const allDeps = Object.keys({
...packageJson.peerDependencies,
...packageJson.devDependencies,
...packageJson.dependencies,
})
});

hasJestDom = allDeps.includes('@testing-library/jest-dom')
hasJestDom = allDeps.includes('@testing-library/jest-dom');
hasTestingLibrary = [
'@testing-library/dom',
'@testing-library/react',
'@testing-library/angular',
'@testing-library/vue',
].some(dependency => allDeps.includes(dependency))
].some(dependency => allDeps.includes(dependency));
} catch (error) {
// ignore error
}
Expand Down Expand Up @@ -101,50 +101,50 @@ module.exports = {

...(hasJestDom
? {
'jest-dom/prefer-checked': 'error',
'jest-dom/prefer-empty': 'error',
'jest-dom/prefer-enabled-disabled': 'error',
'jest-dom/prefer-focus': 'error',
'jest-dom/prefer-in-document': 'error',
'jest-dom/prefer-required': 'error',
'jest-dom/prefer-to-have-attribute': 'error',
'jest-dom/prefer-to-have-class': 'error',
'jest-dom/prefer-to-have-style': 'error',
'jest-dom/prefer-to-have-text-content': 'error',
'jest-dom/prefer-to-have-value': 'error',
}
'jest-dom/prefer-checked': 'error',
'jest-dom/prefer-empty': 'error',
'jest-dom/prefer-enabled-disabled': 'error',
'jest-dom/prefer-focus': 'error',
'jest-dom/prefer-in-document': 'error',
'jest-dom/prefer-required': 'error',
'jest-dom/prefer-to-have-attribute': 'error',
'jest-dom/prefer-to-have-class': 'error',
'jest-dom/prefer-to-have-style': 'error',
'jest-dom/prefer-to-have-text-content': 'error',
'jest-dom/prefer-to-have-value': 'error',
}
: null),

...(hasTestingLibrary
? {
'testing-library/await-async-query': 'error',
'testing-library/await-async-utils': 'error',
'testing-library/await-fire-event': 'off',
'testing-library/consistent-data-testid': 'off',
'testing-library/no-await-sync-events': 'error',
'testing-library/no-await-sync-query': 'error',
'testing-library/no-container': 'error',
'testing-library/no-debugging-utils': 'error',
'testing-library/no-dom-import': ['error', 'react'],
'testing-library/no-global-regexp-flag-in-query': 'error',
'testing-library/no-manual-cleanup': 'error',
'testing-library/no-node-access': 'error',
'testing-library/no-promise-in-fire-event': 'error',
'testing-library/no-render-in-setup': 'error',
'testing-library/no-unnecessary-act': 'error',
'testing-library/no-wait-for-empty-callback': 'error',
'testing-library/no-wait-for-multiple-assertions': 'error',
'testing-library/no-wait-for-side-effects': 'error',
'testing-library/no-wait-for-snapshot': 'error',
'testing-library/prefer-explicit-assert': 'warn',
'testing-library/prefer-find-by': 'error',
'testing-library/prefer-presence-queries': 'error',
'testing-library/prefer-query-by-disappearance': 'error',
'testing-library/prefer-screen-queries': 'error',
'testing-library/prefer-user-event': 'error',
'testing-library/prefer-wait-for': 'error',
'testing-library/render-result-naming-convention': 'error',
}
'testing-library/await-async-query': 'error',
'testing-library/await-async-utils': 'error',
'testing-library/await-fire-event': 'off',
'testing-library/consistent-data-testid': 'off',
'testing-library/no-await-sync-events': 'error',
'testing-library/no-await-sync-query': 'error',
'testing-library/no-container': 'error',
'testing-library/no-debugging-utils': 'error',
'testing-library/no-dom-import': ['error', 'react'],
'testing-library/no-global-regexp-flag-in-query': 'error',
'testing-library/no-manual-cleanup': 'error',
'testing-library/no-node-access': 'error',
'testing-library/no-promise-in-fire-event': 'error',
'testing-library/no-render-in-setup': 'error',
'testing-library/no-unnecessary-act': 'error',
'testing-library/no-wait-for-empty-callback': 'error',
'testing-library/no-wait-for-multiple-assertions': 'error',
'testing-library/no-wait-for-side-effects': 'error',
'testing-library/no-wait-for-snapshot': 'error',
'testing-library/prefer-explicit-assert': 'warn',
'testing-library/prefer-find-by': 'error',
'testing-library/prefer-presence-queries': 'error',
'testing-library/prefer-query-by-disappearance': 'error',
'testing-library/prefer-screen-queries': 'error',
'testing-library/prefer-user-event': 'error',
'testing-library/prefer-wait-for': 'error',
'testing-library/render-result-naming-convention': 'error',
}
: null),
},
},
Expand All @@ -156,4 +156,4 @@ module.exports = {
},
},
],
}
};
4 changes: 2 additions & 2 deletions jsx-a11y.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @see https://github.com/eslint/eslint/issues/3458
* @see https://www.npmjs.com/package/@rushstack/eslint-patch
*/
require('@rushstack/eslint-patch/modern-module-resolution')
require('@rushstack/eslint-patch/modern-module-resolution');

module.exports = {
env: {
Expand Down Expand Up @@ -54,4 +54,4 @@ module.exports = {
'jsx-a11y/scope': 'error',
'jsx-a11y/tabindex-no-positive': 'warn',
},
}
};

0 comments on commit ed4e2b3

Please sign in to comment.