Skip to content

Commit f20d56c

Browse files
committed
ci: try to fix test error on CI due to glob
1 parent 33696a8 commit f20d56c

File tree

6 files changed

+24
-55
lines changed

6 files changed

+24
-55
lines changed

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { js, md, mdx } = require('@1stg/eslint-config/overrides')
22

33
module.exports = {
4-
extends: ['@1stg'],
4+
extends: ['@1stg', 'plugin:import/typescript'],
55
overrides: [js, md, mdx],
66
rules: {
77
'node/no-unsupported-features/es-syntax': 0,

.github/workflows/nodejs.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ jobs:
2424
yarn --frozen-lockfile
2525
yarn lint
2626
yarn build
27-
yarn test
27+
yarn eslint -f friendly tests/**/*.{ts,tsx}
2828
env:
2929
CI: true
30+
EFF_NO_LINK_RULES: true
3031

3132
# codecov:
3233
# runs-on: macOS-latest

.travis.yml

-34
This file was deleted.

package.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
],
1919
"scripts": {
2020
"build": "rimraf lib && tsc -b src && r",
21-
"lint": "cross-env EFF_NO_LINK_RULES=true eslint . --ext md,js,ts -f friendly --ignore-pattern tests",
21+
"lint": "eslint --ext md,js,ts -f friendly --ignore-pattern tests .",
2222
"pretest": "r",
23-
"test": "cross-env EFF_NO_LINK_RULES=true eslint tests/**/*.{ts,tsx} -f friendly",
23+
"test": "eslint -f friendly tests/**/*.{ts,tsx}",
2424
"type-coverage": "type-coverage --cache --ignore-catch --detail --strict"
2525
},
2626
"keywords": [
@@ -39,11 +39,11 @@
3939
"glob": "^7.1.4",
4040
"is-glob": "^4.0.1",
4141
"resolve": "^1.12.0",
42-
"tsconfig-paths": "^3.8.0"
42+
"tsconfig-paths": "^3.9.0"
4343
},
4444
"devDependencies": {
4545
"@1stg/babel-preset": "^0.6.1",
46-
"@1stg/eslint-config": "^0.9.3",
46+
"@1stg/eslint-config": "^0.10.0",
4747
"@1stg/husky-config": "^0.3.0",
4848
"@1stg/lint-staged": "^0.6.0",
4949
"@1stg/prettier-config": "^0.2.0",
@@ -58,7 +58,6 @@
5858
"@types/node": "^12.7.5",
5959
"@types/resolve": "^0.0.8",
6060
"@types/unist": "^2.0.3",
61-
"cross-env": "^5.2.1",
6261
"dummy.js": "link:dummy.js",
6362
"eslint": "^6.3.0",
6463
"eslint-formatter-friendly": "^7.0.0",

src/.eslintrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ const { ts } = require('@1stg/eslint-config/overrides')
33
module.exports = {
44
extends: '@1stg',
55
overrides: [
6+
...ts,
67
{
7-
...ts,
8+
files: '*.ts',
89
rules: {
9-
...ts.rules,
1010
'@typescript-eslint/no-use-before-define': [
1111
2,
1212
{

yarn.lock

+15-12
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
babel-plugin-transform-react-remove-prop-types "^0.4.24"
1717
babel-preset-proposal-typescript "^1.4.1"
1818

19-
"@1stg/eslint-config@^0.9.3":
20-
version "0.9.3"
21-
resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-0.9.3.tgz#3ea65b9b925ea22ae2e95495ca9795bbeedebdfe"
22-
integrity sha512-FXtibhcRo7gfO3rpksPykHm9yCPcKz8iiVm6v8eCdxQD4/d9bGMOOlsujLRlo/2Y0APC1MeUfRd44J5h+wRODg==
19+
"@1stg/eslint-config@^0.10.0":
20+
version "0.10.0"
21+
resolved "https://registry.yarnpkg.com/@1stg/eslint-config/-/eslint-config-0.10.0.tgz#e0a5edb2a1a903869fad2e0bea40c051f47cd0eb"
22+
integrity sha512-y1MPpExHlZel/cIhKDwn1p8hgc5nrOQGZ3cMh5QRxDeAr747Ot9LsoydbrtLGgYRANHNMMW7Gf1KNLKLJpIL2A==
2323
dependencies:
2424
"@typescript-eslint/eslint-plugin" "^2.2.0"
2525
"@typescript-eslint/eslint-plugin-tslint" "^2.2.0"
@@ -2083,13 +2083,6 @@ cosmiconfig@^5.2.0, cosmiconfig@^5.2.1:
20832083
js-yaml "^3.13.1"
20842084
parse-json "^4.0.0"
20852085

2086-
cross-env@^5.2.1:
2087-
version "5.2.1"
2088-
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.1.tgz#b2c76c1ca7add66dc874d11798466094f551b34d"
2089-
integrity sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==
2090-
dependencies:
2091-
cross-spawn "^6.0.5"
2092-
20932086
cross-spawn@^6.0.0, cross-spawn@^6.0.5:
20942087
version "6.0.5"
20952088
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -5518,7 +5511,7 @@ ts-lib-utils@^2.2.0:
55185511
glob "7"
55195512
tslib "1"
55205513

5521-
tsconfig-paths@^3.6.0, tsconfig-paths@^3.8.0:
5514+
tsconfig-paths@^3.6.0:
55225515
version "3.8.0"
55235516
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.8.0.tgz#4e34202d5b41958f269cf56b01ed95b853d59f72"
55245517
integrity sha512-zZEYFo4sjORK8W58ENkRn9s+HmQFkkwydDG7My5s/fnfr2YYCaiyXe/HBUcIgU8epEKOXwiahOO+KZYjiXlWyQ==
@@ -5529,6 +5522,16 @@ tsconfig-paths@^3.6.0, tsconfig-paths@^3.8.0:
55295522
minimist "^1.2.0"
55305523
strip-bom "^3.0.0"
55315524

5525+
tsconfig-paths@^3.9.0:
5526+
version "3.9.0"
5527+
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
5528+
integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
5529+
dependencies:
5530+
"@types/json5" "^0.0.29"
5531+
json5 "^1.0.1"
5532+
minimist "^1.2.0"
5533+
strip-bom "^3.0.0"
5534+
55325535
tslib@1, tslib@^1.8.1, tslib@^1.9.0:
55335536
version "1.10.0"
55345537
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"

0 commit comments

Comments
 (0)