Update scripts and CI

binos30 · Jul 30, 2024 · 02510ae · 02510ae
1 parent b3b9ad6
commit 02510ae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
           key: prettier-main-cache
 
       - name: Run prettier
-        run: yarn prettier-ci
+        run: yarn prettier
 
       - name: Remove prettier cache
         if: github.event_name == 'push'
@@ -103,7 +103,10 @@ jobs:
         run: yarn rubocop-ci
 
       - name: Run Syntax Tree
-        run: yarn stree-ci
+        run: yarn stree
+
+      - name: Run Slim-Lint
+        run: yarn slim-lint
 
       - name: Run zeitwerk check
         run: bin/rails zeitwerk:check

diff --git a/.slim-lint.yml b/.slim-lint.yml
@@ -1,4 +1,4 @@
 linters:
   LineLength:
     enabled: true
-    max: 130
+    max: 135
diff --git a/package.json b/package.json
@@ -59,12 +59,14 @@
     "eslint": "eslint . --cache --cache-location .cache/eslint --report-unused-disable-directives",
     "eslint-fix": "eslint --cache --cache-location .cache/eslint --fix . --report-unused-disable-directives",
     "eslint-ci": "eslint . --cache --cache-strategy content --cache-location .cache/eslint --format gha",
-    "prettier-fix": "prettier --write --cache --cache-location .cache/prettier --ignore-unknown '**/*.{css,html,js,json,md,mjs,yml}'",
-    "prettier-ci": "prettier --check --cache --cache-location .cache/prettier --ignore-unknown '**/*.{css,html,js,json,md,mjs,yml}'",
+    "prettier-fix": "prettier --write --cache --cache-location .cache/prettier '**/*.{css,html,js,json,md,mjs,yml}'",
+    "prettier": "prettier --check --cache --cache-location .cache/prettier '**/*.{css,html,js,json,md,mjs,yml}'",
+    "rubocop": "bin/rubocop",
     "rubocop-fix": "bin/rubocop -a",
     "rubocop-ci": "bin/rubocop -f github",
+    "slim-lint": "slim-lint 'app/views/**/*.slim'",
     "stree-fix": "bin/bundle exec stree write '**/*.rb'",
-    "stree-ci": "bin/bundle exec stree check '**/*.rb'",
+    "stree": "bin/bundle exec stree check '**/*.rb'",
     "postinstall": "husky"
   },
   "lint-staged": {
@@ -73,7 +75,8 @@
       "./bin/rubocop -a"
     ],
     "spec/**/*_spec.rb": "./bin/rspec",
-    "**/*.{css,html,js,json,md,mjs,yml}": "./node_modules/.bin/prettier --write --cache --cache-location .cache/prettier --ignore-unknown",
+    "app/views/**/*.slim": "slim-lint",
+    "**/*.{css,html,js,json,md,mjs,yml}": "./node_modules/.bin/prettier --write --cache --cache-location .cache/prettier",
     "**/*.{cjs,js,mjs}": "./node_modules/.bin/eslint --cache --cache-location .cache/eslint --fix --report-unused-disable-directives"
   },
   "packageManager": "yarn@4.3.1"