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

Upgrade globby #574

Merged
merged 4 commits into from Jul 16, 2021
+60 −30
Merged

Upgrade globby #574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f7ae44
Upgrade `globby`
aaharu Jul 7, 2021
845266d
Move Markdown files to avoid searching config files
aaharu Jul 13, 2021
f4d860e
Add Windows-style paths test
aaharu Jul 13, 2021
ade765b
Move temporary directory
aaharu Jul 13, 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
11 changes: 6 additions & 5 deletions index.js
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import pMap from 'p-map';
import {cosmiconfig, defaultLoaders} from 'cosmiconfig';
import defineLazyProperty from 'define-lazy-prop';
import pFilter from 'p-filter';
import slash from 'slash';
import {CONFIG_FILES, MODULE_NAME, DEFAULT_IGNORES} from './lib/constants.js';
import {
normalizeOptions,
Expand Down Expand Up @@ -94,9 +95,9 @@ const runEslint = async (paths, options, processorOptions) => {

const globFiles = async (patterns, {ignores, extensions, cwd}) => (
await globby(
patterns.length === 0 ? [`**/*.{${extensions.join(',')}}`] : arrify(patterns),
{ignore: ignores, gitignore: true, cwd},
)).filter(file => extensions.includes(path.extname(file).slice(1))).map(file => path.resolve(cwd, file));
patterns.length === 0 ? [`**/*.{${extensions.join(',')}}`] : arrify(patterns).map(pattern => slash(pattern)),
{ignore: ignores, gitignore: true, absolute: true, cwd},
)).filter(file => extensions.includes(path.extname(file).slice(1)));

const getConfig = async options => {
const {options: foundOptions, prettierOptions} = mergeWithFileConfig(normalizeOptions(options));
Expand Down Expand Up @@ -149,8 +150,8 @@ const lintFiles = async (patterns, inputOptions = {}) => {
const configFiles = (await Promise.all(
(await globby(
CONFIG_FILES.map(configFile => `**/${configFile}`),
{ignore: DEFAULT_IGNORES, gitignore: true, cwd: inputOptions.cwd},
)).map(async configFile => configExplorer.load(path.resolve(inputOptions.cwd, configFile))),
{ignore: DEFAULT_IGNORES, gitignore: true, absolute: true, cwd: inputOptions.cwd},
)).map(configFile => configExplorer.load(configFile)),
)).filter(Boolean);

const paths = configFiles.length > 0
Expand Down
8 changes: 6 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -78,7 +78,7 @@
"find-up": "^5.0.0",
"fs-extra": "^10.0.0",
"get-stdin": "^9.0.0",
"globby": "^9.2.0",
"globby": "^11.0.4",
"imurmurhash": "^0.1.4",
"is-path-inside": "^4.0.0",
"json-stable-stringify-without-jsonify": "^1.0.1",
Expand Down Expand Up @@ -117,7 +117,8 @@
},
"eslintIgnore": [
"test/fixtures",
"coverage"
"coverage",
"temp"
],
"ava": {
"timeout": "1m"
Expand All @@ -127,5 +128,8 @@
"text",
"lcov"
]
},
"xo": {
"semicolon": true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already the default.

}
}
1 change: 1 addition & 0 deletions temp/.gitignore
View file
Open in desktop
@@ -0,0 +1 @@
*/
25 changes: 16 additions & 9 deletions test/cli.js
View file
Open in desktop
Expand Up @@ -3,7 +3,6 @@ import path from 'node:path';
import test from 'ava';
import execa from 'execa';
import slash from 'slash';
import tempWrite from 'temp-write';
import createEsmUtils from 'esm-utils';

const {__dirname} = createEsmUtils(import.meta);
Expand All @@ -12,8 +11,10 @@ process.chdir(__dirname);
const main = (arguments_, options) => execa(path.join(__dirname, '../cli.js'), arguments_, options);

test('fix option', async t => {
const filepath = await tempWrite('console.log()\n', 'x.js');
await main(['--fix', filepath]);
const cwd = await fs.promises.mkdtemp(path.join(__dirname, '../temp/'));
const filepath = path.join(cwd, 'x.js');
await fs.promises.writeFile(filepath, 'console.log()\n');
await main(['--fix', filepath], {cwd});
t.is(fs.readFileSync(filepath, 'utf8').trim(), 'console.log();');
});

Expand All @@ -33,10 +34,12 @@ test('stdin-filename option with stdin', async t => {
});

test('reporter option', async t => {
const filepath = await tempWrite('console.log()\n', 'x.js');
const cwd = await fs.promises.mkdtemp(path.join(__dirname, '../temp/'));
const filepath = path.join(cwd, 'x.js');
await fs.promises.writeFile(filepath, 'console.log()\n');

const error = await t.throwsAsync(() =>
main(['--reporter=compact', filepath]),
main(['--reporter=compact', filepath], {cwd}),
);
t.true(error.stdout.includes('Error - '));
});
Expand Down Expand Up @@ -98,15 +101,19 @@ test('supports being extended with a shareable config', async t => {
});

test('quiet option', async t => {
const filepath = await tempWrite('// TODO: quiet\nconsole.log()\n', 'x.js');
const error = await t.throwsAsync(main(['--quiet', '--reporter=json', filepath]));
const cwd = await fs.promises.mkdtemp(path.join(__dirname, '../temp/'));
const filepath = path.join(cwd, 'x.js');
await fs.promises.writeFile(filepath, '// TODO: quiet\nconsole.log()\n');
const error = await t.throwsAsync(main(['--quiet', '--reporter=json', filepath], {cwd}));
const [report] = JSON.parse(error.stdout);
t.is(report.warningCount, 0);
});

test('invalid node-engine option', async t => {
const filepath = await tempWrite('console.log()\n', 'x.js');
const error = await t.throwsAsync(main(['--node-version', 'v', filepath]));
const cwd = await fs.promises.mkdtemp(path.join(__dirname, '../temp/'));
const filepath = path.join(cwd, 'x.js');
await fs.promises.writeFile(filepath, 'console.log()\n');
const error = await t.throwsAsync(main(['--node-version', 'v', filepath], {cwd}));
t.is(error.exitCode, 1);
});

Expand Down
33 changes: 18 additions & 15 deletions test/lint-files.js
View file
Open in desktop
Expand Up @@ -13,21 +13,23 @@ const hasRule = (results, filePath, ruleId) => {

test('only accepts allowed extensions', async t => {
// Markdown files will always produce linter errors and will not be going away
const mdGlob = path.join(__dirname, '..', '*.md');
const cwd = path.join(__dirname, '..');
const mdGlob = '*.md';

// No files should be linted = no errors
const noOptionsResults = await xo.lintFiles(mdGlob, {});
const noOptionsResults = await xo.lintFiles(mdGlob, {cwd});
t.is(noOptionsResults.errorCount, 0);

// Markdown files linted (with no plugin for it) = errors
const moreExtensionsResults = await xo.lintFiles(mdGlob, {extensions: ['md']});
const moreExtensionsResults = await xo.lintFiles(mdGlob, {extensions: ['md'], cwd});
t.true(moreExtensionsResults.errorCount > 0);
});

test('ignores dirs for empty extensions', async t => {
{
const glob = path.join(__dirname, 'fixtures/nodir/*');
const results = await xo.lintFiles(glob, {extensions: ['', 'js']});
const cwd = path.join(__dirname, 'fixtures/nodir');
const glob = '*';
const results = await xo.lintFiles(glob, {extensions: ['', 'js'], cwd});
const {results: [fileResult]} = results;

// Only `fixtures/nodir/noextension` should be linted
Expand All @@ -38,8 +40,9 @@ test('ignores dirs for empty extensions', async t => {
}

{
const glob = path.join(__dirname, 'fixtures/nodir/nested/*');
const results = await xo.lintFiles(glob);
const cwd = path.join(__dirname, 'fixtures/nodir');
const glob = 'nested/*';
const results = await xo.lintFiles(glob, {cwd});
const {results: [fileResult]} = results;

// Ensure `nodir/nested` **would** report if globbed
Expand All @@ -59,7 +62,7 @@ test.serial('cwd option', async t => {

test('do not lint gitignored files', async t => {
const cwd = path.join(__dirname, 'fixtures/gitignore');
const glob = path.posix.join(cwd, '**/*');
const glob = '**/*';
const ignored = path.resolve('fixtures/gitignore/test/foo.js');
const {results} = await xo.lintFiles(glob, {cwd});

Expand All @@ -68,7 +71,7 @@ test('do not lint gitignored files', async t => {

test('do not lint gitignored files in file with negative gitignores', async t => {
const cwd = path.join(__dirname, 'fixtures/negative-gitignore');
const glob = path.posix.join(cwd, '*');
const glob = '*';
const ignored = path.resolve('fixtures/negative-gitignore/bar.js');
const {results} = await xo.lintFiles(glob, {cwd});

Expand All @@ -77,7 +80,7 @@ test('do not lint gitignored files in file with negative gitignores', async t =>

test('lint negatively gitignored files', async t => {
const cwd = path.join(__dirname, 'fixtures/negative-gitignore');
const glob = path.posix.join(cwd, '*');
const glob = '*';
const negative = path.resolve('fixtures/negative-gitignore/foo.js');
const {results} = await xo.lintFiles(glob, {cwd});

Expand All @@ -86,7 +89,7 @@ test('lint negatively gitignored files', async t => {

test('do not lint inapplicable negatively gitignored files', async t => {
const cwd = path.join(__dirname, 'fixtures/negative-gitignore');
const glob = path.posix.join(cwd, 'bar.js');
const glob = 'bar.js';
const negative = path.resolve('fixtures/negative-gitignore/foo.js');
const {results} = await xo.lintFiles(glob, {cwd});

Expand Down Expand Up @@ -125,7 +128,7 @@ test('enable rules based on nodeVersion', async t => {

test('do not lint eslintignored files', async t => {
const cwd = path.join(__dirname, 'fixtures/eslintignore');
const glob = path.posix.join(cwd, '*');
const glob = '*';
const positive = path.resolve('fixtures/eslintignore/foo.js');
const negative = path.resolve('fixtures/eslintignore/bar.js');
const {results} = await xo.lintFiles(glob, {cwd});
Expand Down Expand Up @@ -216,7 +219,7 @@ test('typescript no semicolon option', async t => {

test('webpack import resolver is used if webpack.config.js is found', async t => {
const cwd = 'fixtures/webpack/with-config/';
const {results} = await xo.lintFiles(path.resolve(cwd, 'file1.js'), {
const {results} = await xo.lintFiles('file1.js', {
cwd,
rules: {
'import/no-unresolved': 2,
Expand All @@ -233,7 +236,7 @@ test('webpack import resolver is used if webpack.config.js is found', async t =>
test('webpack import resolver config can be passed through webpack option', async t => {
const cwd = 'fixtures/webpack/no-config/';

const {results} = await xo.lintFiles(path.resolve(cwd, 'file1.js'), {
const {results} = await xo.lintFiles('file1.js', {
cwd,
webpack: {
config: {
Expand All @@ -256,7 +259,7 @@ test('webpack import resolver config can be passed through webpack option', asyn
test('webpack import resolver is used if {webpack: true}', async t => {
const cwd = 'fixtures/webpack/no-config/';

const {results} = await xo.lintFiles(path.resolve(cwd, 'file3.js'), {
const {results} = await xo.lintFiles('file3.js', {
cwd,
webpack: true,
rules: {
Expand Down