From aed7a20f34e886edb27550e766cc89f662e915ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Mon, 30 Aug 2021 10:17:43 +0200 Subject: [PATCH 1/5] [Tests] use `@babel/eslint-parser` instead of `babel-eslint` --- .eslintrc | 2 +- .github/workflows/node-4+.yml | 5 ++++- package.json | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.eslintrc b/.eslintrc index 015177073..b3ebbdc1e 100644 --- a/.eslintrc +++ b/.eslintrc @@ -3,7 +3,7 @@ "airbnb-base", "plugin:flowtype/recommended" ], - parser: "babel-eslint", + parser: "@babel/eslint-parser", plugins: [ "flowtype" ], diff --git a/.github/workflows/node-4+.yml b/.github/workflows/node-4+.yml index 81b2bf0dd..2e2df5e05 100644 --- a/.github/workflows/node-4+.yml +++ b/.github/workflows/node-4+.yml @@ -70,8 +70,11 @@ jobs: fetch-depth: 0 - uses: ljharb/actions/node/install@main name: 'nvm install ${{ matrix.node-version }} && npm install' + env: + NPM_CONFIG_LEGACY_PEER_DEPS: true + NPM_CONFIG_FORCE: ${{ matrix.node-version == 11 && 'true' || 'false' }} with: - after_install: npm uninstall --no-save eslint-config-airbnb-base && NPM_CONFIG_LEGACY_PEER_DEPS=true npm install --no-save "eslint@${{ matrix.eslint }}" + after_install: npm uninstall --no-save eslint-config-airbnb-base && npm install --no-save "eslint@${{ matrix.eslint }}" node-version: ${{ matrix.node-version }} skip-ls-check: true - run: rm __tests__/src/util/getComputedRole-test.js diff --git a/package.json b/package.json index 32722fc0d..252e56d1b 100644 --- a/package.json +++ b/package.json @@ -31,11 +31,11 @@ "jest": "jest --coverage __tests__/**/*" }, "devDependencies": { - "@babel/cli": "^7.14.5", - "@babel/core": "^7.14.6", + "@babel/cli": "^7.14.8", + "@babel/core": "^7.15.0", + "@babel/eslint-parser": "^7.15.0", "@babel/plugin-transform-flow-strip-types": "^7.14.5", "aud": "^1.1.5", - "babel-eslint": "^10.1.0", "babel-jest": "^24.9.0", "babel-preset-airbnb": "^5.0.0", "eslint": "^3 || ^4 || ^5 || ^6 || ^7", From 434c4cf0d152a41ce04ea6d095a21579c868d95b Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Mon, 25 Oct 2021 19:34:56 -0700 Subject: [PATCH 2/5] [Tests] do not test eslint 7 on node 11 --- .github/workflows/node-4+.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/node-4+.yml b/.github/workflows/node-4+.yml index 2e2df5e05..f42f9ef34 100644 --- a/.github/workflows/node-4+.yml +++ b/.github/workflows/node-4+.yml @@ -31,6 +31,8 @@ jobs: - 4 - 3 exclude: + - node-version: 11 + eslint: 7 - node-version: 9 eslint: 7 - node-version: 8 @@ -72,7 +74,6 @@ jobs: name: 'nvm install ${{ matrix.node-version }} && npm install' env: NPM_CONFIG_LEGACY_PEER_DEPS: true - NPM_CONFIG_FORCE: ${{ matrix.node-version == 11 && 'true' || 'false' }} with: after_install: npm uninstall --no-save eslint-config-airbnb-base && npm install --no-save "eslint@${{ matrix.eslint }}" node-version: ${{ matrix.node-version }} From bd1dec61d3f5f7106c306f040bf958b55816aafc Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Mon, 25 Oct 2021 19:40:09 -0700 Subject: [PATCH 3/5] [Dev Deps] update `@babel/cli`, `@babel/core`, `@babel/eslint-parser`, `eslint-plugin-import`, `estraverse`, `safe-publish-latest` --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 252e56d1b..10a5661f2 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ "jest": "jest --coverage __tests__/**/*" }, "devDependencies": { - "@babel/cli": "^7.14.8", - "@babel/core": "^7.15.0", - "@babel/eslint-parser": "^7.15.0", + "@babel/cli": "^7.15.7", + "@babel/core": "^7.15.8", + "@babel/eslint-parser": "^7.15.8", "@babel/plugin-transform-flow-strip-types": "^7.14.5", "aud": "^1.1.5", "babel-jest": "^24.9.0", @@ -41,8 +41,8 @@ "eslint": "^3 || ^4 || ^5 || ^6 || ^7", "eslint-config-airbnb-base": "^14.2.1", "eslint-plugin-flowtype": "^5.8.0", - "eslint-plugin-import": "^2.23.4", - "estraverse": "^5.2.0", + "eslint-plugin-import": "^2.25.2", + "estraverse": "^5.3.0", "expect": "^24.9.0", "flow-bin": "^0.147.0", "in-publish": "^2.0.1", @@ -51,7 +51,7 @@ "minimist": "^1.2.5", "object.assign": "^4.1.2", "rimraf": "^3.0.2", - "safe-publish-latest": "^1.1.4", + "safe-publish-latest": "^2.0.0", "to-ast": "^1.0.0" }, "engines": { From d4a57d86669ad334804d057b35703401fd57c02f Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Mon, 25 Oct 2021 19:41:27 -0700 Subject: [PATCH 4/5] [Deps] update `@babel/runtime`, `array-includes`, `axe-core`, `jsx-ast-utils` --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 10a5661f2..dae4fa957 100644 --- a/package.json +++ b/package.json @@ -59,16 +59,16 @@ }, "license": "MIT", "dependencies": { - "@babel/runtime": "^7.14.6", + "@babel/runtime": "^7.15.4", "aria-query": "^4.2.2", - "array-includes": "^3.1.3", + "array-includes": "^3.1.4", "ast-types-flow": "^0.0.7", - "axe-core": "^4.3.1", + "axe-core": "^4.3.4", "axobject-query": "^2.2.0", "damerau-levenshtein": "^1.0.7", "emoji-regex": "^9.2.2", "has": "^1.0.3", - "jsx-ast-utils": "^3.2.0", + "jsx-ast-utils": "^3.2.1", "language-tags": "^1.0.5", "minimatch": "^3.0.4" }, From ff26b828df4302eaeece00f896d262e1aae1e5eb Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Tue, 26 Oct 2021 14:55:29 -0700 Subject: [PATCH 5/5] [meta] fix prepublish scripts --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dae4fa957..c9b877f88 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "flow": "if [ ! -e ./.flowconfig ]; then echo \"Could not find .flowconfig\"; else flow; test $? -eq 0 -o $? -eq 2; fi", "lint:fix": "npm run lint -- --fix", "lint": "eslint --config .eslintrc src __tests__ __mocks__ scripts", - "prepublish": "safe-publish-latest && not-in-publish || npm run prepublishOnly", - "prepublishOnly": "npm run lint && npm run flow && npm run jest && npm run build", + "prepublish": "not-in-publish || npm run prepublishOnly", + "prepublishOnly": "safe-publish-latest && npm run lint && npm run flow && npm run jest && npm run build", "pretest": "npm run lint:fix && npm run flow", "test": "npm run jest", "posttest": "aud --production",