Skip to content

Commit

Permalink
Merge branch 'master' into backwardok-fully-deprecate-emojis
Browse files Browse the repository at this point in the history
  • Loading branch information
jessebeach authored Apr 5, 2021
2 parents 5960043 + 8a0e43c commit 4b57a07
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 82 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/node-4+.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,16 @@ jobs:

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

node:
name: 'node 4+'
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/node-pretest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: ljharb/actions/node/run@main
name: 'npm install && npm run lint'
- uses: ljharb/actions/node/install@main
name: 'nvm install lts/* && npm install'
with:
node-version: 'lts/*'
command: 'lint'
skip-ls-check: true
- run: npm run lint

flow:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: ljharb/actions/node/run@main
name: 'npm install && npm run flow'
- uses: ljharb/actions/node/install@main
name: 'nvm install lts/* && npm install'
with:
node-version: 'lts/*'
command: 'flow'
skip-ls-check: true
- run: npm run flow

posttest:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: ljharb/actions/node/run@main
name: 'npm install && npm run posttest'
- uses: ljharb/actions/node/install@main
name: 'nvm install lts/* && npm install'
with:
node-version: 'lts/*'
command: 'posttest'
skip-ls-check: true
- run: npm run posttest
59 changes: 0 additions & 59 deletions .travis.yml

This file was deleted.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@
"jest": "jest --coverage __tests__/**/*"
},
"devDependencies": {
"@babel/cli": "^7.12.10",
"@babel/core": "^7.12.10",
"@babel/plugin-transform-flow-strip-types": "^7.12.10",
"aud": "^1.1.3",
"@babel/cli": "^7.13.14",
"@babel/core": "^7.13.14",
"@babel/plugin-transform-flow-strip-types": "^7.13.0",
"aud": "^1.1.4",
"babel-eslint": "^10.1.0",
"babel-jest": "^24.9.0",
"babel-preset-airbnb": "^5.0.0",
"eslint": "^3 || ^4 || ^5 || ^6 || ^7",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-flowtype": "^5.2.0",
"eslint-plugin-flowtype": "^5.4.0",
"eslint-plugin-import": "^2.22.1",
"estraverse": "^5.2.0",
"expect": "^24.9.0",
"flow-bin": "^0.113.0",
"flow-bin": "^0.147.0",
"in-publish": "^2.0.1",
"jest": "^24.9.0",
"jscodeshift": "^0.7.0",
"jscodeshift": "^0.7.1",
"minimist": "^1.2.5",
"object.assign": "^4.1.2",
"rimraf": "^3.0.2",
Expand All @@ -58,14 +58,14 @@
},
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.12.5",
"@babel/runtime": "^7.13.10",
"aria-query": "^4.2.2",
"array-includes": "^3.1.2",
"array-includes": "^3.1.3",
"ast-types-flow": "^0.0.7",
"axe-core": "^4.1.1",
"axe-core": "^4.1.3",
"axobject-query": "^2.2.0",
"damerau-levenshtein": "^1.0.6",
"emoji-regex": "^9.2.0",
"emoji-regex": "^9.2.2",
"has": "^1.0.3",
"jsx-ast-utils": "^3.2.0",
"language-tags": "^1.0.5",
Expand Down

0 comments on commit 4b57a07

Please sign in to comment.