@naturalcycles/dev-lib 19.22.0 → 19.24.0

package/cfg/lint-staged.config.js

@@ -39,8 +39,9 @@ const stylelintConfigPath = [`stylelint.config.js`].find(fs.existsSync)
 const eslintConfigPathRoot = ['eslint.config.js'].find(p => fs.existsSync(p))
 
 const prettierCmd =
-  !!prettierConfigPath && `prettier --write --experimental-cli --config-path ${prettierConfigPath}`
-const eslintCmd = `eslint --fix`
+  !!prettierConfigPath &&
+  `prettier --write --experimental-cli --config-path ${prettierConfigPath} --cache-location node_modules/.cache/prettier`
+const eslintCmd = `eslint --fix --cache`
 
 const stylelintExists =
   !!stylelintConfigPath &&
@@ -71,7 +72,8 @@ const linters = {
     if (!filesList) return []
     return [
       biomeCmd,
-      eslintConfigPathRoot && `${eslintCmd} --config ${eslintConfigPathRoot}`,
+      eslintConfigPathRoot &&
+        `${eslintCmd} --config ${eslintConfigPathRoot} --cache-location ./node_modules/.cache/eslint_src`,
       prettierCmd,
     ]
       .filter(Boolean)
@@ -144,9 +146,7 @@ const linters = {
 
 // /scripts are separate, cause they require separate tsconfig.json
 if (fs.existsSync(`./scripts`)) {
-  const eslintConfigPathScripts = ['./scripts/eslint.config.js', './eslint.config.js'].find(p =>
-    fs.existsSync(p),
-  )
+  const eslintConfigPathScripts = ['./scripts/eslint.config.js'].find(p => fs.existsSync(p))
   Object.assign(linters, {
     // biome, eslint, Prettier
     './scripts/**/*.{ts,tsx,cts,mts,vue,html}': match => {
@@ -155,7 +155,7 @@ if (fs.existsSync(`./scripts`)) {
       return [
         biomeCmd,
         eslintConfigPathScripts &&
-          `${eslintCmd} --config ${eslintConfigPathScripts} --parser-options=project:./scripts/tsconfig.json`,
+          `${eslintCmd} --config ${eslintConfigPathScripts} --parser-options=project:./scripts/tsconfig.json --cache-location ./node_modules/.cache/eslint_scripts`,
         prettierCmd,
       ]
         .filter(Boolean)
@@ -166,9 +166,7 @@ if (fs.existsSync(`./scripts`)) {
 
 // /e2e
 if (fs.existsSync(`./e2e`)) {
-  const eslintConfigPathE2e = ['./e2e/eslint.config.js', './eslint.config.js'].find(p =>
-    fs.existsSync(p),
-  )
+  const eslintConfigPathE2e = ['./e2e/eslint.config.js'].find(p => fs.existsSync(p))
 
   Object.assign(linters, {
     // biome, eslint, Prettier
@@ -178,7 +176,7 @@ if (fs.existsSync(`./e2e`)) {
       return [
         biomeCmd,
         eslintConfigPathE2e &&
-          `${eslintCmd} --config ${eslintConfigPathE2e} --parser-options=project:./e2e/tsconfig.json`,
+          `${eslintCmd} --config ${eslintConfigPathE2e} --parser-options=project:./e2e/tsconfig.json --cache-location ./node_modules/.cache/eslint_e2e`,
         prettierCmd,
       ]
         .filter(Boolean)

package/cfg/tsconfig.json

@@ -56,6 +56,8 @@
     // ],
 
     // Other
+    "incremental": true,
+    "tsBuildInfoFile": "${configDir}/node_modules/.cache/src.tsbuildinfo",
     "pretty": true,
     "newLine": "lf",
     "experimentalDecorators": true

package/dist/lint.util.js

@@ -14,7 +14,7 @@ import { exec2 } from '@naturalcycles/nodejs-lib/exec2';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { _yargs } from '@naturalcycles/nodejs-lib/yargs';
 import { eslintExtensions, lintExclude, minActionlintVersion, prettierDirs, prettierExtensionsAll, stylelintExtensions, } from '../cfg/_cnst.js';
-import { cfgDir, scriptsDir } from './paths.js';
+import { cfgDir } from './paths.js';
 const { CI } = process.env;
 /**
  * Run all linters.
@@ -88,43 +88,48 @@ export async function eslintAll(opt) {
         ...opt,
     };
     const extensions = ext.split(',');
-    const eslintConfigPathRoot = ['./eslint.config.js'].find(p => existsSync(p));
-    const eslintConfigPathScripts = ['./scripts/eslint.config.js', './eslint.config.js'].find(p => existsSync(p));
-    const eslintConfigPathE2e = ['./e2e/eslint.config.js', './eslint.config.js'].find(p => existsSync(p));
-    const tsconfigPathScripts = [`./scripts/tsconfig.json`].find(p => existsSync(p)) || `${scriptsDir}/tsconfig.json`;
-    const tsconfigPathE2e = `./e2e/tsconfig.json`;
-    // todo: run on other dirs too, e.g pages, components, layouts
     if (fix) {
         await Promise.all([
             // /src
-            runESLint(`./src`, eslintConfigPathRoot, undefined, extensions, fix),
+            runESLint(`src`, extensions, fix),
             // /scripts
-            runESLint(`./scripts`, eslintConfigPathScripts, tsconfigPathScripts, extensions, fix),
+            runESLint(`scripts`, extensions, fix),
             // /e2e
-            runESLint(`./e2e`, eslintConfigPathE2e, tsconfigPathE2e, extensions, fix),
+            runESLint(`e2e`, extensions, fix),
         ]);
     }
     else {
         // with no-fix - let's run serially
         // /src
-        await runESLint(`./src`, eslintConfigPathRoot, undefined, extensions, fix);
+        await runESLint(`src`, extensions, fix);
         // /scripts
-        await runESLint(`./scripts`, eslintConfigPathScripts, tsconfigPathScripts, extensions, fix);
+        await runESLint(`scripts`, extensions, fix);
         // /e2e
-        await runESLint(`./e2e`, eslintConfigPathE2e, tsconfigPathE2e, extensions, fix);
+        await runESLint(`e2e`, extensions, fix);
     }
     console.log(`${boldGrey('eslint-all')} ${dimGrey(`took ` + _since(started))}`);
 }
-async function runESLint(dir, eslintConfigPath, tsconfigPath, extensions = eslintExtensions.split(','), fix = true) {
-    if (!eslintConfigPath || !existsSync(dir))
-        return; // faster to bail-out like this
+async function runESLint(dir, extensions = eslintExtensions.split(','), fix = true) {
+    let configDir = dir;
+    if (dir === 'src') {
+        configDir = '.';
+    }
+    const eslintConfigPath = `${configDir}/eslint.config.js`;
+    const tsconfigPath = `${configDir}/tsconfig.json`;
+    if (!existsSync(dir) || !existsSync(eslintConfigPath) || !existsSync(tsconfigPath)) {
+        // faster to bail-out like this
+        return;
+    }
     const eslintPath = findPackageBinPath('eslint', 'eslint');
     await exec2.spawnAsync(eslintPath, {
         args: [
             `--config`,
             eslintConfigPath,
             `${dir}/**/*.{${extensions.join(',')}}`,
-            ...(tsconfigPath ? [`--parser-options=project:${tsconfigPath}`] : []),
+            `--parser-options=project:${tsconfigPath}`,
+            '--cache',
+            '--cache-location',
+            `./node_modules/.cache/eslint_${dir}`,
             `--no-error-on-unmatched-pattern`,
             `--report-unused-disable-directives`, // todo: unnecessary with flat, as it's defined in the config
             fix ? `--fix` : '',
@@ -154,8 +159,8 @@ export function runPrettier(experimentalCli = true) {
         args: [
             `--write`,
             `--log-level=warn`,
-            // '--cache-location',
-            // `${process.cwd()}/node_modules/.cache/prettier`,
+            '--cache-location',
+            `node_modules/.cache/prettier`,
             experimentalCli && `--experimental-cli`,
             experimentalCli ? '--config-path' : `--config`,
             prettierConfigPath,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/dev-lib",
   "type": "module",
-  "version": "19.22.0",
+  "version": "19.24.0",
   "dependencies": {
     "@biomejs/biome": "^2",
     "@commitlint/cli": "^19",

package/scripts/tsconfig.json

@@ -5,7 +5,9 @@
   "extends": "../cfg/tsconfig.json",
   "compilerOptions": {
     "rootDir": "${configDir}/..",
-    "outDir": "${configDir}/../dist"
+    "outDir": "${configDir}/../dist/scripts",
+    "noEmit": true,
+    "tsBuildInfoFile": "${configDir}/../node_modules/.cache/scripts.tsbuildinfo"
   },
   "exclude": ["**/__exclude"]
 }