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

chore: backport non-breaking changes from next #607

Merged
merged 6 commits into from
Jun 21, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ module.exports = {
{ blankLine: 'always', prev: 'directive', next: '*' },
{ blankLine: 'any', prev: 'directive', next: 'directive' },
],

// todo: pulled from v3 of @typescript-eslint's eslint-recommended config
'prefer-spread': 'error',
'prefer-rest-params': 'error',
'prefer-const': 'error',
'no-var': 'error',
},
overrides: [
{
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
]
},
"prettier": {
"arrowParens": "avoid",
"endOfLine": "auto",
"proseWrap": "always",
"singleQuote": true,
"trailingComma": "all"
Expand Down
4 changes: 1 addition & 3 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"extends": [
"config:base"
],
"extends": ["config:base"],
"lockFileMaintenance": { "enabled": true },
"rangeStrategy": "replace",
"ignorePresets": ["group:semantic-releaseMonorepo"]
Expand Down
4 changes: 4 additions & 0 deletions src/rules/__tests__/valid-title.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ ruleTester.run('disallowedWords option', rule, {
{ ignoreTypeOfDescribeName: false, disallowedWords: ['correct'] },
],
},
{
code: 'it("correctly sets the value", () => {});',
options: [{ disallowedWords: undefined }],
},
],
invalid: [
{
Expand Down
1 change: 1 addition & 0 deletions src/rules/no-deprecated-functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export default createRule({
},
node,
fix(fixer) {
// eslint-disable-next-line prefer-const
let [name, func] = replacement.split('.');

if (callee.property.type === AST_NODE_TYPES.Literal) {
Expand Down
18 changes: 10 additions & 8 deletions src/rules/prefer-expect-assertions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,21 @@ export default createRule<[], MessageIds>({
}

if (!hasOnlyOneArgument(testFuncFirstLine)) {
const report: TSESLint.ReportDescriptor<MessageIds> = {
messageId: 'assertionsRequiresOneArgument',
loc: testFuncFirstLine.callee.property.loc,
};
let { loc } = testFuncFirstLine.callee.property;
const suggest: TSESLint.ReportSuggestionArray<MessageIds> = [];

if (testFuncFirstLine.arguments.length) {
report.loc = testFuncFirstLine.arguments[1].loc;
report.suggest = [
loc = testFuncFirstLine.arguments[1].loc;
suggest.push(
suggestRemovingExtraArguments(testFuncFirstLine.arguments, 1),
];
);
}

context.report(report);
context.report({
messageId: 'assertionsRequiresOneArgument',
suggest,
loc,
});

return;
}
Expand Down
15 changes: 12 additions & 3 deletions src/rules/valid-title.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,17 @@ const quoteStringValue = (node: StringNode): string =>
? `\`${node.quasis[0].value.raw}\``
: node.raw;

export default createRule({
type MessageIds =
| 'titleMustBeString'
| 'emptyTitle'
| 'duplicatePrefix'
| 'accidentalSpace'
| 'disallowedWord';

export default createRule<
[{ ignoreTypeOfDescribeName?: boolean; disallowedWords?: string[] }],
MessageIds
>({
name: __filename,
meta: {
docs: {
Expand All @@ -64,7 +74,6 @@ export default createRule({
disallowedWords: {
type: 'array',
items: { type: 'string' },
default: [],
},
},
additionalProperties: false,
Expand All @@ -73,7 +82,7 @@ export default createRule({
fixable: 'code',
},
defaultOptions: [{ ignoreTypeOfDescribeName: false, disallowedWords: [] }],
create(context, [{ ignoreTypeOfDescribeName, disallowedWords }]) {
create(context, [{ ignoreTypeOfDescribeName, disallowedWords = [] }]) {
const disallowedWordsRegexp = new RegExp(
`\\b(${disallowedWords.join('|')})\\b`,
'iu',
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "es5",
"target": "es2015",
"module": "commonjs",
"moduleResolution": "node",
"noEmit": true,
Expand Down