diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index 4e1804a..0000000 --- a/.prettierignore +++ /dev/null @@ -1,2 +0,0 @@ -**/dist/** -pnpm-lock.yaml diff --git a/package.json b/package.json index 9ee4578..4524baf 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ "type": "module", "scripts": { "build": "pnpm --filter './packages/**' build", - "check:format": "prettier . --check --experimental-cli", + "check:format": "rs fmt --check", "check:spell": "pnpm dlx cspell && heading-case", "doc": "pnpm --dir website dev", "doc:build": "node --run build && pnpm --dir website build", - "format": "prettier . --write --experimental-cli && heading-case --write", + "format": "rs fmt && heading-case --write", "lint": "rs lint --type-check", "prepare": "node scripts/rs.js setup", "test": "pnpm --filter './packages/**' test" diff --git a/prettier.config.mjs b/prettier.config.mjs deleted file mode 100644 index 809ddb8..0000000 --- a/prettier.config.mjs +++ /dev/null @@ -1,6 +0,0 @@ -/** @type {import('prettier').Config} */ -export default { - plugins: ['prettier-plugin-packagejson'], - printWidth: 100, - singleQuote: true, -}; diff --git a/rstack.config.ts b/rstack.config.ts index 8a4bf2e..d38dd81 100644 --- a/rstack.config.ts +++ b/rstack.config.ts @@ -38,11 +38,15 @@ define.lint(async () => { ]; }); +define.fmt({ + ignorePatterns: ['**/dist/**', 'pnpm-lock.yaml'], + // TODO: Enable after rs fmt supports resolving Prettier plugins from the project root. + // plugins: ['prettier-plugin-packagejson'], + printWidth: 100, + singleQuote: true, +}); + define.staged({ - '*.{js,jsx,ts,tsx,mjs,cjs,mts,cts}': [ - 'rs lint --fix', - 'prettier --write --experimental-cli --no-error-on-unmatched-pattern', - ], - '*.{json,jsonc,md,mdx,css,html,yml,yaml}': - 'prettier --write --experimental-cli --no-error-on-unmatched-pattern', + '*.{js,jsx,ts,tsx,mjs,cjs,mts,cts}': ['rs lint --fix', 'rs fmt'], + '*.{json,jsonc,md,mdx,css,html,yml,yaml}': 'rs fmt', });