Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c480eab

Browse files
bradzacherbradzacher
authored
This reverts commit 508bb41.
1 parent 508bb41 commit c480eab

File tree

22 files changed

+108
-333
lines changed

22 files changed

+108
-333
lines changed

‎.eslintrc.js

Lines changed: 0 additions & 173 deletions
This file was deleted.

‎.eslintrc.json

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
"root": true,
3+
"plugins": ["eslint-plugin", "@typescript-eslint", "jest"],
4+
"env": {
5+
"es6": true,
6+
"node": true
7+
},
8+
"extends": [
9+
"eslint:recommended",
10+
"plugin:@typescript-eslint/eslint-recommended",
11+
"plugin:@typescript-eslint/recommended"
12+
],
13+
"rules": {
14+
"comma-dangle": ["error", "always-multiline"],
15+
"curly": ["error", "all"],
16+
"no-mixed-operators": "error",
17+
"no-console": "off",
18+
"no-dupe-class-members": "off",
19+
"no-undef": "off",
20+
"@typescript-eslint/indent": "off",
21+
"@typescript-eslint/no-explicit-any": "off",
22+
"@typescript-eslint/no-non-null-assertion": "off",
23+
"@typescript-eslint/explicit-function-return-type": "off",
24+
"@typescript-eslint/explicit-member-accessibility": "off",
25+
"@typescript-eslint/no-var-requires": "off",
26+
"@typescript-eslint/no-use-before-define": "off",
27+
"@typescript-eslint/no-object-literal-type-assertion": "off",
28+
"@typescript-eslint/no-parameter-properties": "off"
29+
},
30+
"parserOptions": {
31+
"sourceType": "module",
32+
"ecmaFeatures": {
33+
"jsx": false
34+
},
35+
"project": "./tsconfig.base.json"
36+
},
37+
"overrides": [
38+
{
39+
"files": [
40+
"packages/eslint-plugin-tslint/tests/**/*.ts",
41+
"packages/eslint-plugin/tests/**/*.test.ts",
42+
"packages/parser/tests/**/*.ts",
43+
"packages/typescript-estree/tests/**/*.ts"
44+
],
45+
"env": {
46+
"jest/globals": true
47+
},
48+
"rules": {
49+
"jest/no-disabled-tests": "warn",
50+
"jest/no-focused-tests": "error",
51+
"jest/no-alias-methods": "error",
52+
"jest/no-identical-title": "error",
53+
"jest/no-jasmine-globals": "error",
54+
"jest/no-jest-import": "error",
55+
"jest/no-test-prefixes": "error",
56+
"jest/no-test-callback": "error",
57+
"jest/no-test-return-statement": "error",
58+
"jest/prefer-to-have-length": "warn",
59+
"jest/prefer-spy-on": "error",
60+
"jest/valid-expect": "error"
61+
}
62+
},
63+
{
64+
"files": [
65+
"packages/eslint-plugin/test/**/*.ts",
66+
"packages/eslint-plugin-tslint/tests/**/*.spec.ts"
67+
],
68+
"rules": {
69+
"eslint-plugin/no-identical-tests": "error"
70+
}
71+
}
72+
]
73+
}

‎package.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,31 @@
4747
"node": ">=6.14.0"
4848
},
4949
"devDependencies": {
50+
"@babel/code-frame": "7.0.0",
51+
"@babel/parser": "7.3.2",
5052
"@commitlint/cli": "^7.1.2",
5153
"@commitlint/config-conventional": "^7.1.2",
5254
"@commitlint/travis-cli": "^7.1.2",
55+
"@types/babel-code-frame": "^6.20.1",
56+
"@types/glob": "^7.1.1",
5357
"@types/jest": "^24.0.6",
58+
"@types/lodash.isplainobject": "^4.0.4",
59+
"@types/lodash.unescape": "^4.0.4",
5460
"@types/node": "^10.12.2",
61+
"@types/semver": "^5.5.0",
5562
"all-contributors-cli": "^6.0.0",
63+
"babel-code-frame": "^6.26.0",
5664
"cz-conventional-changelog": "2.1.0",
5765
"eslint": "^5.12.1",
58-
"eslint-plugin-eslint-comments": "^3.1.1",
5966
"eslint-plugin-eslint-plugin": "^2.0.1",
60-
"eslint-plugin-import": "^2.17.2",
6167
"eslint-plugin-jest": "^22.2.2",
6268
"glob": "7.1.2",
6369
"husky": "^1.3.1",
6470
"isomorphic-fetch": "^2.2.1",
6571
"jest": "24.3.0",
6672
"lerna": "^3.10.5",
6773
"lint-staged": "8.1.0",
74+
"lodash.isplainobject": "4.0.6",
6875
"prettier": "^1.17.0",
6976
"rimraf": "^2.6.3",
7077
"ts-jest": "^24.0.0",

‎packages/eslint-plugin-tslint/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
},
3333
"peerDependencies": {
3434
"eslint": "^5.0.0",
35-
"tslint": "^5.0.0",
36-
"typescript": "*"
35+
"tslint": "^5.0.0"
3736
},
3837
"devDependencies": {
3938
"@types/json-schema": "^7.0.3",

‎packages/eslint-plugin/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@
4444
"tsutils": "^3.7.0"
4545
},
4646
"devDependencies": {
47-
"@typescript-eslint/parser": "1.9.0",
48-
"eslint-docs": "^0.2.6",
49-
"typescript": "*"
47+
"eslint-docs": "^0.2.6"
5048
},
5149
"peerDependencies": {
5250
"@typescript-eslint/parser": "1.9.0",

‎packages/eslint-plugin/src/rules/no-magic-numbers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88
AST_NODE_TYPES,
99
} from '@typescript-eslint/experimental-utils';
1010
import baseRule from 'eslint/lib/rules/no-magic-numbers';
11-
import { JSONSchema4 } from 'json-schema'; // eslint-disable-line import/no-extraneous-dependencies
1211
import * as util from '../util';
12+
import { JSONSchema4 } from 'json-schema';
1313

1414
type Options = util.InferOptionsTypeFromRule<typeof baseRule>;
1515
type MessageIds = util.InferMessageIdsTypeFromRule<typeof baseRule>;

‎packages/eslint-plugin/src/rules/prefer-regexp-exec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { TSESTree } from '@typescript-eslint/experimental-utils';
2-
import { getStaticValue } from 'eslint-utils';
1+
import { TSESTree } from '@typescript-eslint/typescript-estree';
32
import { createRule, getParserServices, getTypeName } from '../util';
3+
import { getStaticValue } from 'eslint-utils';
44

55
export default createRule({
66
name: 'prefer-regexp-exec',

‎packages/eslint-plugin/tools/generate-configs.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable no-console */
2+
13
import { TSESLint } from '@typescript-eslint/experimental-utils';
24
import fs from 'fs';
35
import path from 'path';

‎packages/experimental-utils/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,11 @@
3232
"typecheck": "tsc --noEmit"
3333
},
3434
"dependencies": {
35-
"@types/json-schema": "^7.0.3",
3635
"@typescript-eslint/typescript-estree": "1.9.0",
3736
"eslint-scope": "^4.0.0"
3837
},
3938
"peerDependencies": {
40-
"eslint": "*"
41-
},
42-
"devDependencies": {
39+
"eslint": "*",
4340
"typescript": "*"
4441
}
4542
}

‎packages/experimental-utils/src/ts-eslint/CLIEngine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable @typescript-eslint/no-namespace */
1+
/* eslint-disable @typescript-eslint/no-namespace, no-redeclare */
22

33
import { CLIEngine as ESLintCLIEngine } from 'eslint';
44
import { Linter } from './Linter';

‎packages/experimental-utils/src/ts-eslint/Linter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable @typescript-eslint/no-namespace */
1+
/* eslint-disable @typescript-eslint/no-namespace, no-redeclare */
22

33
import { TSESTree, ParserServices } from '@typescript-eslint/typescript-estree';
44
import { Linter as ESLintLinter } from 'eslint';

‎packages/experimental-utils/src/ts-eslint/Rule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ParserServices, TSESTree } from '@typescript-eslint/typescript-estree';
2-
import { JSONSchema4 } from 'json-schema'; // eslint-disable-line import/no-extraneous-dependencies
2+
import { JSONSchema4 } from 'json-schema';
33
import { AST } from './AST';
44
import { Linter } from './Linter';
55
import { Scope } from './Scope';

‎packages/experimental-utils/src/ts-eslint/SourceCode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable @typescript-eslint/no-namespace */
1+
/* eslint-disable @typescript-eslint/no-namespace, no-redeclare */
22

33
import { ParserServices, TSESTree } from '@typescript-eslint/typescript-estree';
44
import { SourceCode as ESLintSourceCode } from 'eslint';

‎packages/parser/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
"eslint-visitor-keys": "^1.0.0"
4444
},
4545
"devDependencies": {
46-
"@types/glob": "^7.1.1",
47-
"@typescript-eslint/shared-fixtures": "1.9.0",
48-
"glob": "^7.1.4"
46+
"@typescript-eslint/shared-fixtures": "1.9.0"
4947
}
5048
}

‎packages/parser/typings/eslint.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
declare module 'eslint/lib/util/traverser' {
22
import { TSESTree } from '@typescript-eslint/experimental-utils';
3-
43
const traverser: {
54
traverse(
65
node: TSESTree.Node,

0 commit comments

Comments
 (0)