chore: use union config, add breaking notice, close #30

Author: JounQin

.eslintrc

@@ -0,0 +1,6 @@
+{
+  "extends": [
+    "plugin:prettier/recommended",
+    "plugin:mdx/recommended"
+  ]
+}

.github/workflows/nodejs.yml

@@ -3,67 +3,60 @@ name: Node CI
 on: [push, pull_request]
 
 jobs:
-  build:
+  default:
     strategy:
       matrix:
-        node: [8.x, 10.x, 12.x]
+        node: [12]
         os: [macOS-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v1
+      - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
-      - name: setup yarn
+      - name: Setup yarn
         run: |
           curl -o- -L https://yarnpkg.com/install.sh | bash
           export PATH="$HOME/.yarn/bin:$PATH"
-      - name: build, lint, test
+      - name: Install Dependencies
+        run: yarn --frozen-lockfile
+
+      - name: Build, Lint and Test
         run: |
-          yarn --frozen-lockfile
           yarn build
           yarn lint
-          yarn eslint -f friendly tests/**/*.{ts,tsx}
+          yarn test
         env:
-          CI: true
-          EFF_NO_LINK_RULES: true
-          PARSER_NO_WATCH: true
-
-  # codecov:
-  #   runs-on: macOS-latest
-  #   needs: build
-  #   steps:
-  #     - name: Report Test Code Coverage
-  #       if: matrix.node == '12.x'
-  #       run: |
-  #         yarn global add codecov codacy-coverage
-  #         codecov
-  #         cat ./coverage/lcov.info | codacy-coverage
-  #       env:
-  #         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          EFF_NO_LINK_RULES: 'true'
+          PARSER_NO_WATCH: 'true'
 
-  deploy:
-    runs-on: macOS-latest
-    needs: build
-    steps:
-      - name: Publish Release and npm Package
-        if: github.event_name == 'push' && github.ref	== 'master' && matrix.node == '12.x'
-        run: bash deploy.sh
+      - name: Codecov
+        if: matrix.os == 'macOS-latest'
+        run: |
+          yarn global add codecov codacy-coverage
+          codecov
+          cat ./coverage/lcov.info | codacy-coverage --username JounQin --projectName babel-preset-proposal-typescript
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_BRANCH: ${{ github.ref }}
-          GH_REPO: ${{ github.repository }}
+          CI: 'true'
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          CODACY_ACCOUNT_TOKEN: ${{ secrets.CODACY_ACCOUNT_TOKEN }}
+          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
 
-  codecheck:
-    runs-on: macOS-latest
-    needs: [build, deploy]
-    steps:
-      - name: Code Check
-        if: matrix.node == '12.x'
+      - name: Code Checks
+        if: matrix.os == 'macOS-latest'
         run: |
-          yarn add -D @codechecks/client @codechecks/build-size-watcher
-          yarn codechecks
+          yarn global add @codechecks/client @codechecks/build-size-watcher
+          codechecks
         env:
+          CI: 'true'
           CC_SECRET: ${{ secrets.CC_SECRET }}
+
+      - name: Publish GitHub Release and npm Package
+        if: matrix.os == 'macOS-latest' && github.event_name == 'push' && github.ref	== 'refs/heads/master'
+        run: bash scripts/deploy.sh
+        env:
+          CI: 'true'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_BRANCH: master
+          GH_REPO: ${{ github.repository }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

README.md

@@ -25,10 +25,17 @@ This means you can:
 
 ## TOC <!-- omit in toc -->
 
+- [Notice](#notice)
 - [Installation](#installation)
 - [Configuration](#configuration)
 - [Contributing](#contributing)
 
+## Notice
+
+After version 2.0.0, `.d.ts` will take higher priority then normal `.js` files on resolving `node_modules` packages in favor of `@types/*` definitions.
+
+If you're facing some problems on rules `import/default` or `import/named` from [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import), do not post any issue here, because they are just working exactly as [expected](https://github.com/alexgorbatchev/eslint-import-resolver-typescript/issues/31#issuecomment-539751607) on our sides, take <https://github.com/benmosher/eslint-plugin-import/issues/1525> as reference or post a new issue to [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) instead.
+
 ## Installation
 
 ```sh
@@ -62,29 +69,29 @@ Add the following to your `.eslintrc` config:
 
       // use <root>/path/to/folder/tsconfig.json
       "typescript": {
-        "directory": "./path/to/folder"
+        "directory": "path/to/folder"
       },
 
       // Multiple tsconfigs (Useful for monorepos)
 
       // use a glob pattern
       "typescript": {
-        "directory": "./packages/*/tsconfig.json"
+        "directory": "packages/*/tsconfig.json"
       },
 
       // use an array
       "typescript": {
         "directory": [
-          "./packages/module-a/tsconfig.json",
-          "./packages/module-b/tsconfig.json"
+          "packages/module-a/tsconfig.json",
+          "packages/module-b/tsconfig.json"
         ]
       },
 
       // use an array of glob patterns
       "typescript": {
         "directory": [
-          "./packages/*/tsconfig.json",
-          "./other-packages/*/tsconfig.json"
+          "packages/*/tsconfig.json",
+          "other-packages/*/tsconfig.json"
         ]
       }
     }

package.json

@@ -28,10 +28,10 @@
     "build:r": "r",
     "build:ts": "tsc -b",
     "lint": "run-p lint:*",
-    "lint:es": "eslint src --ext md,js,ts -f friendly",
+    "lint:es": "cross-env PARSER_NO_WATCH=true eslint src --ext md,js,ts -f friendly",
     "lint:tsc": "tsc --noEmit",
     "pretest": "r",
-    "test": "eslint tests/**/*.{ts,tsx} -f friendly",
+    "test": "cross-env PARSER_NO_WATCH=true eslint tests/**/*.{ts,tsx} -f friendly",
     "type-coverage": "type-coverage --cache --detail --ignore-catch --strict"
   },
   "peerDependencies": {
@@ -46,36 +46,25 @@
     "tsconfig-paths": "^3.9.0"
   },
   "devDependencies": {
-    "@1stg/babel-preset": "^0.7.8",
-    "@1stg/commitlint-config": "^0.1.0",
-    "@1stg/eslint-config": "^0.12.21",
-    "@1stg/husky-config": "^0.3.1",
-    "@1stg/lint-staged": "^0.8.7",
-    "@1stg/prettier-config": "^0.4.2",
-    "@1stg/remark-config": "^0.2.2",
-    "@1stg/tsconfig": "^0.6.0",
-    "@babel/core": "^7.6.4",
-    "@commitlint/cli": "^8.2.0",
-    "@pkgr/rollup": "^0.2.5",
+    "@1stg/lib-config": "^0.1.13",
+    "@pkgr/rollup": "^0.8.2",
     "@types/debug": "^4.1.5",
     "@types/is-glob": "^4.0.1",
-    "@types/node": "^12.11.1",
+    "@types/node": "^12.12.7",
     "@types/resolve": "^0.0.8",
     "@types/unist": "^2.0.3",
     "dummy.js": "link:dummy.js",
-    "eslint": "^6.5.1",
     "eslint-import-resolver-typescript": "link:.",
-    "husky": "^3.0.9",
-    "lint-staged": "^9.4.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^1.18.2",
-    "react": "^16.10.2",
-    "rollup": "^1.24.0",
+    "react": "^16.11.0",
     "type-coverage": "^2.3.0",
-    "typescript": "^3.6.4"
+    "typescript": "^3.7.2"
   },
   "resolutions": {
-    "eslint-import-resolver-typescript": "link:."
+    "@babel/core": "^7.7.2",
+    "eslint-import-resolver-typescript": "link:.",
+    "prettier": "^1.19.1",
+    "rollup": "~1.25.2"
   },
   "typeCoverage": {
     "atLeast": 100

deploy.sh scripts/deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-git remote set-url origin "https://user:$GH_TOKEN@github.com/$GH_REPO.git"
+git remote set-url origin "https://user:$GITHUB_TOKEN@github.com/$GH_REPO.git"
 npm set //registry.npmjs.org/:_authToken "$NPM_TOKEN"
 
 git fetch origin "$GH_BRANCH":"$GH_BRANCH"
@@ -9,8 +9,8 @@ git checkout "$GH_BRANCH"
 PKG_VERSION=$(jq -r '.version' package.json)
 
 git fetch origin v"$PKG_VERSION" || {
-  yarn global add standard-version
-  standard-version -a --release-as "$PKG_VERSION"
-  git push --follow-tags origin "$GH_BRANCH"
-  npm publish
+	yarn global add standard-version
+	standard-version -a --release-as "$PKG_VERSION"
+	git push --follow-tags origin "$GH_BRANCH"
+	npm publish
 }

src/index.ts

@@ -7,7 +7,6 @@ import {
   ConfigLoaderResult,
 } from 'tsconfig-paths'
 import globSync from 'tiny-glob/sync'
-
 import isGlob from 'is-glob'
 import { isCore, sync } from 'resolve'
 import debug from 'debug'