diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml index ba4f0a3020..d346af876c 100644 --- a/.github/workflows/formatting.yaml +++ b/.github/workflows/formatting.yaml @@ -14,18 +14,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actionsx/prettier@v2 - with: - args: --config "${{ github.workspace }}/.prettierrc.toml" --write "**/*.{js,mjs,cjs,jsx,ts,tsx}" - # Prettier has no diff view so we must make one ourselves - # https://github.com/prettier/prettier/issues/6885 - - run: | - git diff - if [[ -n "$(git status --porcelain)" ]]; then - exit 1 - fi - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.11 - name: Install dependencies diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index eb67706035..a928d48532 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,3 +44,8 @@ repos: exclude_types: - json - javascript + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v3.1.0 + hooks: + - id: prettier + files: ".*\\.(js|mjs|cjs|jsx|ts|tsx)$" diff --git a/extensions/wasm_bindgen/rules_js/test/hello_world_wasm_test.js b/extensions/wasm_bindgen/rules_js/test/hello_world_wasm_test.js index 61fc383955..3621eeaa2f 100644 --- a/extensions/wasm_bindgen/rules_js/test/hello_world_wasm_test.js +++ b/extensions/wasm_bindgen/rules_js/test/hello_world_wasm_test.js @@ -21,10 +21,10 @@ const main = async function (typ, dir) { }; ["bundler", "web", "deno", "nomodules", "nodejs"].forEach((typ) => { - main(typ, process.argv.length > 2 ? process.argv[2] : "").catch(function ( - err, - ) { - console.error(err); - process.exit(1); - }); + main(typ, process.argv.length > 2 ? process.argv[2] : "").catch( + function (err) { + console.error(err); + process.exit(1); + }, + ); });