From c480eabb60a5876f565d00f71240b6a10726f309 Mon Sep 17 00:00:00 2001 From: Brad Zacher Date: Wed, 15 May 2019 20:17:32 -0700 Subject: [PATCH] chore: revert 508bb41 (#534) This reverts commit 508bb41cfebf5aff96841b68b46c30e4b1a42367. --- .eslintrc.js | 173 ------------------ .eslintrc.json | 73 ++++++++ package.json | 11 +- packages/eslint-plugin-tslint/package.json | 3 +- packages/eslint-plugin/package.json | 4 +- .../src/rules/no-magic-numbers.ts | 2 +- .../src/rules/prefer-regexp-exec.ts | 4 +- .../eslint-plugin/tools/generate-configs.ts | 2 + packages/experimental-utils/package.json | 5 +- .../src/ts-eslint/CLIEngine.ts | 2 +- .../src/ts-eslint/Linter.ts | 2 +- .../experimental-utils/src/ts-eslint/Rule.ts | 2 +- .../src/ts-eslint/SourceCode.ts | 2 +- packages/parser/package.json | 4 +- packages/parser/typings/eslint.d.ts | 1 - packages/typescript-estree/package.json | 13 +- .../typescript-estree/src/ast-converter.ts | 2 +- packages/typescript-estree/src/parser.ts | 8 +- .../typescript-estree/src/semantic-errors.ts | 2 +- packages/typescript-estree/tests/lib/parse.ts | 2 +- .../utils/generate-package-json.js | 1 - yarn.lock | 123 +------------ 22 files changed, 108 insertions(+), 333 deletions(-) delete mode 100644 .eslintrc.js create mode 100644 .eslintrc.json diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 84ce4321e0d..00000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,173 +0,0 @@ -module.exports = { - root: true, - plugins: [ - 'eslint-plugin', - '@typescript-eslint', - 'jest', - 'import', - 'eslint-comments', - ], - env: { - es6: true, - node: true, - }, - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/eslint-recommended', - 'plugin:@typescript-eslint/recommended', - ], - rules: { - // - // eslint base - // - - 'comma-dangle': ['error', 'always-multiline'], - curly: ['error', 'all'], - 'no-mixed-operators': 'error', - 'no-console': 'error', - 'no-process-exit': 'error', - - // - // our plugin :D - // - - '@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', - - // - // eslint-plugin-import - // - - // disallow non-import statements appearing before import statements - 'import/first': 'error', - // Require a newline after the last import/require in a group - 'import/newline-after-import': 'error', - // Forbid import of modules using absolute paths - 'import/no-absolute-path': 'error', - // disallow AMD require/define - 'import/no-amd': 'error', - // forbid default exports - 'import/no-default-export': 'error', - // Forbid the use of extraneous packages - 'import/no-extraneous-dependencies': [ - 'error', - { - devDependencies: true, - peerDependencies: true, - optionalDependencies: false, - }, - ], - // Forbid mutable exports - 'import/no-mutable-exports': 'error', - // Prevent importing the default as if it were named - 'import/no-named-default': 'error', - // Prohibit named exports // we want everything to be a named export - 'import/no-named-export': 'off', - // Forbid a module from importing itself - 'import/no-self-import': 'error', - // Require modules with a single export to use a default export // we want everything to be named - 'import/prefer-default-export': 'off', - - // - // eslint-plugin-eslint-comment - // - - // require a eslint-enable comment for every eslint-disable comment - 'eslint-comments/disable-enable-pair': [ - 'error', - { - allowWholeFile: true, - }, - ], - // disallow a eslint-enable comment for multiple eslint-disable comments - 'eslint-comments/no-aggregating-enable': 'error', - // disallow duplicate eslint-disable comments - 'eslint-comments/no-duplicate-disable': 'error', - // disallow eslint-disable comments without rule names - 'eslint-comments/no-unlimited-disable': 'error', - // disallow unused eslint-disable comments - 'eslint-comments/no-unused-disable': 'error', - // disallow unused eslint-enable comments - 'eslint-comments/no-unused-enable': 'error', - // disallow ESLint directive-comments - 'eslint-comments/no-use': [ - 'error', - { - allow: [ - 'eslint-disable', - 'eslint-disable-line', - 'eslint-disable-next-line', - 'eslint-enable', - ], - }, - ], - }, - 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/tests/**/*.test.ts', - 'packages/eslint-plugin-tslint/tests/**/*.spec.ts', - ], - rules: { - 'eslint-plugin/no-identical-tests': 'error', - }, - }, - { - files: [ - 'packages/eslint-plugin/src/rules/**/*.ts', - 'packages/eslint-plugin/src/configs/**/*.ts', - 'packages/eslint-plugin-tslint/src/rules/**/*.ts', - ], - rules: { - // specifically for rules - default exports makes the tooling easier - 'import/no-default-export': 'off', - }, - }, - { - files: ['**/tools/**/*.ts', '**/tests/**/*.ts'], - rules: { - // allow console logs in tools and tests - 'no-console': 'off', - }, - }, - ], -}; diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000000..649b9ec2502 --- /dev/null +++ b/.eslintrc.json @@ -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" + } + } + ] +} diff --git a/package.json b/package.json index b05e48b7fec..8d9760c2c25 100644 --- a/package.json +++ b/package.json @@ -47,17 +47,23 @@ "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", @@ -65,6 +71,7 @@ "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", diff --git a/packages/eslint-plugin-tslint/package.json b/packages/eslint-plugin-tslint/package.json index 9139313a3c3..fba222f6dbf 100644 --- a/packages/eslint-plugin-tslint/package.json +++ b/packages/eslint-plugin-tslint/package.json @@ -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", diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 78ab2e03b26..a52aacc2352 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -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", diff --git a/packages/eslint-plugin/src/rules/no-magic-numbers.ts b/packages/eslint-plugin/src/rules/no-magic-numbers.ts index 75812ffb4d2..49689213992 100644 --- a/packages/eslint-plugin/src/rules/no-magic-numbers.ts +++ b/packages/eslint-plugin/src/rules/no-magic-numbers.ts @@ -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; type MessageIds = util.InferMessageIdsTypeFromRule; diff --git a/packages/eslint-plugin/src/rules/prefer-regexp-exec.ts b/packages/eslint-plugin/src/rules/prefer-regexp-exec.ts index b9f18fe5156..ea4e6742d05 100644 --- a/packages/eslint-plugin/src/rules/prefer-regexp-exec.ts +++ b/packages/eslint-plugin/src/rules/prefer-regexp-exec.ts @@ -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', diff --git a/packages/eslint-plugin/tools/generate-configs.ts b/packages/eslint-plugin/tools/generate-configs.ts index f630428ca2a..9809adc05c7 100644 --- a/packages/eslint-plugin/tools/generate-configs.ts +++ b/packages/eslint-plugin/tools/generate-configs.ts @@ -1,3 +1,5 @@ +/* eslint-disable no-console */ + import { TSESLint } from '@typescript-eslint/experimental-utils'; import fs from 'fs'; import path from 'path'; diff --git a/packages/experimental-utils/package.json b/packages/experimental-utils/package.json index a177f3cc3bc..9d51a32c4fd 100644 --- a/packages/experimental-utils/package.json +++ b/packages/experimental-utils/package.json @@ -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": "*" } } diff --git a/packages/experimental-utils/src/ts-eslint/CLIEngine.ts b/packages/experimental-utils/src/ts-eslint/CLIEngine.ts index 76b3983d370..0a64a3d6734 100644 --- a/packages/experimental-utils/src/ts-eslint/CLIEngine.ts +++ b/packages/experimental-utils/src/ts-eslint/CLIEngine.ts @@ -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'; diff --git a/packages/experimental-utils/src/ts-eslint/Linter.ts b/packages/experimental-utils/src/ts-eslint/Linter.ts index 854b7d46155..dde85a07f2b 100644 --- a/packages/experimental-utils/src/ts-eslint/Linter.ts +++ b/packages/experimental-utils/src/ts-eslint/Linter.ts @@ -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'; diff --git a/packages/experimental-utils/src/ts-eslint/Rule.ts b/packages/experimental-utils/src/ts-eslint/Rule.ts index ebd376caa80..388f64e99fc 100644 --- a/packages/experimental-utils/src/ts-eslint/Rule.ts +++ b/packages/experimental-utils/src/ts-eslint/Rule.ts @@ -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'; diff --git a/packages/experimental-utils/src/ts-eslint/SourceCode.ts b/packages/experimental-utils/src/ts-eslint/SourceCode.ts index ac833116606..2fb2e0b3cab 100644 --- a/packages/experimental-utils/src/ts-eslint/SourceCode.ts +++ b/packages/experimental-utils/src/ts-eslint/SourceCode.ts @@ -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'; diff --git a/packages/parser/package.json b/packages/parser/package.json index 1febddba372..d33fa890f50 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -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" } } diff --git a/packages/parser/typings/eslint.d.ts b/packages/parser/typings/eslint.d.ts index c90febb3c47..15a965cd48d 100644 --- a/packages/parser/typings/eslint.d.ts +++ b/packages/parser/typings/eslint.d.ts @@ -1,6 +1,5 @@ declare module 'eslint/lib/util/traverser' { import { TSESTree } from '@typescript-eslint/experimental-utils'; - const traverser: { traverse( node: TSESTree.Node, diff --git a/packages/typescript-estree/package.json b/packages/typescript-estree/package.json index 9c676a297f1..65b6b41440f 100644 --- a/packages/typescript-estree/package.json +++ b/packages/typescript-estree/package.json @@ -41,18 +41,7 @@ "semver": "5.5.0" }, "devDependencies": { - "@babel/code-frame": "7.0.0", - "@babel/parser": "7.3.2", "@babel/types": "^7.3.2", - "@types/glob": "^7.1.1", - "@types/babel-code-frame": "^6.20.1", - "@types/lodash.unescape": "^4.0.4", - "@types/lodash.isplainobject": "^4.0.4", - "@types/semver": "^5.5.0", - "@typescript-eslint/shared-fixtures": "1.9.0", - "babel-code-frame": "^6.26.0", - "lodash.isplainobject": "4.0.6", - "typescript": "*", - "glob": "^7.1.4" + "@typescript-eslint/shared-fixtures": "1.9.0" } } diff --git a/packages/typescript-estree/src/ast-converter.ts b/packages/typescript-estree/src/ast-converter.ts index 8488fa6f7d8..25d291dee4c 100644 --- a/packages/typescript-estree/src/ast-converter.ts +++ b/packages/typescript-estree/src/ast-converter.ts @@ -4,7 +4,7 @@ import { convertComments } from './convert-comments'; import { convertTokens } from './node-utils'; import { Extra } from './parser-options'; -export function astConverter( +export default function astConverter( ast: SourceFile, extra: Extra, shouldPreserveNodeMaps: boolean, diff --git a/packages/typescript-estree/src/parser.ts b/packages/typescript-estree/src/parser.ts index 389c819d2a0..1a963859d96 100644 --- a/packages/typescript-estree/src/parser.ts +++ b/packages/typescript-estree/src/parser.ts @@ -1,6 +1,6 @@ import semver from 'semver'; import * as ts from 'typescript'; // leave this as * as ts so people using util package don't need syntheticDefaultImports -import { astConverter } from './ast-converter'; +import convert from './ast-converter'; import { convertError } from './convert'; import { firstDefined } from './node-utils'; import { Extra, TSESTreeOptions, ParserServices } from './parser-options'; @@ -50,7 +50,7 @@ function resetExtra(): void { strict: false, jsx: false, useJSXTextNode: false, - log: console.log, // eslint-disable-line no-console + log: console.log, projects: [], errorOnUnknownASTType: false, errorOnTypeScriptSyntacticAndSemanticIssues: false, @@ -339,7 +339,7 @@ export function parse( /** * Convert the TypeScript AST to an ESTree-compatible one */ - const { estree } = astConverter(ast, extra, false); + const { estree } = convert(ast, extra, false); return estree as AST; } @@ -397,7 +397,7 @@ export function parseAndGenerateServices< * Convert the TypeScript AST to an ESTree-compatible one, and optionally preserve * mappings between converted and original AST nodes */ - const { estree, astMaps } = astConverter(ast, extra, shouldPreserveNodeMaps); + const { estree, astMaps } = convert(ast, extra, shouldPreserveNodeMaps); /** * Even if TypeScript parsed the source code ok, and we had no problems converting the AST, * there may be other syntactic or semantic issues in the code that we can optionally report on. diff --git a/packages/typescript-estree/src/semantic-errors.ts b/packages/typescript-estree/src/semantic-errors.ts index c580697a185..f31eb634068 100644 --- a/packages/typescript-estree/src/semantic-errors.ts +++ b/packages/typescript-estree/src/semantic-errors.ts @@ -45,7 +45,7 @@ export function getFirstSemanticOrSyntacticError( * and log a a warning. */ /* istanbul ignore next */ - console.warn(`Warning From TSC: "${e.message}`); // eslint-disable-line no-console + console.warn(`Warning From TSC: "${e.message}`); /* istanbul ignore next */ return undefined; } diff --git a/packages/typescript-estree/tests/lib/parse.ts b/packages/typescript-estree/tests/lib/parse.ts index 3af2a91d327..3c34f705556 100644 --- a/packages/typescript-estree/tests/lib/parse.ts +++ b/packages/typescript-estree/tests/lib/parse.ts @@ -58,7 +58,7 @@ describe('parse()', () => { describe('loggerFn should be propagated to ast-converter', () => { it('output tokens, comments, locs, and ranges when called with those options', () => { - const spy = jest.spyOn(astConverter, 'astConverter'); + const spy = jest.spyOn(astConverter, 'default'); const loggerFn = jest.fn(() => true); diff --git a/tests/integration/utils/generate-package-json.js b/tests/integration/utils/generate-package-json.js index 1f6af28df63..bf173d5e35c 100644 --- a/tests/integration/utils/generate-package-json.js +++ b/tests/integration/utils/generate-package-json.js @@ -1,5 +1,4 @@ const fs = require('fs'); -// eslint-disable-next-line import/no-absolute-path const rootPackageJSON = require('/usr/root-package.json'); /** diff --git a/yarn.lock b/yarn.lock index bba6723622b..4f4a0d81f56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1485,14 +1485,6 @@ array-ify@^1.0.0: resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= -array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -2084,11 +2076,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= -contains-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" - integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= - conventional-changelog-angular@^1.3.3: version "1.6.6" resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f" @@ -2356,7 +2343,7 @@ debug@3.1.0: dependencies: ms "2.0.0" -debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -2531,14 +2518,6 @@ dir-glob@2.0.0: arrify "^1.0.1" path-type "^3.0.0" -doctrine@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" - integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= - dependencies: - esutils "^2.0.2" - isarray "^1.0.0" - doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -2626,7 +2605,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.5.1, es-abstract@^1.7.0: +es-abstract@^1.5.1: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg== @@ -2688,52 +2667,11 @@ eslint-docs@^0.2.6: ora "^3.0.0" read-pkg-up "^4.0.0" -eslint-import-resolver-node@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== - dependencies: - debug "^2.6.9" - resolve "^1.5.0" - -eslint-module-utils@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a" - integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw== - dependencies: - debug "^2.6.8" - pkg-dir "^2.0.0" - -eslint-plugin-eslint-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.1.tgz#32ff0afba8a48e17073817e6d03fbc5622f735b7" - integrity sha512-GZDKhOFqJLKlaABX+kdoLskcTINMrVOWxGca54KcFb1QCPd0CLmqgAMRxkkUfGSmN+5NJUMGh7NGccIMcWPSfQ== - dependencies: - escape-string-regexp "^1.0.5" - ignore "^5.0.5" - eslint-plugin-eslint-plugin@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.0.1.tgz#d275434969dbde3da1d4cb7a121dc8d88457c786" integrity sha512-kJ5TZsRJH/xYstG07v3YeOy/W5SDAEzV+bvvoL0aiG1HtqDmg4mJvNPnn/JngANMmsx8oXlJrIcBTCpJzm+9kg== -eslint-plugin-import@^2.17.2: - version "2.17.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz#d227d5c6dc67eca71eb590d2bb62fb38d86e9fcb" - integrity sha512-m+cSVxM7oLsIpmwNn2WXTJoReOF9f/CtLMo7qOVmKd1KntBy0hEcuNZ3erTmWjx+DxRO0Zcrm5KwAvI9wHcV5g== - dependencies: - array-includes "^3.0.3" - contains-path "^0.1.0" - debug "^2.6.9" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.0" - has "^1.0.3" - lodash "^4.17.11" - minimatch "^3.0.4" - read-pkg-up "^2.0.0" - resolve "^1.10.0" - eslint-plugin-jest@^22.2.2: version "22.5.1" resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.5.1.tgz#a31dfe9f9513c6af7c17ece4c65535a1370f060b" @@ -3372,18 +3310,6 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.4: - version "7.1.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" - integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -3608,11 +3534,6 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.0.5: - version "5.1.1" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.1.tgz#2fc6b8f518aff48fef65a7f348ed85632448e4a5" - integrity sha512-DWjnQIFLenVrwyRCKZT+7a7/U4Cqgar4WG8V++K3hw+lrW1hc/SIwdiGmtxKCVACmHULTuGeBbHJmbwW7/sAvA== - import-fresh@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" @@ -3990,7 +3911,7 @@ is-wsl@^1.1.0: resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: +isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -4770,16 +4691,6 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -5894,13 +5805,6 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= - dependencies: - pify "^2.0.0" - path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -6174,14 +6078,6 @@ read-pkg-up@^1.0.1: find-up "^1.0.0" read-pkg "^1.0.0" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - read-pkg-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" @@ -6207,15 +6103,6 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - read-pkg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" @@ -6442,7 +6329,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@1.x, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0: +resolve@1.x, resolve@^1.10.0, resolve@^1.3.2: version "1.10.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18" integrity sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA== @@ -7303,7 +7190,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@*, "typescript@>=3.2.1 <3.5.0": +"typescript@>=3.2.1 <3.5.0": version "3.4.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99" integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==