From cb5ca1f13521928ac848c4be536ec324a3176fc4 Mon Sep 17 00:00:00 2001 From: Rami Yushuvaev Date: Tue, 4 Nov 2025 15:15:38 +0000 Subject: [PATCH 1/3] Organize lint scripts --- .travis.yml | 2 +- package.json | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58f3c835..bd67258d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,4 +56,4 @@ script: - find src/php/ \( -name '*.php' \) -exec php -lf {} \; # Run tests - - npm run test + - npm run lint diff --git a/package.json b/package.json index 7d34e093..257b09fe 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "test": "tests" }, "scripts": { - "test": "npm run stylelint && eslint && npm run phpcs", "test:playwright": "playwright test -c tests/playwright/playwright.config.ts", "test:playwright:debug": "npm run test:playwright -- --debug", "test:playwright:ui": "npm run test:playwright -- --ui", @@ -20,9 +19,13 @@ "build": "webpack", "watch": "webpack --watch", "bundle": "ts-node scripts/bundle.ts", - "phpcs": "src/vendor/bin/phpcs -s --colors ./src/phpcs.xml", - "phpcbf": "src/vendor/bin/phpcbf ./src/phpcs.xml", - "stylelint": "stylelint --fix 'src/css/**/*.scss'", + "lint": "npm run lint-styles && npm run lint-js && npm run lint-php", + "lint-styles": "stylelint 'src/css/**/*.scss'", + "lint-styles-fix": "stylelint --fix 'src/css/**/*.scss'", + "lint-js": "eslint", + "lint-js-fix": "eslint --fix", + "lint-php": "src/vendor/bin/phpcs -s --colors ./src/phpcs.xml", + "lint-php-fix": "src/vendor/bin/phpcbf ./src/phpcs.xml", "version": "ts-node scripts/version.ts", "version-dev": "npm version --git-tag-version=false --preid=dev", "version-alpha": "npm version --git-tag-version=false --preid=alpha", From 9a0f70c90529eacd4f7ae6a91452e7084e8a3310 Mon Sep 17 00:00:00 2001 From: Rami Yushuvaev Date: Wed, 5 Nov 2025 15:10:30 +0200 Subject: [PATCH 2/3] Apply suggestion from @louiswol94 Co-authored-by: Louis Wolmarans --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd67258d..e2bcb26b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,5 +55,5 @@ script: - find . -maxdepth 1 \( -name '*.php' \) -exec php -lf {} \; - find src/php/ \( -name '*.php' \) -exec php -lf {} \; - # Run tests + # Run linters - npm run lint From 78b15c98ca1bf2ca2c8b4d900dcafede77714009 Mon Sep 17 00:00:00 2001 From: Rami Yushuvaev Date: Thu, 6 Nov 2025 09:08:36 +0200 Subject: [PATCH 3/3] naming convention --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 257b09fe..f7807da7 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,13 @@ "build": "webpack", "watch": "webpack --watch", "bundle": "ts-node scripts/bundle.ts", - "lint": "npm run lint-styles && npm run lint-js && npm run lint-php", - "lint-styles": "stylelint 'src/css/**/*.scss'", - "lint-styles-fix": "stylelint --fix 'src/css/**/*.scss'", - "lint-js": "eslint", - "lint-js-fix": "eslint --fix", - "lint-php": "src/vendor/bin/phpcs -s --colors ./src/phpcs.xml", - "lint-php-fix": "src/vendor/bin/phpcbf ./src/phpcs.xml", + "lint": "npm run lint:styles && npm run lint:js && npm run lint:php", + "lint:styles": "stylelint 'src/css/**/*.scss'", + "lint:styles:fix": "stylelint --fix 'src/css/**/*.scss'", + "lint:js": "eslint", + "lint:js:fix": "eslint --fix", + "lint:php": "src/vendor/bin/phpcs -s --colors ./src/phpcs.xml", + "lint:php:fix": "src/vendor/bin/phpcbf ./src/phpcs.xml", "version": "ts-node scripts/version.ts", "version-dev": "npm version --git-tag-version=false --preid=dev", "version-alpha": "npm version --git-tag-version=false --preid=alpha",