xo 1.0.2 → 1.0.4

package/dist/cli.js

@@ -6,7 +6,8 @@ import formatterPretty from 'eslint-formatter-pretty';
 import getStdin from 'get-stdin';
 import meow from 'meow';
 import { pathExists } from 'path-exists';
-import { tsExtensions } from './lib/constants.js';
+import findCacheDirectory from 'find-cache-directory';
+import { cacheDirName, tsExtensions } from './lib/constants.js';
 import { Xo } from './lib/xo.js';
 import openReport from './lib/open-report.js';
 const cli = meow(`
@@ -17,12 +18,14 @@ const cli = meow(`
     --fix             Automagically fix issues
     --reporter        Reporter to use
     --space           Use space indent instead of tabs [Default: 2]
+    --config          Path to a XO configuration file
     --semicolon       Use semicolons [Default: true]
-    --prettier        Conform to Prettier code style [Default: false]
     --react           Include React specific parsing and xo-react linting rules [Default: false]
     --prettier        Format with prettier or turn off prettier conflicted rules when set to 'compat' [Default: false]
     --print-config    Print the effective ESLint config for the given file
+    --version         Print XO version
     --open            Open files with issues in your editor
+    --quiet           Show only errors and no warnings
     --stdin           Validate/fix code from stdin
     --stdin-filename  Specify a filename for the --stdin option
     --ignore          Ignore pattern globs, can be set multiple times
@@ -151,7 +154,8 @@ if (cliOptions.stdin) {
     if (cliOptions.stdinFilename && tsExtensions.includes(path.extname(cliOptions.stdinFilename).slice(1))) {
         const absoluteFilePath = path.resolve(cliOptions.cwd, cliOptions.stdinFilename);
         if (!await pathExists(absoluteFilePath)) {
-            cliOptions.stdinFilename = path.join(cliOptions.cwd, 'node_modules', '.cache', 'xo-linter', path.basename(absoluteFilePath));
+            const cacheDir = findCacheDirectory({ name: cacheDirName, cwd: linterOptions.cwd }) ?? path.join(cliOptions.cwd, 'node_modules', '.cache', cacheDirName);
+            cliOptions.stdinFilename = path.join(cacheDir, path.basename(absoluteFilePath));
             shouldRemoveStdInFile = true;
             baseXoConfigOptions.ignores = [
                 '!**/node_modules/**',
@@ -181,7 +185,7 @@ if (cliOptions.stdin) {
         process.exit(1);
     }
     const xo = new Xo(linterOptions, baseXoConfigOptions);
-    await log(await xo.lintText(stdin, { filePath: cliOptions.stdinFilename, warnIgnored: true }));
+    await log(await xo.lintText(stdin, { filePath: cliOptions.stdinFilename, warnIgnored: false }));
     if (shouldRemoveStdInFile) {
         await fs.rm(cliOptions.stdinFilename);
     }

package/dist/lib/handle-ts-files.js

@@ -31,7 +31,7 @@ export async function handleTsconfig({ cwd, files }) {
             // If we match on excluded, then we definitively know that there is no tsconfig match.
             if (Array.isArray(tsConfig.exclude)) {
                 const exclude = Array.isArray(tsConfig.exclude) ? tsConfig.exclude : [];
-                hasMatch = !micromatch.isMatch(filePath, exclude, micromatchOptions);
+                hasMatch = !micromatch.contains(filePath, exclude, micromatchOptions);
             }
             else {
                 // Not explicitly excluded and included by tsconfig defaults
@@ -45,7 +45,7 @@ export async function handleTsconfig({ cwd, files }) {
             const exclude = Array.isArray(tsConfig.exclude) ? tsConfig.exclude : [];
             // If we also have an exlcude we need to check all the arrays, (files, include, exclude)
             // this check not excluded and included in one of the file/include array
-            hasMatch = !micromatch.isMatch(filePath, exclude, micromatchOptions) && micromatch.isMatch(filePath, [...include, ...files], micromatchOptions);
+            hasMatch = !micromatch.contains(filePath, exclude, micromatchOptions) && micromatch.isMatch(filePath, [...include, ...files], micromatchOptions);
         }
         if (!hasMatch) {
             unincludedFiles.push(filePath);

package/dist/lib/xo.js

@@ -161,11 +161,14 @@ export class Xo {
             };
             // Apply TS rules to all files
             tsConfig.files = [tsFilesGlob];
-            // Set the other rules to the original config
-            config.rules = Object.fromEntries(otherRules);
+            const otherConfig = {
+                ...config,
+                // Set the other rules to the original config
+                rules: Object.fromEntries(otherRules),
+            };
             // These rules should still apply to all files
-            config.files = [allFilesGlob];
-            return [tsConfig, config];
+            otherConfig.files = [allFilesGlob];
+            return [tsConfig, otherConfig];
         });
         this.prettier = this.xoConfig.some(config => config.prettier);
         this.prettierConfig = await prettier.resolveConfig(flatConfigPath, { editorconfig: true }) ?? {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xo",
-	"version": "1.0.2",
+	"version": "1.0.4",
 	"description": "JavaScript/TypeScript linter (ESLint wrapper) with great defaults",
 	"license": "MIT",
 	"repository": "xojs/xo",
@@ -25,7 +25,7 @@
 		"build:watch": "tsc --watch",
 		"clean": "rm -rf dist",
 		"lint": "node dist/cli.js",
-		"prepare": "husky",
+		"prepare": "npm run build && husky",
 		"release": "np",
 		"test": "npm run build && npm run lint && npm run test:setup && ava",
 		"test:setup": "node scripts/setup-tests"