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",