Skip to content

Commit e5e6e6c

Browse files
committed
chore: bump deps, release v2.1.0 - close #52
1 parent f984cef commit e5e6e6c

File tree

6 files changed

+3005
-2509
lines changed

6 files changed

+3005
-2509
lines changed

.github/workflows/nodejs.yml

-10
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,3 @@ jobs:
2626
env:
2727
EFF_NO_LINK_RULES: 'true'
2828
PARSER_NO_WATCH: 'true'
29-
30-
- name: Publish GitHub Release and npm Package
31-
if: matrix.os == 'macOS-latest' && github.event_name == 'push' && github.ref == 'refs/heads/master'
32-
run: bash scripts/deploy.sh
33-
env:
34-
CI: 'true'
35-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36-
GH_BRANCH: master
37-
GH_REPO: ${{ github.repository }}
38-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-import-resolver-typescript",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "TypeScript .ts .tsx module resolver for `eslint-plugin-import`.",
55
"repository": "https://github.com/alexgorbatchev/eslint-import-resolver-typescript",
66
"author": "Alex Gorbatchev <alex.gorbatchev@gmail.com>",
@@ -33,14 +33,16 @@
3333
"lint": "run-p lint:*",
3434
"lint:es": "cross-env PARSER_NO_WATCH=true eslint src --cache --ext md,js,ts -f friendly",
3535
"lint:tsc": "tsc --incremental false --noEmit",
36+
"postinstall": "yarn-deduplicate || exit 0",
3637
"prepublishOnly": "yarn build",
3738
"pretest": "r",
39+
"release": "sh scripts/release.sh",
3840
"test": "run-p test:*",
3941
"test:multipleEslintrcs": "eslint --ext ts,tsx tests/multipleEslintrcs",
4042
"test:multipleTsconfigs": "eslint --ext ts,tsx tests/multipleTsconfigs",
4143
"test:withPaths": "eslint --ext ts,tsx tests/withPaths",
4244
"test:withoutPaths": "eslint --ext ts,tsx tests/withoutPaths",
43-
"type-coverage": "type-coverage --cache --detail --ignore-catch --strict"
45+
"type-coverage": "type-coverage --cache --detail --ignore-catch --strict --update"
4446
},
4547
"peerDependencies": {
4648
"eslint": "*",
@@ -50,28 +52,31 @@
5052
"debug": "^4.1.1",
5153
"glob": "^7.1.6",
5254
"is-glob": "^4.0.1",
53-
"resolve": "^1.15.1",
55+
"resolve": "^1.17.0",
5456
"tsconfig-paths": "^3.9.0"
5557
},
5658
"devDependencies": {
57-
"@1stg/lib-config": "^0.4.5",
59+
"@1stg/lib-config": "^0.5.5",
5860
"@types/debug": "^4.1.5",
59-
"@types/glob": "^7.1.1",
61+
"@types/glob": "^7.1.3",
6062
"@types/is-glob": "^4.0.1",
61-
"@types/node": "^13.11.1",
62-
"@types/resolve": "^1.14.0",
63+
"@types/node": "^14.0.27",
64+
"@types/resolve": "^1.17.1",
6365
"@types/unist": "^2.0.3",
6466
"dummy.js": "link:dummy.js",
6567
"eslint-import-resolver-typescript": "link:.",
6668
"npm-run-all": "^4.1.5",
6769
"react": "^16.13.1",
68-
"type-coverage": "^2.4.2",
69-
"typescript": "^3.8.3"
70+
"standard-version": "^8.0.2",
71+
"type-coverage": "^2.9.0",
72+
"typescript": "^3.9.7",
73+
"yarn-deduplicate": "^2.1.1"
7074
},
7175
"resolutions": {
72-
"eslint-import-resolver-typescript": "link:."
76+
"eslint-import-resolver-typescript": "link:.",
77+
"prettier": "^2.0.5"
7378
},
7479
"typeCoverage": {
75-
"atLeast": 100
80+
"atLeast": 98.73
7681
}
7782
}

scripts/deploy.sh

-16
This file was deleted.

scripts/release.sh

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
3+
PKG_VERSION=$(jq -r '.version' package.json)
4+
5+
git fetch origin v"$PKG_VERSION" || {
6+
yarn standard-version -a --release-as "$PKG_VERSION"
7+
git push --follow-tags origin master
8+
npm publish
9+
}

src/index.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function resolve(
6868
basedir: path.dirname(path.resolve(file)),
6969
packageFilter: options.packageFilter || packageFilterDefault,
7070
})
71-
} catch (err) {
71+
} catch {
7272
foundNodePath = null
7373
}
7474

@@ -156,7 +156,9 @@ function initMappers(options: TsResolverOptions) {
156156
(paths, path) => paths.concat(isGlob(path) ? globSync(path) : path),
157157
[],
158158
)
159+
// eslint-disable-next-line unicorn/no-fn-reference-in-iterator
159160
.map(loadConfig)
161+
// eslint-disable-next-line unicorn/no-fn-reference-in-iterator
160162
.filter(isConfigLoaderSuccessResult)
161163
.map(configLoaderResult => {
162164
const matchPath = createMatchPath(
@@ -167,7 +169,7 @@ function initMappers(options: TsResolverOptions) {
167169
return (source: string, file: string) => {
168170
// exclude files that are not part of the config base url
169171
if (!file.includes(configLoaderResult.absoluteBaseUrl)) {
170-
return undefined
172+
return
171173
}
172174

173175
// look for files based on setup tsconfig "paths"

0 commit comments

Comments
 (0)