From 2c2a2adc6de6c9af84d7c528d90e7be462df9fd7 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Tue, 30 Mar 2021 10:40:27 -0700 Subject: [PATCH 1/5] [actions] update to use `node/install` action --- .github/workflows/node-4+.yml | 9 ++++++--- .github/workflows/node-pretest.yml | 18 +++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/node-4+.yml b/.github/workflows/node-4+.yml index d3f85450e..619fb3b21 100644 --- a/.github/workflows/node-4+.yml +++ b/.github/workflows/node-4+.yml @@ -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+' diff --git a/.github/workflows/node-pretest.yml b/.github/workflows/node-pretest.yml index 108ec2ad3..3b5c7caf1 100644 --- a/.github/workflows/node-pretest.yml +++ b/.github/workflows/node-pretest.yml @@ -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 From ce0785fcc35b1d9862f9543750c87eb6dfed9a1b Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Tue, 30 Mar 2021 10:47:37 -0700 Subject: [PATCH 2/5] [Deps] update `@babel/runtime`, `array-includes`, `axe-core`, `emoji-regex` --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index cebde0124..8e78a688a 100644 --- a/package.json +++ b/package.json @@ -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", From 369f9db3f05e96e28a5bdd9d222094e1968cffeb Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Tue, 30 Mar 2021 10:48:52 -0700 Subject: [PATCH 3/5] [Dev Deps] update `@babel/cli`, `@babel/core`, `@babel/plugin-transform-flow-strip-types`, `aud`, `eslint-plugin-flowtype`, `jscodeshift` --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8e78a688a..ec427ce4a 100644 --- a/package.json +++ b/package.json @@ -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", "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", From f88bf6b1e9e6a968e92b50ed508d4dc93a00754e Mon Sep 17 00:00:00 2001 From: odidev Date: Tue, 30 Mar 2021 09:25:27 +0000 Subject: [PATCH 4/5] [Dev Deps] update `flow-bin` to support aarch64 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ec427ce4a..a37e5e6b7 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "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.1", From 8a0e43c579e8a97ca8aed502075be2e33c220f95 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Tue, 30 Mar 2021 11:14:01 -0700 Subject: [PATCH 5/5] [Tests] remove .travis.yml --- .travis.yml | 59 ----------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 94b84fabe..000000000 --- a/.travis.yml +++ /dev/null @@ -1,59 +0,0 @@ -language: node_js -node_js: - - "14" - - "12" - - "10" - - "8" - - "6" - - "4" -cache: - yarn: true - directories: - - node_modules -before_install: - - nvm install-latest-npm - - if [ -n "${ESLINT-}" ]; then npm uninstall --no-save eslint-config-airbnb-base && npm install --no-save "eslint@${ESLINT}"; fi -script: - - if [ "${FLOW-}" = true ]; then npm run flow; fi - - if [ "${LINT-}" = true ]; then npm run lint; fi - - if [ "${TEST-}" = true ]; then npm run test:ci; fi -after_success: - - if [ "${TEST-}" = true ]; then npm run coveralls; fi -sudo: false -branches: - only: - - master -env: - global: - - TEST=true - matrix: - - ESLINT=7 - - ESLINT=6 - - ESLINT=5 - - ESLINT=4 - - ESLINT=3 -matrix: - fast_finish: true - include: - - node_js: "node" - env: FLOW=true TEST=false - - node_js: "node" - env: LINT=true TEST=false - exclude: - - node_js: "4" - env: ESLINT=5 - - node_js: "4" - env: ESLINT=6 - - node_js: "4" - env: ESLINT=7 - - node_js: "6" - env: ESLINT=6 - - node_js: "6" - env: ESLINT=7 - - node_js: "8" - env: ESLINT=7 - allow_failures: - - node_js: "4" - env: ESLINT=4 - - node_js: "4" - env: ESLINT=3