Revert "Correctly use ignores config, Lint xo with xo (xojs#584)"

This reverts commit 48baacc.
devinrhode2 · Oct 15, 2021 · 22177d1 · 22177d1
1 parent 823884c
commit 22177d1
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 71 deletions.
diff --git a/index.js b/index.js
@@ -13,6 +13,7 @@ import {
 	getIgnores,
 	mergeWithFileConfig,
 	buildConfig,
+	mergeOptions,
 } from './lib/options-manager.js';
 
 /** Merge multiple reports into a single report */
@@ -151,7 +152,7 @@ const lintFiles = async (patterns, inputOptions = {}) => {
 	inputOptions = normalizeOptions(inputOptions);
 	inputOptions.cwd = path.resolve(inputOptions.cwd || process.cwd());
 
-	const files = await globFiles(patterns, mergeWithFileConfig(inputOptions).options);
+	const files = await globFiles(patterns, mergeOptions(inputOptions));
 
 	const reports = await pMap(
 		files,

diff --git a/lib/options-manager.js b/lib/options-manager.js
@@ -535,13 +535,12 @@ const gatherImportResolvers = options => {
 };
 
 export {
+	findApplicableOverrides,
+	mergeWithPrettierConfig,
 	normalizeOptions,
 	getIgnores,
 	mergeWithFileConfig,
 	buildConfig,
-
-	// For tests
 	applyOverrides,
-	findApplicableOverrides,
-	mergeWithPrettierConfig,
+	mergeOptions,
 };
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
 		"node": ">=12.20"
 	},
 	"scripts": {
-		"test": "node cli.js && nyc ava"
+		"test": "eslint --quiet . --ext .js,.cjs && nyc ava"
 	},
 	"files": [
 		"config",
@@ -104,13 +104,18 @@
 		"temp-write": "^5.0.0",
 		"webpack": "^5.56.0"
 	},
-	"xo": {
-		"ignores": [
-			"test/fixtures",
-			"test/temp",
-			"coverage"
+	"eslintConfig": {
+		"extends": [
+			"eslint-config-xo",
+			"./config/plugins.cjs",
+			"./config/overrides.cjs"
 		]
 	},
+	"eslintIgnore": [
+		"test/fixtures",
+		"test/temp",
+		"coverage"
+	],
 	"ava": {
 		"files": [
 			"!test/temp"

diff --git a/test/fixtures/nested-ignores/a.js b/test/fixtures/nested-ignores/a.js
diff --git a/test/fixtures/nested-ignores/b.js b/test/fixtures/nested-ignores/b.js
diff --git a/test/fixtures/nested-ignores/child/a.js b/test/fixtures/nested-ignores/child/a.js
diff --git a/test/fixtures/nested-ignores/child/b.js b/test/fixtures/nested-ignores/child/b.js
diff --git a/test/fixtures/nested-ignores/child/package.json b/test/fixtures/nested-ignores/child/package.json
diff --git a/test/fixtures/nested-ignores/package.json b/test/fixtures/nested-ignores/package.json
diff --git a/test/ignores.js b/test/ignores.js