From de9c9f4aabf8282a314131ce213c163f327c1800 Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Mon, 18 Mar 2024 02:44:39 +0000 Subject: [PATCH] chore: tidying --- .vscode/settings.json | 4 +++- lint-staged.config.cjs | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 82aa3c1a3..1fc8321db 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,9 @@ { "typescript.tsdk": "node_modules/typescript/lib", + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit" + "source.fixAll": "explicit" }, "eslint.validate": ["typescript", "typescriptreact", "javascript", "javascriptreact"], "javascript.preferences.importModuleSpecifier": "non-relative", diff --git a/lint-staged.config.cjs b/lint-staged.config.cjs index 9f10dcc76..70025bfe4 100644 --- a/lint-staged.config.cjs +++ b/lint-staged.config.cjs @@ -1,15 +1,15 @@ const path = require('path'); -const buildEslintCommand = (filenames) => +const eslint = (filenames) => `eslint --fix ${filenames.map((f) => `"${path.relative(process.cwd(), f)}"`).join(' ')}`; -const buildPrettierCommand = (filenames) => +const prettier = (filenames) => `prettier --write ${filenames.map((f) => `"${path.relative(process.cwd(), f)}"`).join(' ')}`; /** @type {import('lint-staged').Config} */ module.exports = { - '**/*.{ts,tsx,cts,mts}': [buildEslintCommand, buildPrettierCommand], - '**/*.{js,jsx,cjs,mjs}': [buildPrettierCommand], - '**/*.{yml,mdx}': [buildPrettierCommand], + '**/*.{ts,tsx,cts,mts}': [eslint, prettier], + '**/*.{js,jsx,cjs,mjs}': [prettier], + '**/*.{yml,mdx}': [prettier], '**/*/package.json': 'npm run precommit', };