Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix installing XO on npm 6 by bundling TS-dependent dependencies to avoid hoisting #624

Merged
merged 4 commits into from Oct 27, 2021
Merged

Fix installing XO on npm 6 by bundling TS-dependent dependencies to avoid hoisting #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3dd0518
Bundle TS-dependent dependencies to avoid hoisting
voxpelli Oct 25, 2021
3184fa9
Replace `__dirname` with ESM counterpart
voxpelli Oct 26, 2021
55385a0
Add missing trailing comma
voxpelli Oct 27, 2021
b8fc320
Fix tests
voxpelli Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion index.js
View file
Open in desktop
@@ -1,3 +1,4 @@
import {fileURLToPath} from 'node:url';
import path from 'node:path';
import {ESLint} from 'eslint';
import {globby, isGitIgnoredSync} from 'globby';
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/options-manager.js
View file
Open in desktop
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions test/options-manager.js
View file
Open in desktop
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down