Fix installing XO on npm 6 by bundling TS-dependent dependencies to a…

…void hoisting (#624)
xojs · Oct 27, 2021 · c9bbfb1 · c9bbfb1
1 parent eefd88a
commit c9bbfb1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -1,3 +1,4 @@
+import {fileURLToPath} from 'node:url';
 import path from 'node:path';
 import {ESLint} from 'eslint';
 import {globby, isGitIgnoredSync} from 'globby';
@@ -26,7 +27,10 @@ const runEslint = async (lint, options) => {
 		return getIgnoredReport(filePath);
 	}
 
-	const eslint = new ESLint(eslintOptions);
+	const eslint = new ESLint({
+		...eslintOptions,
+		resolvePluginsRelativeTo: path.dirname(fileURLToPath(import.meta.url)),
+	});
 
 	if (filePath && await eslint.isPathIgnored(filePath)) {
 		return getIgnoredReport(filePath);

diff --git a/lib/options-manager.js b/lib/options-manager.js
@@ -437,7 +437,7 @@ const mergeWithPrettierConfig = (options, prettierOptions) => {
 
 const buildTSConfig = options => config => {
 	if (options.ts) {
-		config.baseConfig.extends.push('xo-typescript');
+		config.baseConfig.extends.push(require.resolve('eslint-config-xo-typescript'));
 		config.baseConfig.parser = require.resolve('@typescript-eslint/parser');
 		config.baseConfig.parserOptions = {
 			...config.baseConfig.parserOptions,

diff --git a/package.json b/package.json
@@ -51,6 +51,11 @@
 		"javascript",
 		"typescript"
 	],
+	"bundledDependencies": [
+		"@typescript-eslint/eslint-plugin",
+		"@typescript-eslint/parser",
+		"eslint-config-xo-typescript"
+	],
 	"dependencies": {
 		"@eslint/eslintrc": "^1.0.1",
 		"@typescript-eslint/eslint-plugin": "^4.32.0",

diff --git a/test/options-manager.js b/test/options-manager.js
@@ -127,7 +127,7 @@ test('buildConfig: prettier: true, typescript file', t => {
 
 	// eslint-prettier-config must always be last
 	t.is(config.baseConfig.extends[config.baseConfig.extends.length - 1], 'plugin:prettier/recommended');
-	t.is(config.baseConfig.extends[config.baseConfig.extends.length - 2], 'xo-typescript');
+	t.regex(config.baseConfig.extends[config.baseConfig.extends.length - 2], /xo-typescript/);
 
 	// Indent rule is not enabled
 	t.is(config.baseConfig.rules.indent, undefined);
@@ -429,7 +429,7 @@ test('buildConfig: extends', t => {
 test('buildConfig: typescript', t => {
 	const config = manager.buildConfig({ts: true, tsConfigPath: './tsconfig.json'});
 
-	t.is(config.baseConfig.extends[config.baseConfig.extends.length - 1], 'xo-typescript');
+	t.regex(config.baseConfig.extends[config.baseConfig.extends.length - 1], /xo-typescript/);
 	t.is(config.baseConfig.parser, require.resolve('@typescript-eslint/parser'));
 	t.deepEqual(config.baseConfig.parserOptions, {
 		warnOnUnsupportedTypeScriptVersion: false,