Merge remote-tracking branch 'upstream/master' into chore/merge

Author: JounQin

README.md

@@ -1,13 +1,13 @@
-# eslint-import-resolver-ts
+# eslint-import-resolver-typescript
 
-[![GitHub Actions](https://github.com/rx-ts/eslint-import-resolver-ts/workflows/Node%20CI/badge.svg)](https://github.com/rx-ts/eslint-import-resolver-ts/actions)
-[![type-coverage](https://img.shields.io/badge/dynamic/json.svg?label=type-coverage&prefix=%E2%89%A5&suffix=%&query=$.typeCoverage.atLeast&uri=https%3A%2F%2Fraw.githubusercontent.com%2Frx-ts%2Feslint-import-resolver-ts%2Fmaster%2Fpackage.json)](https://github.com/plantain-00/type-coverage)
-[![npm](https://img.shields.io/npm/v/eslint-import-resolver-ts.svg)](https://www.npmjs.com/package/eslint-import-resolver-ts)
-[![GitHub Release](https://img.shields.io/github/release/rx-ts/eslint-import-resolver-ts)](https://github.com/rx-ts/eslint-import-resolver-ts/releases)
+[![GitHub Actions](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/workflows/Node%20CI/badge.svg)](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/actions)
+[![type-coverage](https://img.shields.io/badge/dynamic/json.svg?label=type-coverage&prefix=%E2%89%A5&suffix=%&query=$.typeCoverage.atLeast&uri=https%3A%2F%2Fraw.githubusercontent.com%2Falexgorbatchev%2Feslint-import-resolver-typescript%2Fmaster%2Fpackage.json)](https://github.com/plantain-00/type-coverage)
+[![npm](https://img.shields.io/npm/v/eslint-import-resolver-typescript.svg)](https://www.npmjs.com/package/eslint-import-resolver-typescript)
+[![GitHub Release](https://img.shields.io/github/release/alexgorbatchev/eslint-import-resolver-typescript)](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/releases)
 
-[![David Peer](https://img.shields.io/david/peer/rx-ts/eslint-import-resolver-ts.svg)](https://david-dm.org/rx-ts/eslint-import-resolver-ts?type=peer)
-[![David](https://img.shields.io/david/rx-ts/eslint-import-resolver-ts.svg)](https://david-dm.org/rx-ts/eslint-import-resolver-ts)
-[![David Dev](https://img.shields.io/david/dev/rx-ts/eslint-import-resolver-ts.svg)](https://david-dm.org/rx-ts/eslint-import-resolver-ts?type=dev)
+[![David Peer](https://img.shields.io/david/peer/alexgorbatchev/eslint-import-resolver-typescript.svg)](https://david-dm.org/alexgorbatchev/eslint-import-resolver-typescript?type=peer)
+[![David](https://img.shields.io/david/alexgorbatchev/eslint-import-resolver-typescript.svg)](https://david-dm.org/alexgorbatchev/eslint-import-resolver-typescript)
+[![David Dev](https://img.shields.io/david/dev/alexgorbatchev/eslint-import-resolver-typescript.svg)](https://david-dm.org/alexgorbatchev/eslint-import-resolver-typescript?type=dev)
 
 [![Conventional Commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
 [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
@@ -33,10 +33,10 @@ This means you can:
 
 ```sh
 # npm
-npm i -D eslint-plugin-import @typescript-eslint/parser eslint-import-resolver-ts
+npm i -D eslint-plugin-import @typescript-eslint/parser eslint-import-resolver-typescript
 
 # yarn
-yarn add -D eslint-plugin-import @typescript-eslint/parser eslint-import-resolver-ts
+yarn add -D eslint-plugin-import @typescript-eslint/parser eslint-import-resolver-typescript
 ```
 
 ## Configuration
@@ -56,32 +56,32 @@ Add the following to your `.eslintrc` config:
     },
     "import/resolver": {
       // use <root>/tsconfig.json
-      "ts": {
+      "typescript": {
         "alwaysTryTypes": true // always try to resolve types under `<roo/>@types` directory even it doesn't contain any source code, like `@types/unist`
       },
 
       // use <root>/path/to/folder/tsconfig.json
-      "ts": {
+      "typescript": {
         "directory": "./path/to/folder"
       },
 
       // Multiple tsconfigs (Useful for monorepos)
 
       // use a glob pattern
-      "ts": {
+      "typescript": {
         "directory": "./packages/*/tsconfig.json"
       },
 
       // use an array
-      "ts": {
+      "typescript": {
         "directory": [
           "./packages/module-a/tsconfig.json",
           "./packages/module-b/tsconfig.json"
         ]
       },
 
       // use an array of glob patterns
-      "ts": {
+      "typescript": {
         "directory": [
           "./packages/*/tsconfig.json",
           "./other-packages/*/tsconfig.json"
@@ -99,6 +99,6 @@ Add the following to your `.eslintrc` config:
 - Make sure that `yarn lint` passes without conflicts.
 - Make sure your code changes match our [type-coverage](https://github.com/plantain-00/type-coverage) settings: `yarn type-coverage`.
 
-We have [GitHub Actions](https://github.com/rx-ts/eslint-import-resolver-ts/actions) which will run the above commands on your PRs.
+We have [GitHub Actions](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/actions) which will run the above commands on your PRs.
 
 If either fails, we won't be able to merge your PR until it's fixed.

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "eslint-import-resolver-ts",
-  "version": "0.4.0",
+  "name": "eslint-import-resolver-typescript",
+  "version": "2.0.0",
   "description": "TypeScript .ts .tsx module resolver for `eslint-plugin-import`.",
   "repository": "git@github.com/rx-ts/eslint-import-resolver-ts.git",
   "author": "Alex Gorbatchev <alex.gorbatchev@gmail.com>",
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build:ts": "tsc -b src",
-    "build:bundle": "r --externals tiny-glob/sync",
+    "build:bundle": "r",
     "build": "run-p build:*",
     "lint": "eslint --ext md,js,ts -f friendly --ignore-pattern tests .",
     "test": "eslint -f friendly tests/**/*.{ts,tsx}",
@@ -50,7 +50,7 @@
     "@1stg/lint-staged": "^0.7.4",
     "@1stg/prettier-config": "^0.2.0",
     "@1stg/remark-config": "^0.2.1",
-    "@1stg/rollup-config": "^0.9.5",
+    "@1stg/rollup-config": "^0.11.4",
     "@1stg/tsconfig": "^0.5.1",
     "@babel/core": "^7.6.0",
     "@commitlint/cli": "^8.2.0",
@@ -61,6 +61,7 @@
     "@types/unist": "^2.0.3",
     "dummy.js": "link:dummy.js",
     "eslint": "^6.4.0",
+    "eslint-import-resolver-typescript": "link:.",
     "husky": "^3.0.5",
     "lint-staged": "^9.3.0",
     "npm-run-all": "^4.1.5",
@@ -71,7 +72,7 @@
     "typescript": "^3.6.3"
   },
   "resolutions": {
-    "eslint-import-resolver-ts": "link:."
+    "eslint-import-resolver-typescript": "link:."
   },
   "typeCoverage": {
     "atLeast": 100

tests/baseEslintConfig.js

@@ -9,7 +9,7 @@ module.exports = directory => ({
   ],
   settings: {
     'import/resolver': {
-      ts: {
+      typescript: {
         directory,
         alwaysTryTypes: true,
       },