chore: format using Make (#1022)

Co-authored-by: ory-bot <[email protected]>

.github/workflows/ci.yaml

@@ -23,8 +23,6 @@ jobs:
           go-version: 1.19
       - name: Lint buf
         run: make buf-lint
-      - name: check prettier format
-        run: npm ci && npm run format:check
       - run: go list -json > go.list
       - name: Run nancy
         uses: sonatype-nexus-community/[email protected]

.github/workflows/format.yml

@@ -0,0 +1,17 @@
+name: Format
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.19
+      - run: make format
+      - name: Indicate formatting issues
+        run: git diff HEAD --exit-code --color

Makefile

@@ -39,8 +39,9 @@ $(foreach dep, $(BREW_DEPENDENCIES), $(eval $(call make-brew-dependency,$(dep)))
 tools/protobuf: tools/brew Makefile
 		HOMEBREW_NO_AUTO_UPDATE=1 brew install [email protected]
 
-node_modules: package.json package-lock.json Makefile
+node_modules: package-lock.json
 		npm ci
+		touch node_modules
 
 .PHONY: tools/brew
 tools/brew:
@@ -54,7 +55,7 @@ tools/brew:
 .PHONY: format
 format: tools/goimports node_modules
 		goimports -w -local github.com/ory/keto *.go internal cmd contrib ketoctx ketoapi embedx
-		npm run format
+		npm exec -- prettier --write .
 
 .PHONY: install
 install:

package.json

@@ -8,8 +8,6 @@
   },
   "scripts": {
     "doctoc": "doctoc README.md",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
     "openapi-generator-cli": "openapi-generator-cli"
   },
   "prettier": "ory-prettier-styles",
@@ -22,7 +20,7 @@
     "doctoc": "^2.0.1",
     "opencollective": "^1.0.3",
     "ory-prettier-styles": "^1.2.0",
-    "prettier": "^2.7.1",
+    "prettier": "2.7.1",
     "prettier-plugin-packagejson": "^2.2.18"
   },
   "collective": {