@diplodoc/lint 1.0.0 → 1.0.2

package/.github/workflows/tests.yml

@@ -0,0 +1,32 @@
+name: Tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: ['**']
+
+jobs:
+  test:
+    name: Node v${{ matrix.node-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        node-version: [18.x]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          os: ${{ matrix.os }}
+          cache: 'npm'
+      - name: Install packages for project
+        run: npm ci
+      - name: Run tests
+        run: |
+          cd test
+          npm start

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [1.0.2](https://github.com/diplodoc-platform/lint/compare/v1.0.1...v1.0.2) (2024-08-11)
+
+
+### Bug Fixes
+
+* Change init staps sequence ([7f8aaa5](https://github.com/diplodoc-platform/lint/commit/7f8aaa54f758dbfe58adbbda6ec0a9e5cb556baa))
+* Do not rewrite husky npm script ([f0b1b85](https://github.com/diplodoc-platform/lint/commit/f0b1b85e2ba86cafc85d91f844ebb09c081c8ed2))
+* Make internal bins force executable ([d69f85e](https://github.com/diplodoc-platform/lint/commit/d69f85e1e60e0cd6fb9f7c3b0648785191eb065d))
+* Unignore rc configs ([cf201c6](https://github.com/diplodoc-platform/lint/commit/cf201c694ee4de91d6c7a98326ec07ee52254fb8))
+
+## [1.0.1](https://github.com/diplodoc-platform/lint/compare/v1.0.0...v1.0.1) (2024-08-11)
+
+
+### Bug Fixes
+
+* Add special rules for eslintrc.json ([bb4b615](https://github.com/diplodoc-platform/lint/commit/bb4b615e75c5099f343871fb6fcbea4ab119d14a))
+* Extend lint-staged files lists ([b0229aa](https://github.com/diplodoc-platform/lint/commit/b0229aa0bb779d26a66717326c53a620e258d277))
+* Fix install script ([9ea0d07](https://github.com/diplodoc-platform/lint/commit/9ea0d07cba75b0ef736477280ce92528726e2e5a))
+* Fix shell script ([8743493](https://github.com/diplodoc-platform/lint/commit/8743493d09b067dd06d4d16e53288a9d2f1a7763))
+* Fix windows specific ([c96a28c](https://github.com/diplodoc-platform/lint/commit/c96a28c10b393ff19000e4db37ce8d3ad7cdb11a))
+* Fix Windows specific ([e4531c4](https://github.com/diplodoc-platform/lint/commit/e4531c46aaae4d3d27d4f1d2ecc4e8baab373730))
+* Proxy all lint binary ([e9615cd](https://github.com/diplodoc-platform/lint/commit/e9615cdba5394b5433a3e523e2468754a04724a8))
+* Proxy husky bin ([3ff236a](https://github.com/diplodoc-platform/lint/commit/3ff236a6561721e769b4b242f17ede10f115de61))
+* Remove useless install command ([c9fce40](https://github.com/diplodoc-platform/lint/commit/c9fce40c67482ac04a145d0920c0bd1fc9edaf97))
+* Skip useless css linting for node projects ([603d093](https://github.com/diplodoc-platform/lint/commit/603d09384f40e514acd795e708ca987845c52e5c))
+* Use update instead of init on lint run ([ec23ed1](https://github.com/diplodoc-platform/lint/commit/ec23ed1392c5ccba58318f5a975e28baef6a3458))
+
 ## 1.0.0 (2024-08-10)
 
 

package/README.md

@@ -16,7 +16,7 @@ npm install --save-dev @diplodoc/lint
 Add initial configuration
 
 ```sh
-npx @diplodoc/lint install
+npx @diplodoc/lint init
 git add --all && git commit -m 'chore: init lint'
 ```
 

package/bin/eslint

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+BINDIR=$(dirname $(node -pe "require.resolve('eslint/package.json')"))
+
+if [[ -z "$BINDIR" ]]; then
+  echo "Required package 'eslint' not found"
+  exit 1
+fi
+
+# Redirect to original eslint bin
+chmod +x $BINDIR/bin/eslint.js
+$BINDIR/bin/eslint.js $@

package/bin/husky

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+BINDIR=$(dirname $(node -pe "require.resolve('husky')"))
+
+if [[ -z "$BINDIR" ]]; then
+  echo "Required package 'husky' not found"
+  exit 1
+fi
+
+# Redirect to original husky bin
+chmod +x $BINDIR/bin.js
+$BINDIR/bin.js $@

package/bin/lint

@@ -2,15 +2,15 @@
 
 set -e
 
-BINDIR=$(dirname $0)
-SRCDIR=$(dirname $(dirname $(node -pe "require('fs').realpathSync('$0')")))
+BINDIR=$(dirname "$0")
+SRCDIR=$(dirname $(dirname $(node -pe "require('fs').realpathSync('${0//\\//}')")))
 
 while (( $# )); do
     case "$1" in
-        --fix ) :
+        fix ) :
             FIX=1
             ;;
-        install|init ) :
+        init ) :
             INIT=1
             ;;
         update ) :
@@ -20,19 +20,19 @@ while (( $# )); do
     shift
 done
 
-if [[ -n $INIT || -n $UPDATE]]; then
+if [[ -n "$INIT$UPDATE" ]]; then
+  if [[ -n $INIT ]]; then
+    echo "[@diplodoc/lint] Extend package.json configuration"
+    node "$SRCDIR/scripts/modify-package.js"
+
+    $BINDIR/husky init
+  fi
+
   echo "[@diplodoc/lint] Add initial lint configs"
-  cp -r "$SRCDIR/scaffolding/" .
+  cp -a "$SRCDIR/scaffolding/." .
 
   echo "[@diplodoc/lint] Extend .ignore configuration"
   node "$SRCDIR/scripts/modify-ignore.js"
-fi
-
-if [[ -n $INIT ]]; then
-  echo "[@diplodoc/lint] Extend package.json configuration"
-  node "$SRCDIR/scripts/modify-package.js"
-
-  $BINDIR/husky install
 
   exit 0
 fi
@@ -40,17 +40,19 @@ fi
 if [[ -n $FIX ]]; then
   echo "Run linters in fix mode"
 
-  $BINDIR/eslint '**/*.{js,jsx,ts,tsx}' --fix
-  $BINDIR/prettier --write 'src/**/*.{js,jsx,ts,tsx}'
-  $BINDIR/stylelint src/**/*.scss --fix
+  $BINDIR/eslint '**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}' --fix
+  $BINDIR/prettier --write '**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}'
+  if [[ -n $(find . -type f -name '*.css' -name '*.scss' | grep -vwFf .stylelintignore) ]]; then
+    $BINDIR/stylelint '**/*.{css,scss}' --fix
+  fi
 
   exit 0
 fi
 
 echo "Run linters"
 
-$BINDIR/eslint '**/*.{js,jsx,ts,tsx}'
-$BINDIR/prettier --check 'src/**/*.{js,jsx,ts,tsx}'
-$BINDIR/stylelint src/**/*.scss
-
-
+$BINDIR/eslint '**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}'
+$BINDIR/prettier --check '**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}'
+if [[ -n $(find . -type f -name '*.css' -name '*.scss' | grep -vwFf .stylelintignore) ]]; then
+  $BINDIR/stylelint '**/*.{css,scss}'
+fi

package/bin/lint-staged

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+BINDIR=$(dirname $(node -pe "require.resolve('lint-staged/package.json')"))
+
+if [[ -z "$BINDIR" ]]; then
+  echo "Required package 'lint-staged' not found"
+  exit 1
+fi
+
+# Redirect to original lint-staged bin
+chmod +x $BINDIR/bin/lint-staged.js
+$BINDIR/bin/lint-staged.js $@

package/bin/prettier

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+BINDIR=$(dirname $(node -pe "require.resolve('prettier')"))
+
+if [[ -z "$BINDIR" ]]; then
+  echo "Required package 'prettier' not found"
+  exit 1
+fi
+
+# Redirect to original prettier bin
+chmod +x $BINDIR/bin/prettier.cjs
+$BINDIR/bin/prettier.cjs $@

package/bin/stylelint

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+BINDIR=$(dirname $(node -pe "require.resolve('stylelint/package.json')"))
+
+if [[ -z "$BINDIR" ]]; then
+  echo "Required package 'stylelint' not found"
+  exit 1
+fi
+
+# Redirect to original stylelint bin
+chmod +x $BINDIR/bin/stylelint.mjs
+$BINDIR/bin/stylelint.mjs $@

package/bin/svgo

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+BINDIR=$(dirname $(node -pe "require.resolve('svgo/package.json')"))
+
+if [[ -z "$BINDIR" ]]; then
+  echo "Required package 'svgo' not found"
+  exit 1
+fi
+
+# Redirect to original svgo bin
+chmod +x $BINDIR/bin/svgo
+$BINDIR/bin/svgo $@

package/eslint-common-config.js

@@ -4,9 +4,17 @@ module.exports = {
         '@gravity-ui/eslint-config',
         process.env.npm_command && '@gravity-ui/eslint-config/prettier',
     ].filter(Boolean),
-    parserOptions: {
-        project: ["./tsconfig.json"]
-    },
+    overrides: [{
+        files: [
+            '.eslintrc.js',
+            '.prettierrc.js',
+            '.stylelintrc.js',
+            '.lintstagedrc.js',
+        ],
+        env: {
+            node: true,
+        },
+    }],
     rules: {
         'callback-return': 'off',
         'consistent-return': 'off',

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "@diplodoc/lint",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Diplodoc platform internal utility set for linting",
   "bin": {
-    "lint": "./bin/lint"
+    "lint": "./bin/lint",
+    "husky": "./bin/husky",
+    "eslint": "./bin/eslint",
+    "prettier": "./bin/prettier",
+    "stylelint": "./bin/stylelint",
+    "lint-staged": "./bin/lint-staged",
+    "svgo": "./bin/svgo"
   },
   "scripts": {
-    "test": "exit 0"
+    "test": "cd test && npm start"
   },
   "exports": {
     "./eslint-config": "./eslint-common-config.js",

package/scaffolding/.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npm run pre-commit

package/scaffolding/.lintstagedrc.js

@@ -1,6 +1,6 @@
 module.exports = {
-    '**/*.{js,jsx,ts,tsx}': ['prettier --write', 'eslint --max-warnings=0 --fix'],
+    '**/*.{js,mjs,cjs,jsx,ts,mts,cts,tsx}': ['prettier --write', 'eslint --max-warnings=0 --fix'],
     '**/*.{css,scss}': ['prettier --write', 'stylelint --fix'],
     '**/*.{json,yaml,yml,md}': ['prettier --write'],
-    '**/*.{svg}': ['npm run svgo'],
+    '**/*.{svg}': ['svgo'],
 };

package/scripts/modify-ignore.js

@@ -1,4 +1,5 @@
-const {readFileSync, writeFileSync} = require('fs');
+const {join} = require('node:path');
+const {readFileSync, writeFileSync} = require('node:fs');
 
 const SYSTEM = [
     '.idea',
@@ -23,13 +24,6 @@ const ignores = {
         ...SYSTEM,
         ...INSTALL,
         ...ARTIFACTS,
-        '/.eslintrc.js',
-        '/.prettierrc.js',
-        '/.stylelintrc.js',
-        '/.lintstagedrc.js',
-        // '/.eslinignore',
-        // '/.prettierignore',
-        // '/.stylelintignore',
     ],
     '.eslintignore': [
         ...SYSTEM,
@@ -49,7 +43,7 @@ const ignores = {
 };
 
 for (const [file, list] of Object.entries(ignores)) {
-    const filename = process.cwd() + '/' + file;
+    const filename = join(process.cwd(), file);
 
     let source;
     try {

package/scripts/modify-package.js

@@ -1,5 +1,7 @@
-const filename = process.cwd() + '/package.json';
-const {readFileSync, writeFileSync} = require('fs');
+const {join} = require('node:path');
+const {readFileSync, writeFileSync} = require('node:fs');
+
+const filename = join(process.cwd(), 'package.json');
 
 let pkg;
 try {
@@ -8,20 +10,19 @@ try {
     throw 'Unable to modify ' + filename;
 }
 
-function configure(command, impl) {
+function configure(command, impl, strict = true) {
     if (pkg.scripts[command]) {
-        if (pkg.scripts[command] !== impl) {
+        if (pkg.scripts[command] !== impl && strict) {
             throw `Lint command '${command}' already configured with different program`;
         }
     } else {
         pkg.scripts[command] = impl;
-        console.log('=> Add', command, 'script');
+        console.log('[@diplodoc/lint]', '=> Add', command, 'script');
     }
 }
 
-configure('lint', 'lint init && lint');
-configure('lint:fix', 'lint init && lint --fix');
-configure('pre-commit', 'lint init && lint-staged');
-configure('prepare', 'husky install || true');
+configure('lint', 'lint update && lint');
+configure('lint:fix', 'lint update && lint fix');
+configure('pre-commit', 'lint update && lint-staged');
 
 writeFileSync(filename, JSON.stringify(pkg, null, 2), 'utf8');