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.

Sign up for GitHub

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

update dependencies, disable jsx-wrap-multiline #2

Merged
merged 2 commits into from
Sep 11, 2019
Merged

update dependencies, disable jsx-wrap-multiline #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fc3416
update for latest tslint, tslint-react, tslint-consistent-codestyle
falkenhawk Sep 6, 2019
3e0f49a
disabled jsx-wrap-multiline from tslint-react
falkenhawk Sep 6, 2019
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
15 changes: 8 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
"release": "standard-version"
},
"dependencies": {
"tslint-config-airbnb": "^5.11.0",
"tslint-react": "^3.6.0"
"tslint-config-airbnb": "git+https://github.com/ovos/tslint-config-airbnb.git#5.11.1-mod.0",
"tslint-consistent-codestyle": "^1.15.1",
"tslint-react": "^4.0.0"
},
"devDependencies": {
"@types/node": "^10.11.7",
"@types/prettier": "^1.13.2",
"prettier": "^1.14.3",
"tslint": "^5.11.0",
"typescript": "^3.1.2"
"@types/node": "^12.7.4",
"@types/prettier": "^1.18.2",
"prettier": "^1.18.2",
"tslint": "^5.19.0",
"typescript": "^3.6.2"
},
"files": [
"/index.js",
Expand Down
21 changes: 7 additions & 14 deletions tslint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ const rulesReact = tslintReact.rules;

const rules : tslint.Configuration.RawRulesConfig = Object.assign({}, rulesAirbnb, rulesReact, {
// differences from airbnb ruleset
'no-increment-decrement': false,
'prefer-array-literal': [true, {'allow-size-argument': true}],
align: false,
'increment-decrement': false,
Copy link
Contributor

@prk3 prk3 Sep 9, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Confusing. To me it looks like the behavior should change here.

whitespace: [
true,
'check-branch',
Expand Down Expand Up @@ -74,6 +75,10 @@ const rules : tslint.Configuration.RawRulesConfig = Object.assign({}, rulesAirbn
// https://stackoverflow.com/questions/43968779/are-lambda-in-jsx-attributes-an-anti-pattern/43968902#43968902
'jsx-no-lambda': false,
'jsx-boolean-value': false,
// disabled because of false positives and being unmaintained (and being incompatible with prettier)
// https://github.com/palantir/tslint-react/pull/194#issuecomment-478307364
// https://github.com/palantir/tslint-react/issues/79#issuecomment-289923337
'jsx-wrap-multiline': false,

// additions
'no-console': true,
Expand All @@ -95,25 +100,13 @@ const rules : tslint.Configuration.RawRulesConfig = Object.assign({}, rulesAirbn
*/
});

// copy rules to jsRules
// until this is merged https://github.com/palantir/tslint/pull/3641
const jsRules = Object.assign({}, rules);
// delete typescriptOnly rules
delete jsRules['prefer-array-literal'];
delete jsRules['no-function-constructor-with-string-args'];
delete jsRules['no-increment-decrement'];
delete jsRules['no-unused-variable'];
delete jsRules['no-boolean-literal-compare'];
delete jsRules['function-name'];
delete jsRules['import-name'];

const config: tslint.Configuration.RawConfigFile = {
extends: [
'tslint-config-airbnb',
'tslint-react',
],
rules: rules,
jsRules: jsRules,
jsRules: true,
};

export = config;