Skip to content

Commit c74b7a6

Browse files
jonas-jonasory-bot
authored andcommitted
chore: remove all npm i steps from formatting
GitOrigin-RevId: edf5d68757acabb28f9ca1513783de7c662182c8
1 parent e4782db commit c74b7a6

File tree

8 files changed

+45
-204
lines changed

8 files changed

+45
-204
lines changed

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,15 @@ test-refresh:
8282
authors: # updates the AUTHORS file
8383
curl --retry 7 --retry-connrefused https://raw.githubusercontent.com/ory/ci/master/authors/authors.sh | env PRODUCT="Ory Hydra" bash
8484

85+
PRETTIER_VERSION=$(shell cat package.json | jq -r '.devDependencies["prettier"] // .dependencies["prettier"]')
86+
8587
# Formats the code
8688
.PHONY: format
87-
format: .bin/ory node_modules
89+
format: .bin/ory
8890
ory dev headers copyright --type=open-source --exclude=internal/httpclient --exclude=oryx
8991
go tool goimports -w --local github.com/ory .
90-
npm exec -- prettier --write .
92+
@echo "Prettier Version: $(PRETTIER_VERSION)"
93+
npx --package=prettier@$(PRETTIER_VERSION) prettier . --write
9194

9295
# Generates mocks
9396
.PHONY: mocks

fosite/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
export PATH := .bin:${PATH}
22

3+
PRETTIER_VERSION=$(shell cat package.json | jq -r '.devDependencies["prettier"] // .dependencies["prettier"]')
4+
35
format: .bin/goimports .bin/ory node_modules # formats the source code
46
.bin/ory dev headers copyright --type=open-source
57
.bin/goimports -w .
6-
npm exec -- prettier --write .
8+
@echo "Prettier Version: $(PRETTIER_VERSION)"
9+
npx --package=prettier@$(PRETTIER_VERSION) prettier . --write
710

811
help:
912
@cat Makefile | grep '^[^ ]*:' | grep -v '^\.bin/' | grep -v '.SILENT:' | grep -v '^node_modules:' | grep -v help | sed 's/:.*#/#/' | column -s "#" -t

fosite/package-lock.json

Lines changed: 13 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

fosite/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"private": true,
3-
"prettier": "ory-prettier-styles",
3+
"prettier": {
4+
"proseWrap": "always",
5+
"semi": false,
6+
"trailingComma": "all"
7+
},
48
"devDependencies": {
59
"license-checker": "^25.0.1",
6-
"ory-prettier-styles": "1.3.0",
7-
"prettier": "2.7.1",
10+
"prettier": "3.8.1",
811
"prettier-plugin-packagejson": "2.2.18"
912
}
1013
}

oryx/package-lock.json

Lines changed: 6 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

oryx/package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{
22
"private": true,
3-
"prettier": "ory-prettier-styles",
3+
"prettier": {
4+
"proseWrap": "always",
5+
"semi": false,
6+
"trailingComma": "all"
7+
},
48
"devDependencies": {
59
"license-checker": "^25.0.1",
6-
"ory-prettier-styles": "1.3.0",
7-
"prettier": "2.8.8"
10+
"prettier": "3.8.1"
811
}
912
}

0 commit comments

Comments
 (0)