xo 0.52.1 → 0.52.2

package/lib/options-manager.js

@@ -28,7 +28,7 @@ import {
 	CACHE_DIR_NAME,
 } from './constants.js';
 
-const {__dirname, readJson, require} = createEsmUtils(import.meta);
+const {__dirname, require} = createEsmUtils(import.meta);
 const {normalizePackageName} = Legacy.naming;
 const resolveModule = Legacy.ModuleResolver.resolve;
 
@@ -162,7 +162,7 @@ const handleTSConfig = async options => {
 
 	if (tsConfigProjectPath) {
 		options.tsConfigPath = path.resolve(options.cwd, tsConfigProjectPath);
-		options.tsConfig = await readJson(options.tsConfigPath);
+		options.tsConfig = JSON5.parse(await fs.readFile(options.tsConfigPath));
 	} else {
 		const tsConfigExplorer = cosmiconfig([], {
 			searchPlaces: ['tsconfig.json'],
@@ -644,9 +644,22 @@ async function recursiveBuildTsConfig(tsConfig, tsConfigPath) {
 	}
 
 	// If any of the following are missing, then we need to look up the base config as it could apply
-	// Use node resolution
 	const require = createRequire(tsConfigPath);
-	const basePath = require.resolve(tsConfig.extends);
+
+	let basePath;
+	try {
+		basePath = require.resolve(tsConfig.extends);
+	} catch (error) {
+		// Tsconfig resolution is odd, It allows behavior that is not exactly like node resolution
+		// therefore we attempt to smooth this out here with this hack
+		try {
+			basePath = require.resolve(path.join(tsConfig.extends, 'tsconfig.json'));
+		} catch {
+			// Throw the orginal resolution error to let the user know their extends block is invalid
+			throw error;
+		}
+	}
+
 	const baseTsConfig = JSON5.parse(await fs.readFile(basePath));
 
 	delete tsConfig.extends;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xo",
-	"version": "0.52.1",
+	"version": "0.52.2",
 	"description": "JavaScript/TypeScript linter (ESLint wrapper) with great defaults",
 	"license": "MIT",
 	"repository": "xojs/xo",