Merge branch 'master' into eslint-plugin-eslint-plugin

jsx-eslint · Oct 28, 2021 · 3c711de · 3c711de
2 parents efc2aaf + ff26b82
commit 3c711de
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git 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
@@ -31,6 +31,8 @@ jobs:
           - 4
           - 3
         exclude:
+          - node-version: 11
+            eslint: 7
           - node-version: 9
             eslint: 7
           - node-version: 8
@@ -70,8 +72,10 @@ 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
         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
@@ -22,28 +22,28 @@
     "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",
     "test:ci": "npm run jest -- --ci --runInBand",
     "jest": "jest --coverage __tests__/**/*"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.5",
-    "@babel/core": "^7.14.6",
+    "@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-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-eslint-plugin": "^4.0.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",
@@ -52,24 +52,24 @@
     "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": {
     "node": ">=4.0"
   },
   "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"
   },