diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3064f44a7c80eabe68a7577b92a5c61cc4c6c0ad..b28fbd2fd069d86d7b1965bbbec4d76a4258862f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: run: npm ci - name: === Linting === - run: npm run test-lint + run: npm run lint unit: name: "Unit testing" diff --git a/package.json b/package.json index 19197b3c7a11865fb516ced3f39d58971dbeebbf..24f7deca9d0323e5451501f7bfc2b379c1ceadf3 100644 --- a/package.json +++ b/package.json @@ -54,14 +54,14 @@ }, "scripts": { "start": "npm run dev", - "test": "npm run test-lint && npm run test-unit", + "test": "npm run lint && npm run test-unit", "build": "rollup -c utils/build/rollup.config.js", "build-examples": "rollup -c utils/build/rollup.examples.config.js && echo '\nFormatting...' && eslint examples/js --ext js --ignore-pattern libs --ignore-pattern ifc --fix", "dev": "concurrently --names \"ROLLUP,HTTP\" -c \"bgBlue.bold,bgGreen.bold\" \"rollup -c utils/build/rollup.config.js -w -m inline\" \"servez -p 8080\"", - "lint-fix": "eslint src --ext js --fix && eslint examples/js examples/jsm --ext js --ignore-pattern libs --ignore-pattern ifc --fix", - "lint-docs": "eslint docs --ext html", + "lint": "eslint src --ext js", "lint-examples": "eslint examples/js examples/jsm --ext js --ignore-pattern libs --ignore-pattern ifc", - "test-lint": "eslint src --ext js", + "lint-fix": "npm run lint -- --fix && npm run lint-examples -- --fix", + "lint-docs": "eslint docs --ext html", "test-unit": "npm run unit --prefix test", "test-unit-examples": "npm run unit-examples --prefix test", "test-e2e": "node test/e2e/puppeteer.js",