@naturalcycles/dev-lib 13.42.1 → 13.43.0

package/cfg/_cnst.js

@@ -7,5 +7,10 @@ module.exports = {
   // everything that prettier supports:
   prettierExtensionsAll: 'ts,tsx,css,scss,js,jsx,json,md,graphql,yml,yaml,html,vue',
   stylelintExtensions: 'css,scss',
-  lintExclude: ['./**/__exclude/**', './docs/.vuepress/dist/**', './CHANGELOG.md'],
+  lintExclude: [
+    './**/__exclude/**',
+    './docs/.vitepress/dist/**',
+    './docs/.vitepress/cache/**',
+    './CHANGELOG.md',
+  ],
 }

package/cfg/lint-staged.config.js

@@ -31,7 +31,11 @@ const eslintConfigPathRoot =
 
 const prettierCmd = `prettier --write --config ${prettierConfigPath}`
 const eslintCmd = `eslint --fix`
-const styleLintCmd = `stylelint --fix --config ${stylelintConfigPath}`
+
+const stylelintExists =
+  fs.existsSync('node_modules/stylelint') &&
+  fs.existsSync('node_modules/stylelint-config-standard-scss')
+const stylelintCmd = stylelintExists ? `stylelint --fix --config ${stylelintConfigPath}` : undefined
 
 const linters = {
   // *.{ts,tsx,vue} files: eslint, prettier
@@ -64,7 +68,7 @@ const linters = {
   [`./{${prettierDirs}}/**/*.{${stylelintExtensions}}`]: match => {
     const filesList = micromatch.not(match, lintExclude).join(' ')
     if (!filesList) return []
-    return [styleLintCmd, prettierCmd].map(s => `${s} ${filesList}`)
+    return [stylelintCmd, prettierCmd].filter(Boolean).map(s => `${s} ${filesList}`)
   },
 
   // Files in root dir

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

@@ -25,14 +25,6 @@ async function lintAllCommand() {
             default: false,
         },
     }).argv;
-    if (canRunBinary('actionlint')) {
-        const st = Date.now();
-        (0, nodejs_lib_1.execVoidCommandSync)(`actionlint`);
-        console.log(`${(0, nodejs_lib_1.boldGrey)('actionlint')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(st))}`);
-    }
-    else {
-        console.log(`actionlint is not installed and won't be run.\nThis is how to install it: https://github.com/rhysd/actionlint/blob/main/docs/install.md`);
-    }
     const hadChangesBefore = (0, nodejs_lib_1.gitHasUncommittedChanges)();
     // We run eslint BEFORE Prettier, because eslint can delete e.g unused imports.
     await (0, eslint_all_command_1.eslintAllCommand)();
@@ -41,10 +33,8 @@ async function lintAllCommand() {
         (0, stylelint_util_1.stylelintAll)();
     }
     (0, prettier_util_1.runPrettier)();
-    if (node_fs_1.default.existsSync(`node_modules/@naturalcycles/ktlint`)) {
-        const ktlintLib = require('@naturalcycles/ktlint');
-        await ktlintLib.ktlintAll();
-    }
+    runActionLint();
+    await runKTLint();
     console.log(`${(0, nodejs_lib_1.boldGrey)('lint-all')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
     if (commitOnChanges || failOnChanges) {
         // detect changes
@@ -69,6 +59,22 @@ async function lintAllCommand() {
     }
 }
 exports.lintAllCommand = lintAllCommand;
+async function runKTLint() {
+    if (node_fs_1.default.existsSync(`node_modules/@naturalcycles/ktlint`)) {
+        const ktlintLib = require('@naturalcycles/ktlint');
+        await ktlintLib.ktlintAll();
+    }
+}
+function runActionLint() {
+    if (canRunBinary('actionlint')) {
+        const started = Date.now();
+        (0, nodejs_lib_1.execVoidCommandSync)(`actionlint`);
+        console.log(`${(0, nodejs_lib_1.boldGrey)('actionlint')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+    }
+    else {
+        console.log(`actionlint is not installed and won't be run.\nThis is how to install it: https://github.com/rhysd/actionlint/blob/main/docs/install.md`);
+    }
+}
 function canRunBinary(name) {
     try {
         (0, node_child_process_1.execSync)(`which ${name}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "13.42.1",
+  "version": "13.43.0",
   "scripts": {
     "prepare": "husky install",
     "tsn-debug": "tsn testScript.ts",

package/readme.md

@@ -52,7 +52,7 @@ All files are linted and _prettified_ upon commit (using `husky`, `lint-staged`
   - `/jest/unit.xml`
   - `/jest/integration.xml`
   - `/coverage-integration`
-- `/docs` for Docs (convention followed by Github Pages, Conventional commits, Vuepress, etc)
+- `/docs` for Docs (convention followed by Github Pages, Conventional commits, Vitepress, etc)
 
 ### Yarn commands