@naturalcycles/dev-lib 13.55.0 → 14.0.0

package/cfg/eslint-rules.js

@@ -153,7 +153,6 @@ module.exports = {
       },
     ],
     'constructor-super': 2,
-    curly: [2, 'multi-line'],
     'eol-last': 2,
     eqeqeq: [2, 'smart'],
     'for-direction': 2,
@@ -171,8 +170,16 @@ module.exports = {
       'undefined',
     ],
     'id-match': 2,
-    'import/order': [
+    'simple-import-sort/imports': [
       2,
+      {
+        // This is what "removes any newlines between imports":
+        groups: [['^\\u0000', '^node:', '^@?\\w', '^', '^\\.']],
+      },
+    ],
+    'simple-import-sort/exports': 2,
+    'import/order': [
+      0, // disabled in favor of `simple-import-sort`
       {
         alphabetize: {
           order: 'asc',

package/cfg/eslint.config.js

@@ -1,62 +1,84 @@
 /**
  * @naturalcycles/dev-lib/cfg/eslint.config.js
  *
- * Shared eslint config.
+ * Shared eslint FLAT config.
  */
 
+const globals = require('globals')
+const eslint = require('@eslint/js')
+const tseslint = require('typescript-eslint')
+
 // detect if jest is installed
 const hasJest = require('node:fs').existsSync('./node_modules/jest')
-// console.log({hasJest})
+// console.log({ hasJest })
 
-module.exports = {
-  env: {
-    es2024: true,
-    node: true,
-    jest: true,
-    // 'jest/globals': true,
+module.exports = [
+  eslint.configs.recommended,
+  // https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/configs/recommended-type-checked.ts
+  ...tseslint.configs.recommendedTypeChecked,
+  // https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/configs/stylistic-type-checked.ts
+  ...tseslint.configs.stylisticTypeChecked,
+  // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/configs/recommended.js
+  require('eslint-plugin-unicorn').configs['flat/recommended'],
+  // https://eslint.vuejs.org/user-guide/#user-guide
+  ...require('eslint-plugin-vue').configs['flat/recommended'],
+  {
+    files: ['**/*.ts', '**/*.tsx'],
+    ...getConfig(),
+  },
+  {
+    files: ['*.vue', '**/*.vue'],
+    languageOptions: {
+      parserOptions: {
+        project: 'tsconfig.json',
+        parser: tseslint.parser,
+      },
+    },
+    plugins: getConfig().plugins,
+    rules: getConfig().rules,
   },
-  globals: {
-    NodeJS: 'readable',
-    // testcafe
-    fixture: 'readable',
+  {
+    ignores: ['**/__exclude/**', '**/*.scss', '**/*.js'],
   },
-  ignorePatterns: ['**/__exclude/**'],
-  overrides: [
-    {
-      files: ['*.ts', '*.tsx'],
-      extends: [
-        'eslint:recommended',
-        // https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/configs/recommended-type-checked.ts
-        'plugin:@typescript-eslint/recommended-type-checked',
-        // https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/src/configs/stylistic-type-checked.ts
-        'plugin:@typescript-eslint/stylistic-type-checked',
-        // 'plugin:jest/recommended', // add manually if needed!
-        // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/configs/recommended.js
-        'plugin:unicorn/recommended',
-        // https://github.com/import-js/eslint-plugin-import/blob/main/config/recommended.js
-        // 'plugin:import/recommended',
-        // https://github.com/import-js/eslint-plugin-import/blob/main/config/typescript.js
-        // 'plugin:import/typescript',
-        hasJest && './eslint-jest-rules.js',
-        './eslint-rules.js',
-        'prettier', // must be last! it only turns off eslint rules that conflict with prettier
-      ].filter(Boolean),
-      parser: '@typescript-eslint/parser',
+].filter(Boolean)
+
+function getConfig() {
+  return {
+    plugins: {
+      '@typescript-eslint': tseslint.plugin,
+      import: require('eslint-plugin-import'),
+      'unused-imports': require('eslint-plugin-unused-imports'),
+      'simple-import-sort': require('eslint-plugin-simple-import-sort'),
+      jsdoc: require('eslint-plugin-jsdoc'),
+      jest: hasJest ? require('eslint-plugin-jest') : undefined,
+    },
+    languageOptions: {
+      ecmaVersion: 'latest',
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        ...globals.jest,
+        NodeJS: 'readonly',
+        // testcafe
+        fixture: 'readonly',
+      },
+      parser: tseslint.parser,
       parserOptions: {
-        project: ['tsconfig.json'],
-        sourceType: 'module',
+        project: 'tsconfig.json',
         ecmaVersion: 'latest',
         extraFileExtensions: ['.vue', '.html'],
       },
-      plugins: [
-        'jsdoc',
-        'import',
-        '@typescript-eslint',
-        // https://github.com/sweepline/eslint-plugin-unused-imports
-        'unused-imports',
-        hasJest && 'jest',
-        'unicorn',
-      ].filter(Boolean),
     },
-  ],
+    linterOptions: {
+      reportUnusedDisableDirectives: 'error',
+    },
+    rules: {
+      ...require('./eslint-rules').rules,
+      ...require('./eslint-vue-rules').rules,
+      ...(hasJest ? require('./eslint-jest-rules').rules : {}),
+      ...require('eslint-config-prettier').rules,
+      // Override prettier-config:
+      curly: [2, 'multi-line'],
+    },
+  }
 }

package/cfg/init/commitlint.config.js

@@ -1 +1,3 @@
-module.exports = require('@naturalcycles/dev-lib/cfg/commitlint.config')
+module.exports = {
+  ...require('@naturalcycles/dev-lib/cfg/commitlint.config'),
+}

package/cfg/init/eslint.config.js

@@ -0,0 +1,4 @@
+// prettier-ignore
+module.exports = [
+  ...require('@naturalcycles/dev-lib/cfg/eslint.config'),
+]

package/cfg/init/lint-staged.config.js

@@ -1 +1,3 @@
-module.exports = require('@naturalcycles/dev-lib/cfg/lint-staged.config')
+module.exports = {
+  ...require('@naturalcycles/dev-lib/cfg/lint-staged.config'),
+}

package/cfg/lint-staged.config.js

@@ -4,11 +4,8 @@
   Supports default configs for `prettier`, `stylelint`, `eslint`, if they are not found in target project.
 */
 
-// this probably doesn't work, but we're still trying
-process.env['ESLINT_USE_FLAT_CONFIG'] = 'false'
-
-const micromatch = require('micromatch')
 const fs = require('node:fs')
+const micromatch = require('micromatch')
 const { execSync } = require('node:child_process')
 const {
   prettierDirs,
@@ -17,43 +14,53 @@ const {
   stylelintExtensions,
   lintExclude,
 } = require('./_cnst')
-const cfgDir = __dirname
 
-const prettierConfigPath =
-  [`prettier.config.js`].find(fs.existsSync) || `${cfgDir}/prettier.config.js`
+const prettierConfigPath = [`prettier.config.js`].find(fs.existsSync)
 
-const stylelintConfigPath =
-  [`stylelint.config.js`].find(fs.existsSync) || `${cfgDir}/stylelint.config.js`
+const stylelintConfigPath = [`stylelint.config.js`].find(fs.existsSync)
 
 // this is to support "Solution style tsconfig.json" (as used in Angular10, for example)
 // const tsconfigPathRoot = ['tsconfig.base.json'].find(p => fs.existsSync(p)) || 'tsconfig.json'
 // const tsconfigPathRoot = 'tsconfig.json'
 
-const eslintConfigPathRoot =
-  ['.eslintrc.js'].find(p => fs.existsSync(p)) || `${cfgDir}/eslint.config.js`
+const eslintConfigPathRoot = ['eslint.config.js'].find(p => fs.existsSync(p))
 
-const prettierCmd = `prettier --write --config ${prettierConfigPath}`
+const prettierCmd = !!prettierConfigPath && `prettier --write --config ${prettierConfigPath}`
 const eslintCmd = `eslint --fix`
 
 const stylelintExists =
+  !!stylelintConfigPath &&
   fs.existsSync('node_modules/stylelint') &&
   fs.existsSync('node_modules/stylelint-config-standard-scss')
 const stylelintCmd = stylelintExists ? `stylelint --fix --config ${stylelintConfigPath}` : undefined
 
+if (!eslintConfigPathRoot) {
+  console.log('eslint is skipped, because ./eslint.config.js is not present')
+}
+if (!prettierCmd) {
+  console.log('prettier is skipped, because ./prettier.config.js is not present')
+}
+if (!stylelintCmd) {
+  console.log(
+    'stylelint is skipped, because ./stylelint.config.js is not present, or stylelint and/or stylelint-config-standard-scss are not installed',
+  )
+}
+
 const linters = {
   // *.{ts,tsx,vue} files: eslint, prettier
   './src/**/*.{ts,tsx,vue}': match => {
-    const filesList = micromatch.not(match, lintExclude).join(' ')
+    const filesList = getFilesList(match)
     if (!filesList) return []
-    return [`${eslintCmd} --config ${eslintConfigPathRoot}`, prettierCmd].map(
-      s => `${s} ${filesList}`,
-    )
+    return [eslintConfigPathRoot && `${eslintCmd} --config ${eslintConfigPathRoot}`, prettierCmd]
+      .filter(Boolean)
+      .map(s => `${s} ${filesList}`)
   },
 
   // For all other files we run only Prettier (because e.g eslint screws *.scss files)
+  // todo: this should be no longer needed when flat eslint config is default and it has global ignore of scss files
   [`./{${prettierDirs}}/**/*.{${prettierExtensionsExclusive}}`]: match => {
-    const filesList = micromatch.not(match, lintExclude).join(' ')
-    if (!filesList) return []
+    const filesList = getFilesList(match)
+    if (!filesList || !prettierCmd) return []
     return [prettierCmd].map(s => `${s} ${filesList}`)
   },
 
@@ -69,20 +76,20 @@ const linters = {
 
   // Files for Stylelint + Prettier
   [`./{${prettierDirs}}/**/*.{${stylelintExtensions}}`]: match => {
-    const filesList = micromatch.not(match, lintExclude).join(' ')
+    const filesList = getFilesList(match)
     if (!filesList) return []
     return [stylelintCmd, prettierCmd].filter(Boolean).map(s => `${s} ${filesList}`)
   },
 
   // Files in root dir
   [`./*.{${prettierExtensionsAll}}`]: match => {
-    const filesList = micromatch.not(match, lintExclude).join(' ')
-    if (!filesList) return []
+    const filesList = getFilesList(match)
+    if (!filesList || !prettierCmd) return []
     return [prettierCmd].map(s => `${s} ${filesList}`)
   },
 
   '**/*.{kt,kts}': match => {
-    const filesList = micromatch.not(match, lintExclude).join(' ')
+    const filesList = getFilesList(match)
     if (!filesList) return []
     const dir = './node_modules/@naturalcycles/ktlint'
 
@@ -111,61 +118,73 @@ const linters = {
 
 // /scripts are separate, cause they require separate tsconfig.json
 if (fs.existsSync(`./scripts`)) {
-  const eslintConfigPathScripts =
-    ['./scripts/.eslintrc.js', './.eslintrc.js'].find(p => fs.existsSync(p)) ||
-    `${cfgDir}/eslint.config.js`
-
+  const eslintConfigPathScripts = ['./scripts/eslint.config.js', './eslint.config.js'].find(p =>
+    fs.existsSync(p),
+  )
   Object.assign(linters, {
     // eslint, Prettier
     './scripts/**/*.{ts,tsx}': match => {
-      const filesList = micromatch.not(match, lintExclude).join(' ')
+      const filesList = getFilesList(match)
       if (!filesList) return []
       return [
-        `${eslintCmd} --config ${eslintConfigPathScripts} --parser-options=project:./scripts/tsconfig.json`,
+        eslintConfigPathScripts &&
+          `${eslintCmd} --config ${eslintConfigPathScripts} --parser-options=project:./scripts/tsconfig.json`,
         prettierCmd,
-      ].map(s => `${s} ${filesList}`)
+      ]
+        .filter(Boolean)
+        .map(s => `${s} ${filesList}`)
     },
   })
 }
 
 // /e2e
 if (fs.existsSync(`./e2e`)) {
-  const eslintConfigPathE2e =
-    ['./e2e/.eslintrc.js', './.eslintrc.js'].find(p => fs.existsSync(p)) ||
-    `${cfgDir}/eslint.config.js`
+  const eslintConfigPathE2e = ['./e2e/eslint.config.js', './eslint.config.js'].find(p =>
+    fs.existsSync(p),
+  )
 
   Object.assign(linters, {
     // eslint, Prettier
     './e2e/**/*.{ts,tsx}': match => {
-      const filesList = micromatch.not(match, lintExclude).join(' ')
+      const filesList = getFilesList(match)
       if (!filesList) return []
       return [
-        `${eslintCmd} --config ${eslintConfigPathE2e} --parser-options=project:./e2e/tsconfig.json`,
+        eslintConfigPathE2e &&
+          `${eslintCmd} --config ${eslintConfigPathE2e} --parser-options=project:./e2e/tsconfig.json`,
         prettierCmd,
-      ].map(s => `${s} ${filesList}`)
+      ]
+        .filter(Boolean)
+        .map(s => `${s} ${filesList}`)
     },
   })
 }
 
 // /playwright
 if (fs.existsSync(`./playwright`)) {
-  const eslintConfigPathE2e =
-    ['./playwright/.eslintrc.js', './.eslintrc.js'].find(p => fs.existsSync(p)) ||
-    `${cfgDir}/eslint.config.js`
+  const eslintConfigPathE2e = ['./playwright/eslint.config.js', './eslint.config.js'].find(p =>
+    fs.existsSync(p),
+  )
 
   Object.assign(linters, {
     // eslint, Prettier
     './playwright/**/*.{ts,tsx}': match => {
-      const filesList = micromatch.not(match, lintExclude).join(' ')
+      const filesList = getFilesList(match)
       if (!filesList) return []
       return [
-        `${eslintCmd} --config ${eslintConfigPathE2e} --parser-options=project:./playwright/tsconfig.json`,
+        eslintConfigPathE2e &&
+          `${eslintCmd} --config ${eslintConfigPathE2e} --parser-options=project:./playwright/tsconfig.json`,
         prettierCmd,
-      ].map(s => `${s} ${filesList}`)
+      ]
+        .filter(Boolean)
+        .map(s => `${s} ${filesList}`)
     },
   })
 }
 
+function getFilesList(match) {
+  return micromatch.not(match, lintExclude).join(' ')
+}
+
 function canRunBinary(name) {
   try {
     execSync(`which ${name}`)

package/dist/bin/lint-staged-def.js

@@ -4,14 +4,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const paths_cnst_1 = require("../cnst/paths.cnst");
 (0, nodejs_lib_1.runScript)(async () => {
     // const cwd = process.cwd()
     const localConfig = `./lint-staged.config.js`;
-    const sharedConfig = `${paths_cnst_1.cfgDir}/lint-staged.config.js`;
-    const config = node_fs_1.default.existsSync(localConfig) ? localConfig : sharedConfig;
-    // this probably doesn't work, but we're still trying
-    process.env['ESLINT_USE_FLAT_CONFIG'] = 'false';
+    // const sharedConfig = `${cfgDir}/lint-staged.config.js`
+    const config = node_fs_1.default.existsSync(localConfig) ? localConfig : undefined;
+    if (!config) {
+        console.log(`lint-staged is skipped, because no ${localConfig} is found`);
+        return;
+    }
     // await execWithArgs(`lint-staged`, [`--config`, config])
     // const lintStaged = require('lint-staged')
     // lint-staged is ESM since 12.0

package/dist/cmd/eslint-all.command.js

@@ -6,7 +6,6 @@ const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const yargs_1 = tslib_1.__importDefault(require("yargs"));
-const paths_cnst_1 = require("../cnst/paths.cnst");
 const lint_util_1 = require("../util/lint.util");
 /**
  * Runs `eslint` command for all predefined paths (e.g /src, /scripts, etc).
@@ -24,13 +23,10 @@ async function eslintAllCommand() {
         },
     }).argv;
     const extensions = ext.split(',');
-    const eslintConfigPathRoot = ['./.eslintrc.js'].find(p => node_fs_1.default.existsSync(p)) || `${paths_cnst_1.cfgDir}/eslint.config.js`;
-    const eslintConfigPathScripts = ['./scripts/.eslintrc.js', './.eslintrc.js'].find(p => node_fs_1.default.existsSync(p)) ||
-        `${paths_cnst_1.cfgDir}/eslint.config.js`;
-    const eslintConfigPathE2e = ['./e2e/.eslintrc.js', './.eslintrc.js'].find(p => node_fs_1.default.existsSync(p)) ||
-        `${paths_cnst_1.cfgDir}/eslint.config.js`;
-    const eslintConfigPathPlaywright = ['./playwright/.eslintrc.js', './.eslintrc.js'].find(p => node_fs_1.default.existsSync(p)) ||
-        `${paths_cnst_1.cfgDir}/eslint.config.js`;
+    const eslintConfigPathRoot = ['./eslint.config.js'].find(p => node_fs_1.default.existsSync(p));
+    const eslintConfigPathScripts = ['./scripts/eslint.config.js', './eslint.config.js'].find(p => node_fs_1.default.existsSync(p));
+    const eslintConfigPathE2e = ['./e2e/eslint.config.js', './eslint.config.js'].find(p => node_fs_1.default.existsSync(p));
+    const eslintConfigPathPlaywright = ['./playwright/eslint.config.js', './eslint.config.js'].find(p => node_fs_1.default.existsSync(p));
     // const tsconfigPath = getTSConfigPath()
     const tsconfigPathScripts = (0, lint_util_1.getTSConfigPathScripts)();
     const tsconfigPathE2e = `./e2e/tsconfig.json`;
@@ -44,7 +40,7 @@ async function eslintAllCommand() {
             (0, lint_util_1.runESLintAsync)(`./scripts`, eslintConfigPathScripts, tsconfigPathScripts, undefined, fix),
             // /e2e
             (0, lint_util_1.runESLintAsync)(`./e2e`, eslintConfigPathE2e, tsconfigPathE2e, undefined, fix),
-            // /playwright
+            // /playwright // todo: remove after migration to e2e folder is completed
             (0, lint_util_1.runESLintAsync)(`./playwright`, eslintConfigPathPlaywright, tsconfigPathPlaywright, undefined, fix),
         ]);
     }

package/dist/testing/index.d.ts

@@ -5,4 +5,4 @@ export * from './expect.util';
 export * from './mockAllKindsOfThings';
 export * from './testing.util';
 export * from './time.util';
-export { timekeeper, expectTypeOf };
+export { expectTypeOf, timekeeper };

package/dist/testing/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectTypeOf = exports.timekeeper = void 0;
+exports.timekeeper = exports.expectTypeOf = void 0;
 const tslib_1 = require("tslib");
 const expect_type_1 = require("expect-type");
 Object.defineProperty(exports, "expectTypeOf", { enumerable: true, get: function () { return expect_type_1.expectTypeOf; } });

package/dist/util/jest.util.d.ts

@@ -1,4 +1,4 @@
-export declare function getJestConfigPath(): string;
+export declare function getJestConfigPath(): string | undefined;
 export declare function getJestIntegrationConfigPath(): string;
 export declare function getJestManualConfigPath(): string;
 /**

package/dist/util/jest.util.js

@@ -13,7 +13,7 @@ const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
 const test_util_1 = require("./test.util");
 function getJestConfigPath() {
-    return node_fs_1.default.existsSync(`./jest.config.js`) ? './jest.config.js' : `${paths_cnst_1.cfgDir}/jest.config.js`;
+    return node_fs_1.default.existsSync(`./jest.config.js`) ? './jest.config.js' : undefined;
 }
 function getJestIntegrationConfigPath() {
     return node_fs_1.default.existsSync(`./jest.integration-test.config.js`)
@@ -57,6 +57,10 @@ function runJest(opt = {}) {
     else {
         jestConfig = getJestConfigPath();
     }
+    if (!jestConfig) {
+        console.log((0, nodejs_lib_1.dimGrey)(`./jest.config.js not found, skipping jest`));
+        return;
+    }
     // Allow to override --maxWorkers
     let maxWorkers = processArgs.find(a => a.startsWith('--maxWorkers'));
     const args = [

package/dist/util/lint.util.d.ts

@@ -1,4 +1,4 @@
 export declare function getTSConfigPath(): string;
 export declare function getTSConfigPathScripts(): string;
-export declare function runESLint(dir: string, eslintConfigPath: string, tsconfigPath?: string, extensions?: string[], fix?: boolean): void;
-export declare function runESLintAsync(dir: string, eslintConfigPath: string, tsconfigPath?: string, extensions?: string[], fix?: boolean): Promise<void>;
+export declare function runESLint(dir: string, eslintConfigPath: string | undefined, tsconfigPath?: string, extensions?: string[], fix?: boolean): void;
+export declare function runESLintAsync(dir: string, eslintConfigPath: string | undefined, tsconfigPath?: string, extensions?: string[], fix?: boolean): Promise<void>;

package/dist/util/lint.util.js

@@ -8,7 +8,6 @@ const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
-const ESLINT_USE_FLAT_CONFIG = 'false';
 function getTSConfigPath() {
     // this is to support "Solution style tsconfig.json" (as used in Angular10, for example)
     // return [`./tsconfig.base.json`].find(p => fs.existsSync(p)) || `./tsconfig.json`
@@ -18,22 +17,14 @@ function getTSConfigPathScripts() {
     return [`./scripts/tsconfig.json`].find(p => node_fs_1.default.existsSync(p)) || `${paths_cnst_1.scriptsDir}/tsconfig.json`;
 }
 function runESLint(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
-    if (!node_fs_1.default.existsSync(dir))
+    if (!eslintConfigPath || !node_fs_1.default.existsSync(dir))
         return; // faster to bail-out like this
-    (0, nodejs_lib_1.execVoidCommandSync)('eslint', getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions, fix), {
-        env: {
-            ESLINT_USE_FLAT_CONFIG,
-        },
-    });
+    (0, nodejs_lib_1.execVoidCommandSync)('eslint', getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions, fix));
 }
 async function runESLintAsync(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
-    if (!node_fs_1.default.existsSync(dir))
+    if (!eslintConfigPath || !node_fs_1.default.existsSync(dir))
         return; // faster to bail-out like this
-    await (0, nodejs_lib_1.execVoidCommand)('eslint', getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions, fix), {
-        env: {
-            ESLINT_USE_FLAT_CONFIG,
-        },
-    });
+    await (0, nodejs_lib_1.execVoidCommand)('eslint', getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions, fix));
 }
 function getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
     return [
@@ -42,7 +33,7 @@ function getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions = ['ts',
         `${dir}/**/*.{${extensions.join(',')}}`,
         ...(tsconfigPath ? [`--parser-options=project:${tsconfigPath}`] : []),
         `--no-error-on-unmatched-pattern`,
-        `--report-unused-disable-directives`,
+        `--report-unused-disable-directives`, // todo: unnecessary with flat, as it's defined in the config
         fix ? `--fix` : '',
     ].filter(Boolean);
 }

package/dist/util/prettier.util.js

@@ -4,7 +4,6 @@ exports.runPrettier = runPrettier;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const paths_cnst_1 = require("../cnst/paths.cnst");
 const { prettierDirs, prettierExtensionsAll, lintExclude } = require('../../cfg/_cnst');
 const prettierPaths = [
     // Everything inside these folders
@@ -15,8 +14,9 @@ const prettierPaths = [
     ...lintExclude.map((s) => `!${s}`),
 ];
 function runPrettier() {
-    // If there's no `prettier.config.js` in target project - pass `./cfg/prettier.config.js`
-    const prettierConfigPath = [`./prettier.config.js`].find(f => node_fs_1.default.existsSync(f)) || `${paths_cnst_1.cfgDir}/prettier.config.js`;
+    const prettierConfigPath = [`./prettier.config.js`].find(f => node_fs_1.default.existsSync(f));
+    if (!prettierConfigPath)
+        return;
     // prettier --write 'src/**/*.{js,ts,css,scss,graphql}'
     const args = [`--write`, `--log-level=warn`, `--config`, prettierConfigPath, ...prettierPaths];
     (0, nodejs_lib_1.execVoidCommandSync)('prettier', args);

package/dist/util/stylelint.util.js

@@ -6,7 +6,6 @@ const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const yargs_1 = tslib_1.__importDefault(require("yargs"));
-const paths_cnst_1 = require("../cnst/paths.cnst");
 const { prettierDirs, stylelintExtensions, lintExclude } = require('../../cfg/_cnst');
 exports.stylelintPaths = [
     // Everything inside these folders
@@ -21,7 +20,9 @@ function stylelintAll() {
             default: true,
         },
     }).argv;
-    const config = [`./stylelint.config.js`, `${paths_cnst_1.cfgDir}/stylelint.config.js`].find(f => node_fs_1.default.existsSync(f));
+    const config = [`./stylelint.config.js`].find(f => node_fs_1.default.existsSync(f));
+    if (!config)
+        return;
     const args = [
         fix ? `--fix` : '',
         `--allow-empty-input`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "13.55.0",
+  "version": "14.0.0",
   "scripts": {
     "prepare": "husky",
     "tsn-debug": "tsn testScript.ts",
@@ -31,23 +31,24 @@
   "dependencies": {
     "@commitlint/cli": "^19.0.0",
     "@commitlint/config-conventional": "^19.0.0",
+    "@eslint/js": "^9.7.0",
     "@naturalcycles/cli": "^1.0.0",
     "@naturalcycles/js-lib": "^14.0.0",
     "@naturalcycles/nodejs-lib": "^13.0.1",
     "@types/jest": "^29.0.0",
     "@types/node": "^20.1.0",
     "@types/yargs": "^16.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.0.1",
-    "@typescript-eslint/parser": "^7.0.1",
     "eslint": "^9.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^28.0.0",
     "eslint-plugin-jsdoc": "^48.0.1",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unicorn": "^54.0.0",
     "eslint-plugin-unused-imports": "^4.0.0",
     "eslint-plugin-vue": "^9.0.0",
     "expect-type": "^0.19.0",
+    "globals": "^15.8.0",
     "husky": "^9.0.2",
     "jest-junit": "^16.0.0",
     "lint-staged": "^15.0.1",
@@ -57,6 +58,7 @@
     "timekeeper": "^2.2.0",
     "ts-jest": "^29.0.0",
     "typescript": "^5.0.2",
+    "typescript-eslint": "^7.16.1",
     "yargs": "^17.0.0"
   },
   "devDependencies": {

package/readme.md

@@ -24,7 +24,7 @@ This unlocks all commands listed below, e.g:
 
 By default, it uses default configs for Prettier, ESLint, Stylelint, that are included in this
 package (for convenience). You can override them by putting your own `prettier.config.js`,
-`.eslintrc.js`, `stylelint.config.json` in the root folder of your project.
+`eslint.config.js`, `stylelint.config.json` in the root folder of your project.
 
 ## Conventions
 

package/cfg/eslint-vue2.config.js

@@ -1,32 +0,0 @@
-/**
- * @naturalcycles/dev-lib/cfg/eslint-vue2.config.js
- */
-
-module.exports = {
-  overrides: [
-    {
-      files: ['*.vue'],
-      extends: [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended-type-checked',
-        'plugin:@typescript-eslint/stylistic-type-checked',
-        'plugin:unicorn/recommended',
-        'plugin:vue/recommended',
-        './eslint-rules.js',
-        './eslint-vue-rules.js',
-        'prettier', // must go last
-      ],
-      env: {
-        browser: true,
-      },
-      parser: 'vue-eslint-parser',
-      parserOptions: {
-        parser: '@typescript-eslint/parser',
-        project: ['tsconfig.json'],
-        sourceType: 'module',
-        ecmaVersion: 'latest',
-        extraFileExtensions: ['.vue'],
-      },
-    },
-  ],
-}

package/cfg/eslint-vue3.config.js

@@ -1,32 +0,0 @@
-/**
- * @naturalcycles/dev-lib/cfg/eslint-vue3.config.js
- */
-
-module.exports = {
-  overrides: [
-    {
-      files: ['*.vue'],
-      extends: [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended-type-checked',
-        'plugin:@typescript-eslint/stylistic-type-checked',
-        'plugin:unicorn/recommended',
-        'plugin:vue/vue3-recommended',
-        './eslint-rules.js',
-        './eslint-vue-rules.js',
-        'prettier', // must go last
-      ],
-      env: {
-        browser: true,
-      },
-      parser: 'vue-eslint-parser',
-      parserOptions: {
-        parser: '@typescript-eslint/parser',
-        project: ['tsconfig.json'],
-        sourceType: 'module',
-        ecmaVersion: 'latest',
-        extraFileExtensions: ['.vue'],
-      },
-    },
-  ],
-}

package/cfg/init/.eslintrc.js

@@ -1,3 +0,0 @@
-module.exports = {
-  extends: './node_modules/@naturalcycles/dev-lib/cfg/eslint.config.js',
-}