add @babel/eslint-shared-fixtures to package.json

babel · Jan 10, 2020 · 994fa62 · 994fa62
1 parent d89cf03
commit 994fa62
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git 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
@@ -1,15 +1,13 @@
 import assert from "assert";
-import path from "path";
 import espree from "espree";
 import escope from "eslint-scope";
 import unpad from "dedent";
 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
@@ -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
@@ -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
@@ -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",
       ),
     },
   },