move eslint into single lint script

teambtcmap · Dec 14, 2023 · d38e44c · d38e44c
1 parent 4370980
commit d38e44c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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",