From d38e44c5b65136d40fc6b9332966f93f9afccfb9 Mon Sep 17 00:00:00 2001 From: secondl1ght Date: Wed, 13 Dec 2023 23:03:28 -0700 Subject: [PATCH] move eslint into single lint script --- .github/workflows/lint-format-build.yml | 5 +---- package.json | 5 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint-format-build.yml b/.github/workflows/lint-format-build.yml index adfb850f..e124fbc6 100644 --- a/.github/workflows/lint-format-build.yml +++ b/.github/workflows/lint-format-build.yml @@ -12,10 +12,7 @@ jobs: - name: install modules run: yarn - - name: run eslint - run: yarn eslint - - - name: run prettier + - name: run prettier and eslint run: yarn lint - name: run check diff --git a/package.json b/package.json index 934fde3b..a3071333 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,8 @@ "preview": "vite preview", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", - "lint": "prettier --plugin=prettier-plugin-svelte --plugin=prettier-plugin-tailwindcss --check .", - "format": "prettier --plugin=prettier-plugin-svelte --plugin=prettier-plugin-tailwindcss --write .", - "eslint": "npx eslint src/" + "lint": "prettier --plugin=prettier-plugin-svelte --plugin=prettier-plugin-tailwindcss --check . && npx eslint src/", + "format": "prettier --plugin=prettier-plugin-svelte --plugin=prettier-plugin-tailwindcss --write ." }, "devDependencies": { "@sveltejs/adapter-auto": "^2.1.1",