Merge branch 'master' into pathGroups

# Conflicts:
#	tests/src/rules/order.js

.travis.yml

@@ -65,7 +65,7 @@ matrix:
 
   fast_finish: true
   allow_failures:
-  # issues with typescript deps in this version intersection
+  # issues with TypeScript deps in this version intersection
   - node_js: '4'
     env: ESLINT_VERSION=4
 

CHANGELOG.md

@@ -14,7 +14,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 
 ### Fixed
 - `default`: make error message less confusing ([#1470], thanks [@golopot])
-- Support export of a merged typescript namespace declaration ([#1495], thanks [@benmunro])
+- Support export of a merged TypeScript namespace declaration ([#1495], thanks [@benmunro])
 - [`import/order`]: fix autofix to not move imports across fn calls ([#1253], thanks [@tihonove])
 
 ## [2.18.2] - 2019-07-19
@@ -26,7 +26,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 - Improve parse perf when using `@typescript-eslint/parser` ([#1409], thanks [@bradzacher])
 - [`prefer-default-export`]: don't warn on TypeAlias & TSTypeAliasDeclaration ([#1377], thanks [@sharmilajesupaul])
 - [`no-unused-modules`]: Exclude package "main"/"bin"/"browser" entry points ([#1404], thanks [@rfermann])
-- [`export`]: false positive for typescript overloads ([#1412], thanks [@golopot])
+- [`export`]: false positive for TypeScript overloads ([#1412], thanks [@golopot])
 
 ### Refactors
  - [`no-extraneous-dependencies`], `importType`: remove lodash ([#1419], thanks [@ljharb])
@@ -37,7 +37,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 - Support eslint v6 ([#1393], thanks [@sheepsteak])
 - [`order`]: Adds support for correctly sorting unknown types into a single group ([#1375], thanks [@swernerx])
 - [`order`]: add fixer for destructuring commonjs import ([#1372], thanks [@golopot])
-- typescript config: add TS def extensions + defer to TS over JS ([#1366], thanks [@benmosher])
+- TypeScript config: add TS def extensions + defer to TS over JS ([#1366], thanks [@benmosher])
 
 ### Fixed
 - [`no-unused-modules`]: handle ClassDeclaration ([#1371], thanks [@golopot])
@@ -55,7 +55,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 - [`no-unused-modules`]: make appveyor tests passing ([#1333], thanks [@rfermann])
 - [`named`]: ignore Flow `typeof` imports and `type` exports ([#1345], thanks [@loganfsmyth])
 - [refactor] fix eslint 6 compat by fixing imports (thank [@ljharb])
-- Improve support for Typescript declare structures ([#1356], thanks [@christophercurrie])
+- Improve support for TypeScript declare structures ([#1356], thanks [@christophercurrie])
 
 ### Docs
 - add missing `no-unused-modules` in README ([#1358], thanks [@golopot])
@@ -80,7 +80,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 - [`no-useless-path-segments`]: Add `noUselessIndex` option ([#1290], thanks [@timkraut])
 - [`no-duplicates`]: Add autofix ([#1312], thanks [@lydell])
 - Add [`no-unused-modules`] rule ([#1142], thanks [@rfermann])
-- support export type named exports from typescript ([#1304], thanks [@bradennapier] and [@schmod])
+- support export type named exports from TypeScript ([#1304], thanks [@bradennapier] and [@schmod])
 
 ### Fixed
 - [`order`]: Fix interpreting some external modules being interpreted as internal modules ([#793], [#794] thanks [@ephys])
@@ -89,11 +89,11 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 - [`namespace`]: add check for null ExportMap ([#1235], [#1144], thanks [@ljqx])
 - [ExportMap] fix condition for checking if block comment ([#1234], [#1233], thanks [@ljqx])
 - Fix overwriting of dynamic import() CallExpression ([`no-cycle`], [`no-relative-parent-import`], [`no-unresolved`], [`no-useless-path-segments`]) ([#1218], [#1166], [#1035], thanks [@vikr01])
-- [`export`]: false positives for typescript type + value export ([#1319], thanks [@bradzacher])
-- [`export`]: Support typescript namespaces ([#1320], [#1300], thanks [@bradzacher])
+- [`export`]: false positives for TypeScript type + value export ([#1319], thanks [@bradzacher])
+- [`export`]: Support TypeScript namespaces ([#1320], [#1300], thanks [@bradzacher])
 
 ### Docs
-- Update readme for Typescript ([#1256], [#1277], thanks [@kirill-konshin])
+- Update readme for TypeScript ([#1256], [#1277], thanks [@kirill-konshin])
 - make rule names consistent ([#1112], thanks [@feychenie])
 
 ### Tests

README.md

@@ -152,7 +152,7 @@ rules:
   # etc...
 ```
 
-# Typescript
+# TypeScript
 
 You may use the following shortcut or assemble your own config using the granular settings described below.
 

src/rules/export.js

@@ -3,7 +3,7 @@ import docsUrl from '../docsUrl'
 import includes from 'array-includes'
 
 /*
-Notes on Typescript namespaces aka TSModuleDeclaration:
+Notes on TypeScript namespaces aka TSModuleDeclaration:
 
 There are two forms:
 - active namespaces: namespace Foo {} / module Foo {}
@@ -86,7 +86,7 @@ module.exports = {
         if (node.declaration == null) return
 
         const parent = getParent(node)
-        // support for old typescript versions
+        // support for old TypeScript versions
         const isTypeVariableDecl = node.declaration.kind === 'type'
 
         if (node.declaration.id != null) {

tests/dep-time-travel.sh

@@ -4,13 +4,13 @@
 
 npm install --no-save eslint@$ESLINT_VERSION --ignore-scripts || true
 
-# completely remove the new typescript parser for ESLint < v5
+# completely remove the new TypeScript parser for ESLint < v5
 if [[ "$ESLINT_VERSION" -lt "5" ]]; then
   echo "Removing @typescript-eslint/parser..."
   npm uninstall --no-save @typescript-eslint/parser
 fi
 
-# use these alternate typescript dependencies for ESLint < v4
+# use these alternate TypeScript dependencies for ESLint < v4
 if [[ "$ESLINT_VERSION" -lt "4" ]]; then
   echo "Downgrading babel-eslint..."
   npm i --no-save babel-eslint@8.0.3

tests/src/rules/export.js

@@ -108,7 +108,7 @@ ruleTester.run('export', rule, {
 })
 
 
-context('Typescript', function () {
+context('TypeScript', function () {
   getTSParsers().forEach((parser) => {
     const parserConfig = {
       parser: parser,

tests/src/rules/named.js

@@ -282,7 +282,7 @@ ruleTester.run('named (export *)', rule, {
 })
 
 
-context('Typescript', function () {
+context('TypeScript', function () {
   getTSParsers().forEach((parser) => {
     ['typescript', 'typescript-declare', 'typescript-export-assign', 'typescript-export-assign-merged'].forEach((source) => {
       ruleTester.run(`named`, rule, {

tests/src/rules/no-deprecated.js

@@ -198,7 +198,7 @@ ruleTester.run('no-deprecated: hoisting', rule, {
   ],
 })
 
-describe('Typescript', function () {
+describe('TypeScript', function () {
   getTSParsers().forEach((parser) => {
     const parserConfig = {
       parser: parser,

tests/src/rules/order.js

@@ -164,7 +164,7 @@ ruleTester.run('order', rule, {
         var index = require('./');
       `,
     }),
-    // Add unknown import types (e.g. using an resolver alias via babel) to the groups.
+    // Adding unknown import types (e.g. using a resolver alias via babel) to the groups.
     test({
       code: `
         import fs from 'fs';
@@ -175,7 +175,7 @@ ruleTester.run('order', rule, {
         groups: ['builtin', 'external', 'unknown', 'parent', 'sibling', 'index'],
       }],
     }),
-    // Using unknown import types (e.g. using an resolver alias via babel) with
+    // Using unknown import types (e.g. using a resolver alias via babel) with
     // an alternative custom group list.
     test({
       code: `
@@ -187,7 +187,7 @@ ruleTester.run('order', rule, {
         groups: [ 'unknown', 'builtin', 'external', 'parent', 'sibling', 'index' ],
       }],
     }),
-    // Using unknown import types (e.g. using an resolver alias via babel)
+    // Using unknown import types (e.g. using a resolver alias via babel)
     // Option: newlines-between: 'always'
     test({
       code: `

tests/src/rules/prefer-default-export.js

@@ -142,7 +142,7 @@ ruleTester.run('prefer-default-export', rule, {
   ],
 })
 
-context('Typescript', function() {
+context('TypeScript', function() {
   getNonDefaultParsers().forEach((parser) => {
     const parserConfig = {
       parser: parser,

utils/CHANGELOG.md

@@ -9,7 +9,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
 
 ### Fixed
  - Improve parse perf when using `@typescript-eslint/parser` ([#1409], thanks [@bradzacher])
- - Improve support for Typescript declare structures ([#1356], thanks [@christophercurrie])
+ - Improve support for TypeScript declare structures ([#1356], thanks [@christophercurrie])
 
 ## v2.4.0 - 2019-04-13