From 994fa6299901036e60ad01e550ac018dce031276 Mon Sep 17 00:00:00 2001 From: Kai Cataldo Date: Thu, 9 Jan 2020 23:01:37 -0500 Subject: [PATCH] add @babel/eslint-shared-fixtures to package.json --- eslint/babel-eslint-parser/package.json | 1 + eslint/babel-eslint-parser/test/babel-eslint-parser.js | 6 ++---- eslint/babel-eslint-parser/test/non-regression.js | 10 ++++------ eslint/babel-eslint-plugin/package.json | 1 + eslint/babel-eslint-plugin/test/helpers/RuleTester.js | 6 ++---- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json index 567a17ff937e..37b5d4e79c85 100644 --- a/eslint/babel-eslint-parser/package.json +++ b/eslint/babel-eslint-parser/package.json @@ -29,6 +29,7 @@ "semver": "^6.3.0" }, "devDependencies": { + "@babel/eslint-shared-fixtures": "0.0.0", "@babel/core": "^7.2.0", "dedent": "^0.7.0", "eslint": "^6.0.1", diff --git a/eslint/babel-eslint-parser/test/babel-eslint-parser.js b/eslint/babel-eslint-parser/test/babel-eslint-parser.js index 9f9720dd0884..3e692340ce59 100644 --- a/eslint/babel-eslint-parser/test/babel-eslint-parser.js +++ b/eslint/babel-eslint-parser/test/babel-eslint-parser.js @@ -1,5 +1,4 @@ import assert from "assert"; -import path from "path"; import espree from "espree"; import escope from "eslint-scope"; import unpad from "dedent"; @@ -7,9 +6,8 @@ import { parseForESLint } from "../src"; import assertImplementsAST from "./helpers/assert-implements-ast"; const babelOptions = { - configFile: path.resolve( - __dirname, - "../../babel-eslint-shared-fixtures/config/babel.config.js", + configFile: require.resolve( + "@babel/eslint-shared-fixtures/config/babel.config.js", ), }; diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js index a449f36a59c7..13524702e335 100644 --- a/eslint/babel-eslint-parser/test/non-regression.js +++ b/eslint/babel-eslint-parser/test/non-regression.js @@ -23,9 +23,8 @@ function verifyAndAssertMessagesWithSpecificESLint( sourceType, requireConfigFile: false, babelOptions: { - configFile: path.resolve( - __dirname, - "../../babel-eslint-shared-fixtures/config/babel.config.js", + configFile: require.resolve( + "@babel/eslint-shared-fixtures/config/babel.config.js", ), }, ...overrideConfig?.parserOptions, @@ -1157,9 +1156,8 @@ describe("verify", () => { parserOptions: { sourceType, babelOptions: { - configFile: path.resolve( - __dirname, - "../../babel-eslint-shared-fixtures/config/babel.config.decorators-legacy.js", + configFile: require.resolve( + "@babel/eslint-shared-fixtures/config/babel.config.decorators-legacy.js", ), }, }, diff --git a/eslint/babel-eslint-plugin/package.json b/eslint/babel-eslint-plugin/package.json index 6901aeff811c..2185d743ccc1 100644 --- a/eslint/babel-eslint-plugin/package.json +++ b/eslint/babel-eslint-plugin/package.json @@ -34,6 +34,7 @@ "eslint-rule-composer": "^0.3.0" }, "devDependencies": { + "@babel/eslint-shared-fixtures": "0.0.0", "@babel/eslint-parser": "0.0.0", "eslint": "^6.0.0", "lodash.clonedeep": "^4.5.0" diff --git a/eslint/babel-eslint-plugin/test/helpers/RuleTester.js b/eslint/babel-eslint-plugin/test/helpers/RuleTester.js index cf25b1ff8849..8a717797ab68 100644 --- a/eslint/babel-eslint-plugin/test/helpers/RuleTester.js +++ b/eslint/babel-eslint-plugin/test/helpers/RuleTester.js @@ -1,13 +1,11 @@ -const path = require("path"); const RuleTester = require("eslint").RuleTester; RuleTester.setDefaultConfig({ parser: require.resolve("@babel/eslint-parser"), parserOptions: { babelOptions: { - configFile: path.resolve( - __dirname, - "../../../babel-eslint-shared-fixtures/config/babel.config.js", + configFile: require.resolve( + "@babel/eslint-shared-fixtures/config/babel.config.js", ), }, },