Update prettier precommit and ci rules (pyodide#1747)

Author: Hood Chatham

.pre-commit-config.yaml

@@ -1,33 +1,38 @@
 exclude: '^.*patches|.*\.cgi$'
 default_language_version:
-    python : "3.9"
+  python: "3.9"
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0
     hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
--   repo: https://github.com/psf/black
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/psf/black
     rev: 20.8b1
     hooks:
-    -   id: black
--   repo: https://gitlab.com/pycqa/flake8
+      - id: black
+  - repo: https://gitlab.com/pycqa/flake8
     rev: 3.7.8
     hooks:
-    -   id: flake8
+      - id: flake8
         types: [file, python]
         # only check for unused imports, as the rest is done by black
         args: [--select=F401]
--   repo: https://github.com/pre-commit/mirrors-mypy
+  - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v0.812
     hooks:
-     -  id: mypy
+      - id: mypy
         args:
           - --ignore-missing-imports
--   repo: local
+  - repo: local
     hooks:
-    -   id: clang-format
+      - id: clang-format
         name: clang-format-6.0
         language: system
         entry: ./tools/clang-format-precommit.sh
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: "v2.3.2" # Use the sha / tag you want to point at
+    hooks:
+      - id: prettier

Makefile

@@ -151,8 +151,7 @@ lint: node_modules/.installed
 	find src -type f -regex '.*\.\(c\|h\)' \
 		| xargs clang-format-6.0 -output-replacements-xml \
 		| (! grep '<replacement ')
-	npx prettier --check `find src -type f -name '*.js' -not -name '*.gen.js'`
-	npx prettier --check `find src -type f -name '*.html'`
+	npx prettier --check src --ignore-path '*.gen.*'
 	black --check .
 	mypy --ignore-missing-imports    \
 		pyodide-build/pyodide_build/ \

src/js/index.test-d.ts

@@ -76,10 +76,10 @@ async function main() {
   expectType<void>(px.destroy());
   expectType<any>(px.toJs());
   expectType<any>(px.toJs({}));
-  expectType<any>(px.toJs({depth : 10}));
-  expectType<any>(px.toJs({create_pyproxies : false}));
-  expectType<any>(px.toJs({create_pyproxies : true}));
-  expectType<any>(px.toJs({pyproxies : []}));
+  expectType<any>(px.toJs({ depth: 10 }));
+  expectType<any>(px.toJs({ create_pyproxies: false }));
+  expectType<any>(px.toJs({ create_pyproxies: true }));
+  expectType<any>(px.toJs({ pyproxies: [] }));
   expectType<string>(px.toString());
   expectType<string>(px.type);
 

tools/clang-format-precommit.sh

@@ -5,10 +5,3 @@ if [ -n "$FILES" ]; then
     clang-format-6.0 -verbose -i $FILES
     git add $FILES
 fi
-
-FILES=$(git diff --cached --name-only *.js '*.html')
-if [ -n "$FILES" ]; then
-    # Change files, stage changes
-    ./node_modules/.bin/prettier --write $FILES
-    git add $FILES
-fi