arui-presets-lint 8.0.0-beta.2 → 8.0.0-beta.4

package/README.md

@@ -26,7 +26,7 @@
 
 Далее произвести следующие настройки:
 
-## Конфигурация всех линтеров через `package.json`:
+## Подключение конфигов через `package.json`:
 
 ```json
 {
@@ -43,15 +43,15 @@
 }
 ```
 
-## Конфигурация скриптов для запуска линтеров и форматтера в `package.json`:
+## Конфигурация скриптов для запуска в `package.json`:
 
 ```json
 {
     "scripts": {
-        "lint": "arui-presets-lint lint",
-        "lint:fix": "arui-presets-lint fix",
         "lint:css": "arui-presets-lint css",
         "lint:scripts": "arui-presets-lint scripts",
+        "lint": "arui-presets-lint lint",
+        "lint:fix": "arui-presets-lint fix",
     }
 }
 ```
@@ -59,35 +59,15 @@
 Если eslint/stylelint/prettier затрагивают файлы, над которыми вы не имеете контроль, вы можете исключить
 их с помощью [.eslintignore](https://eslint.org/docs/latest/user-guide/configuring/ignoring-code#the-eslintignore-file) / [.stylelintignore](https://stylelint.io/user-guide/ignore-code/#files-entirely) / [.prettierignore](https://prettier.io/docs/en/ignore.html#ignoring-files-prettierignore)
 
-> ⚠️ Внимание, .eslintignore [по умолчанию не подтягиватся в lint-staged](https://github.com/okonet/lint-staged#how-can-i-ignore-files-from-eslintignore)!
-
 Для запуска eslint/stylelint рекомендуется использовать флаг [--max-warnings](https://eslint.org/docs/latest/user-guide/command-line-interface#--max-warnings), который позволяет ограничить количество возникающих предупреждений.
 
-## Конфигурация [lint-staged](https://github.com/lint-staged/lint-staged):
-
-.lintstagedrc.js
-```js
-export default 'arui-presets-lint/lint-staged'
 ```
 
-## Конфигурация [git hooks](https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks)
-
-Для настройки git hooks рекомендуется использовать библиотеки [simple-git-hooks](https://github.com/toplenboren/simple-git-hooks), либо [husky@4](https://github.com/typicode/husky/tree/v4.3.8)
-
-
-### Пример конфигурации для simple-git-hooks:
-
-.simple-git-hooks.js
-```js
-module.exports = require('arui-presets-lint/hooks/simple-git-hooks');
-```
-
-
-### Пример конфигурации для husky@4:
+## Конфигурация [lefthook](https://github.com/evilmartians/lefthook)
 
-.huskyrc.js
-```js
-module.exports = require('arui-presets-lint/hooks/husky');
+```yaml
+extends:
+    - arui-presets-lint/lefthook/index.yml
 ```
 
 ## Настройка IDE:

package/V8_MIGRATION_GUIDE.md

@@ -3,4 +3,3 @@
 ```bash
 yarn remove eslint eslint-config-airbnb eslint-config-airbnb-typescript eslint-config-prettier eslint-import-resolver-typescript eslint-plugin-cypress eslint-plugin-dirnames eslint-plugin-import eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-simple-import-sort eslint-plugin-unicorn lint-staged prettier stylelint @typescript-eslint/parser @typescript-eslint/eslint-plugin kebab-case
 ```
-

package/cli/index.mjs

@@ -7,23 +7,43 @@ const prettierParams = '"./**/*.{ts,tsx,js,jsx,css,json}" --no-error-on-unmatche
 const commandsMap = {
     lint: `yarn lint:css && yarn lint:scripts && prettier --check ${prettierParams}`,
     fix: `yarn lint:css --fix && yarn lint:scripts --fix && prettier --write ${prettierParams}`,
-    css: 'stylelint "**/*.css" --allow-empty-input --ignore-path .gitignore --ignore-path .stylelintignore',
+    css: 'stylelint "**/*.css" --allow-empty-input --ignore-path .gitignore --ignore-path .stylelintignore --cache',
     scripts:
-        'eslint "**/*.{js,jsx,ts,tsx}" --ext .js,.jsx,.ts,.tsx --ignore-pattern=.gitignore,.eslintignore',
-    commit: 'commitlint',
-    stage: 'lint-staged',
+        'eslint "**/*.{js,jsx,ts,tsx}" --ext .js,.jsx,.ts,.tsx --ignore-pattern=.gitignore,.eslintignore --cache',
+    run: (...args) => args.join(' '),
 };
 
+const commands = Object.keys(commandsMap);
 const command = process.argv[2];
+const commandValue = commandsMap[command];
 const args = process.argv.slice(3);
 
-const exec = [commandsMap[command], ...args].join(' ');
+let exec;
+
+if (!command || !commands.includes(command)) {
+    // eslint-disable-next-line no-console
+    console.error(`Please specify one of available commands: ${commands.join(' ')}`);
+
+    process.exit(-1);
+}
+
+if (typeof commandValue === 'function') {
+    exec = commandValue(...args);
+} else {
+    exec = [commandValue, ...args].join(' ');
+}
 
 // eslint-disable-next-line no-console
 console.log(exec);
 
-await execaCommand(exec, {
-    shell: true,
-    stdio: ['pipe', 'inherit', 'inherit'],
-    preferLocal: true,
-});
+try {
+    await execaCommand(exec, {
+        shell: true,
+        preferLocal: true,
+        stdio: ['pipe', 'inherit', 'inherit'],
+    });
+} catch (error) {
+    // eslint-disable-next-line no-console
+    console.error(error.message);
+    process.exit(error.exitCode);
+}

package/lefthook/index.yml

@@ -0,0 +1,25 @@
+#   Refer for explanation to following link:
+#   https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md
+
+pre-push:
+    parallel: true
+    commands:
+        lint:
+            run: yarn lint
+pre-commit:
+    parallel: true
+    commands:
+        js:
+            glob: '*.{js,ts,jsx,tsx,mts,mjs,cjs,cts}'
+            run: npx --no-install prettier --write {staged_files} && npx --no-install eslint {staged_files} && git add {staged_files}
+        css:
+            glob: '*.{css}'
+            run: npx --no-install prettier --write {staged_files} && npx --no-install stylelint --fix {staged_files} && git add {staged_files}
+        json:
+            glob: '*.{json}'
+            run: npx --no-install prettier --write {staged_files} && git add {staged_files}
+commit-msg:
+    parallel: true
+    commands:
+        commitlint:
+            run: npx --no-install commitlint --edit $1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "arui-presets-lint",
-    "version": "8.0.0-beta.2",
+    "version": "8.0.0-beta.4",
     "description": "Config files for arui-apps",
     "author": "core-ds contributors",
     "license": "MIT",
@@ -24,11 +24,11 @@
         "eslint-plugin-react-hooks": "4.6.2",
         "eslint-plugin-simple-import-sort": "12.1.1",
         "eslint-plugin-unicorn": "55.0.0",
-        "execa": "9.4.0",
+        "execa": "9.4.1",
         "kebab-case": "1.0.0",
-        "lint-staged": "15.2.10",
+        "lefthook": "1.8.0",
         "prettier": "3.3.3",
-        "stylelint": "16.9.0"
+        "stylelint": "16.10.0"
     },
     "engines": {
         "node": ">=18.12.0"
@@ -43,30 +43,15 @@
         "@semantic-release/release-notes-generator": "12.1.0",
         "react": "18.3.1",
         "semantic-release": "22.0.12",
-        "simple-git-hooks": "2.11.1",
         "typescript": "5.5.4"
     },
     "scripts": {
-        "precommit": "node ./cli/index.mjs stage",
         "test": "yarn lint:scripts && eslint-config-prettier ./eslint/index.js && yarn lint:css && prettier --check \"./**/*.{ts,tsx,js,jsx,css,json}\"",
         "lint:css": "node ./cli/index.mjs css",
         "lint:scripts": "node ./cli/index.mjs scripts",
+        "lint": "node ./cli/index.mjs lint",
         "lint:fix": "node ./cli/index.mjs fix"
     },
-    "lint-staged": {
-        "**/*.{js,jsx,ts,tsx,json}": [
-            "prettier --write",
-            "eslint --fix --max-warnings=0"
-        ],
-        "stylelint/*.js": [
-            "prettier --write",
-            "yarn lint:css"
-        ]
-    },
-    "simple-git-hooks": {
-        "pre-commit": "yarn test",
-        "commit-msg": "yarn commitlint --edit $1"
-    },
     "prettier": "./prettier",
     "stylelint": {
         "extends": "./stylelint"
@@ -87,5 +72,5 @@
     "commitlint": {
         "extends": "./commitlint"
     },
-    "packageManager": "yarn@4.5.0"
+    "packageManager": "yarn@4.5.1"
 }

package/husky/index.js

@@ -1,7 +0,0 @@
-module.exports = {
-    hooks: {
-        'pre-commit': './node_modules/.bin/tsc --noEmit && yarn arui-presets-lint stage',
-        'pre-push': 'yarn lint',
-        'commit-msg': 'yarn arui-presets-lint commit -E HUSKY_GIT_PARAMS',
-    },
-};

package/lint-staged/index.mjs

@@ -1,5 +0,0 @@
-export default {
-    '*.{js,jsx,ts,tsx}': ['prettier --write', 'eslint'],
-    '*.css': ['prettier --write', 'stylelint'],
-    '*.json': ['prettier --write'],
-};