Skip to content

chore: revert 508bb41 #534

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

Merged
merged 1 commit into from
May 16, 2019
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 0 additions & 173 deletions .eslintrc.js

This file was deleted.

73 changes: 73 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
{
"root": true,
"plugins": ["eslint-plugin", "@typescript-eslint", "jest"],
"env": {
"es6": true,
"node": true
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended"
],
"rules": {
"comma-dangle": ["error", "always-multiline"],
"curly": ["error", "all"],
"no-mixed-operators": "error",
"no-console": "off",
"no-dupe-class-members": "off",
"no-undef": "off",
"@typescript-eslint/indent": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-member-accessibility": "off",
"@typescript-eslint/no-var-requires": "off",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/no-object-literal-type-assertion": "off",
"@typescript-eslint/no-parameter-properties": "off"
},
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"jsx": false
},
"project": "./tsconfig.base.json"
},
"overrides": [
{
"files": [
"packages/eslint-plugin-tslint/tests/**/*.ts",
"packages/eslint-plugin/tests/**/*.test.ts",
"packages/parser/tests/**/*.ts",
"packages/typescript-estree/tests/**/*.ts"
],
"env": {
"jest/globals": true
},
"rules": {
"jest/no-disabled-tests": "warn",
"jest/no-focused-tests": "error",
"jest/no-alias-methods": "error",
"jest/no-identical-title": "error",
"jest/no-jasmine-globals": "error",
"jest/no-jest-import": "error",
"jest/no-test-prefixes": "error",
"jest/no-test-callback": "error",
"jest/no-test-return-statement": "error",
"jest/prefer-to-have-length": "warn",
"jest/prefer-spy-on": "error",
"jest/valid-expect": "error"
}
},
{
"files": [
"packages/eslint-plugin/test/**/*.ts",
"packages/eslint-plugin-tslint/tests/**/*.spec.ts"
],
"rules": {
"eslint-plugin/no-identical-tests": "error"
}
}
]
}
11 changes: 9 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,31 @@
"node": ">=6.14.0"
},
"devDependencies": {
"@babel/code-frame": "7.0.0",
"@babel/parser": "7.3.2",
"@commitlint/cli": "^7.1.2",
"@commitlint/config-conventional": "^7.1.2",
"@commitlint/travis-cli": "^7.1.2",
"@types/babel-code-frame": "^6.20.1",
"@types/glob": "^7.1.1",
"@types/jest": "^24.0.6",
"@types/lodash.isplainobject": "^4.0.4",
"@types/lodash.unescape": "^4.0.4",
"@types/node": "^10.12.2",
"@types/semver": "^5.5.0",
"all-contributors-cli": "^6.0.0",
"babel-code-frame": "^6.26.0",
"cz-conventional-changelog": "2.1.0",
"eslint": "^5.12.1",
"eslint-plugin-eslint-comments": "^3.1.1",
"eslint-plugin-eslint-plugin": "^2.0.1",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-jest": "^22.2.2",
"glob": "7.1.2",
"husky": "^1.3.1",
"isomorphic-fetch": "^2.2.1",
"jest": "24.3.0",
"lerna": "^3.10.5",
"lint-staged": "8.1.0",
"lodash.isplainobject": "4.0.6",
"prettier": "^1.17.0",
"rimraf": "^2.6.3",
"ts-jest": "^24.0.0",
Expand Down
3 changes: 1 addition & 2 deletions packages/eslint-plugin-tslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
},
"peerDependencies": {
"eslint": "^5.0.0",
"tslint": "^5.0.0",
"typescript": "*"
"tslint": "^5.0.0"
},
"devDependencies": {
"@types/json-schema": "^7.0.3",
Expand Down
4 changes: 1 addition & 3 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@
"tsutils": "^3.7.0"
},
"devDependencies": {
"@typescript-eslint/parser": "1.9.0",
"eslint-docs": "^0.2.6",
"typescript": "*"
"eslint-docs": "^0.2.6"
},
"peerDependencies": {
"@typescript-eslint/parser": "1.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/src/rules/no-magic-numbers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
AST_NODE_TYPES,
} from '@typescript-eslint/experimental-utils';
import baseRule from 'eslint/lib/rules/no-magic-numbers';
import { JSONSchema4 } from 'json-schema'; // eslint-disable-line import/no-extraneous-dependencies
import * as util from '../util';
import { JSONSchema4 } from 'json-schema';

type Options = util.InferOptionsTypeFromRule<typeof baseRule>;
type MessageIds = util.InferMessageIdsTypeFromRule<typeof baseRule>;
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-plugin/src/rules/prefer-regexp-exec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TSESTree } from '@typescript-eslint/experimental-utils';
import { getStaticValue } from 'eslint-utils';
import { TSESTree } from '@typescript-eslint/typescript-estree';
import { createRule, getParserServices, getTypeName } from '../util';
import { getStaticValue } from 'eslint-utils';

export default createRule({
name: 'prefer-regexp-exec',
Expand Down
2 changes: 2 additions & 0 deletions packages/eslint-plugin/tools/generate-configs.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable no-console */

import { TSESLint } from '@typescript-eslint/experimental-utils';
import fs from 'fs';
import path from 'path';
Expand Down
5 changes: 1 addition & 4 deletions packages/experimental-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,11 @@
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@types/json-schema": "^7.0.3",
"@typescript-eslint/typescript-estree": "1.9.0",
"eslint-scope": "^4.0.0"
},
"peerDependencies": {
"eslint": "*"
},
"devDependencies": {
"eslint": "*",
"typescript": "*"
}
}
2 changes: 1 addition & 1 deletion packages/experimental-utils/src/ts-eslint/CLIEngine.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable @typescript-eslint/no-namespace */
/* eslint-disable @typescript-eslint/no-namespace, no-redeclare */

import { CLIEngine as ESLintCLIEngine } from 'eslint';
import { Linter } from './Linter';
Expand Down
2 changes: 1 addition & 1 deletion packages/experimental-utils/src/ts-eslint/Linter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable @typescript-eslint/no-namespace */
/* eslint-disable @typescript-eslint/no-namespace, no-redeclare */

import { TSESTree, ParserServices } from '@typescript-eslint/typescript-estree';
import { Linter as ESLintLinter } from 'eslint';
Expand Down
2 changes: 1 addition & 1 deletion packages/experimental-utils/src/ts-eslint/Rule.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ParserServices, TSESTree } from '@typescript-eslint/typescript-estree';
import { JSONSchema4 } from 'json-schema'; // eslint-disable-line import/no-extraneous-dependencies
import { JSONSchema4 } from 'json-schema';
import { AST } from './AST';
import { Linter } from './Linter';
import { Scope } from './Scope';
Expand Down
2 changes: 1 addition & 1 deletion packages/experimental-utils/src/ts-eslint/SourceCode.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable @typescript-eslint/no-namespace */
/* eslint-disable @typescript-eslint/no-namespace, no-redeclare */

import { ParserServices, TSESTree } from '@typescript-eslint/typescript-estree';
import { SourceCode as ESLintSourceCode } from 'eslint';
Expand Down
4 changes: 1 addition & 3 deletions packages/parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
"eslint-visitor-keys": "^1.0.0"
},
"devDependencies": {
"@types/glob": "^7.1.1",
"@typescript-eslint/shared-fixtures": "1.9.0",
"glob": "^7.1.4"
"@typescript-eslint/shared-fixtures": "1.9.0"
}
}
1 change: 0 additions & 1 deletion packages/parser/typings/eslint.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
declare module 'eslint/lib/util/traverser' {
import { TSESTree } from '@typescript-eslint/experimental-utils';

const traverser: {
traverse(
node: TSESTree.Node,
Expand Down
Loading