From 4267f3fe6cc5eaaa546a444f9b96ee937a189bd7 Mon Sep 17 00:00:00 2001
From: Rumperuu <me+git@bengoldsworthy.net>
Date: Mon, 26 Apr 2021 23:03:58 +0100
Subject: [PATCH] ci: clean up NPM scripts a bit

---
 package.json | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 1497952..e48a57c 100644
--- a/package.json
+++ b/package.json
@@ -2,22 +2,20 @@
   "name": "footnotes",
   "scripts": {
     "cm": "cz",
-    "format": "npm run format:js",
-    "format:fix": "npm run format:js:fix",
     "format:js": "prettier './src/**/*.js'",
     "format:js:fix": "npm run format:js -- --write",
-    "lint": "npm run lint:js && npm run lint:css && npm run lint:md && npm run lint:html",
-    "lint:fix": "npm run lint:js:fix && npm run lint:css:fix && npm run lint:md:fix",
+    "lint": "npm run lint:js && npm run lint:css && npm run lint:md && npm run lint:html && composer run lint",
+    "lint:fix": "npm run lint:js:fix && npm run lint:css:fix && npm run lint:md:fix && composer run lint:fix",
     "lint:php": "composer run lint:php",
     "lint:php:fix": "composer run lint:php:fix",
-    "lint:js": "eslint \"./src/**/*.js\"",
-    "lint:js:fix": "npm run lint:js -- --fix",
+    "lint:js": "npm run format:js && eslint \"./src/**/*.js\"",
+    "lint:js:fix": "npm run format:js:fix && npm run lint:js -- --fix",
     "lint:css": "stylelint \"./src/**/*.css\"",
     "lint:css:fix": "npm run lint:css -- --fix",
     "lint:md": "markdownlint '*.md'",
     "lint:md:fix": "npm run lint:md -- --fix",
     "lint:html": "htmlhint ./src/**/*.html",
-    "validate": "npm run validate:json && npm run validate:yaml",
+    "validate": "npm run validate:yaml",
     "validate:yaml": "yaml-validator ./.github/workflows/*.yml",
     "minify": "npm run minify:css && npm run minify:js",
     "minify:css": "for f in ./dist/*/css/*.css; do echo \"Minifying $f...\"; minify $f > $(dirname $f)/$(basename $f .css).min.css; done",