Skip to content

Commit 4b57a07

Browse files
authored
Merge branch 'master' into backwardok-fully-deprecate-emojis
2 parents 5960043 + 8a0e43c commit 4b57a07

File tree

4 files changed

+26
-82
lines changed

4 files changed

+26
-82
lines changed

.github/workflows/node-4+.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,16 @@ jobs:
6565

6666
steps:
6767
- uses: actions/checkout@v2
68-
- uses: ljharb/actions/node/run@main
69-
name: 'npm install && npm run tests-only'
68+
with:
69+
fetch-depth: 0
70+
- uses: ljharb/actions/node/install@main
71+
name: 'nvm install ${{ matrix.node-version }} && npm install'
7072
with:
7173
after_install: npm uninstall --no-save eslint-config-airbnb-base && NPM_CONFIG_LEGACY_PEER_DEPS=true npm install --no-save "eslint@${{ matrix.eslint }}"
7274
node-version: ${{ matrix.node-version }}
73-
command: 'test:ci'
7475
skip-ls-check: true
76+
- run: npm run test:ci
77+
- run: bash <(curl -s https://codecov.io/bash) -f coverage/*.json;
7578

7679
node:
7780
name: 'node 4+'

.github/workflows/node-pretest.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,33 @@ jobs:
88

99
steps:
1010
- uses: actions/checkout@v2
11-
- uses: ljharb/actions/node/run@main
12-
name: 'npm install && npm run lint'
11+
- uses: ljharb/actions/node/install@main
12+
name: 'nvm install lts/* && npm install'
1313
with:
1414
node-version: 'lts/*'
15-
command: 'lint'
1615
skip-ls-check: true
16+
- run: npm run lint
1717

1818
flow:
1919
runs-on: ubuntu-latest
2020

2121
steps:
2222
- uses: actions/checkout@v2
23-
- uses: ljharb/actions/node/run@main
24-
name: 'npm install && npm run flow'
23+
- uses: ljharb/actions/node/install@main
24+
name: 'nvm install lts/* && npm install'
2525
with:
2626
node-version: 'lts/*'
27-
command: 'flow'
2827
skip-ls-check: true
28+
- run: npm run flow
2929

3030
posttest:
3131
runs-on: ubuntu-latest
3232

3333
steps:
3434
- uses: actions/checkout@v2
35-
- uses: ljharb/actions/node/run@main
36-
name: 'npm install && npm run posttest'
35+
- uses: ljharb/actions/node/install@main
36+
name: 'nvm install lts/* && npm install'
3737
with:
3838
node-version: 'lts/*'
39-
command: 'posttest'
4039
skip-ls-check: true
40+
- run: npm run posttest

.travis.yml

-59
This file was deleted.

package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@
3030
"jest": "jest --coverage __tests__/**/*"
3131
},
3232
"devDependencies": {
33-
"@babel/cli": "^7.12.10",
34-
"@babel/core": "^7.12.10",
35-
"@babel/plugin-transform-flow-strip-types": "^7.12.10",
36-
"aud": "^1.1.3",
33+
"@babel/cli": "^7.13.14",
34+
"@babel/core": "^7.13.14",
35+
"@babel/plugin-transform-flow-strip-types": "^7.13.0",
36+
"aud": "^1.1.4",
3737
"babel-eslint": "^10.1.0",
3838
"babel-jest": "^24.9.0",
3939
"babel-preset-airbnb": "^5.0.0",
4040
"eslint": "^3 || ^4 || ^5 || ^6 || ^7",
4141
"eslint-config-airbnb-base": "^14.2.1",
42-
"eslint-plugin-flowtype": "^5.2.0",
42+
"eslint-plugin-flowtype": "^5.4.0",
4343
"eslint-plugin-import": "^2.22.1",
4444
"estraverse": "^5.2.0",
4545
"expect": "^24.9.0",
46-
"flow-bin": "^0.113.0",
46+
"flow-bin": "^0.147.0",
4747
"in-publish": "^2.0.1",
4848
"jest": "^24.9.0",
49-
"jscodeshift": "^0.7.0",
49+
"jscodeshift": "^0.7.1",
5050
"minimist": "^1.2.5",
5151
"object.assign": "^4.1.2",
5252
"rimraf": "^3.0.2",
@@ -58,14 +58,14 @@
5858
},
5959
"license": "MIT",
6060
"dependencies": {
61-
"@babel/runtime": "^7.12.5",
61+
"@babel/runtime": "^7.13.10",
6262
"aria-query": "^4.2.2",
63-
"array-includes": "^3.1.2",
63+
"array-includes": "^3.1.3",
6464
"ast-types-flow": "^0.0.7",
65-
"axe-core": "^4.1.1",
65+
"axe-core": "^4.1.3",
6666
"axobject-query": "^2.2.0",
6767
"damerau-levenshtein": "^1.0.6",
68-
"emoji-regex": "^9.2.0",
68+
"emoji-regex": "^9.2.2",
6969
"has": "^1.0.3",
7070
"jsx-ast-utils": "^3.2.0",
7171
"language-tags": "^1.0.5",

0 commit comments

Comments
 (0)