Skip to content

Commit 7f04ae5

Browse files
verdvermTony Worm
and
Tony Worm
authored
fix prettier formatter, java plugin broken (#386)
Co-authored-by: Tony Worm <[email protected]>
1 parent 8b576be commit 7f04ae5

File tree

4 files changed

+23
-14
lines changed

4 files changed

+23
-14
lines changed

docs/hack/make/publish.inc

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
config.yaml: config.cue
2-
cue export config.cue --out yaml --outfile config.yaml --force
2+
hof export config.cue --out yaml --outfile config.yaml --force
33

44
.PHONT: nginx.next nginx.prod
55
nginx.next:
@@ -20,16 +20,17 @@ push.prod:
2020
@docker push us.gcr.io/$(PROJECT)/docs.hofstadter.io:$(TAG)
2121

2222
deploy.prod:
23-
@cue export ci/cuelm.cue -e Install \
23+
@hof export ci/cuelm.cue -e Install \
2424
-t ga_mp_apikey=$(GA_MP_APIKEY) \
2525
-t version=$(TAG) \
26+
--out yaml \
2627
| kubectl apply -f -
2728
deploy.prod.view:
28-
@cue export ci/cuelm.cue -e Install \
29+
@hof export ci/cuelm.cue -e Install \
2930
-t ga_mp_apikey=$(GA_MP_APIKEY) \
3031
-t version=$(TAG)
3132
deploy.prod.vet:
32-
@cue export ci/cuelm.cue -e Install \
33+
@hof export ci/cuelm.cue -e Install \
3334
-t ga_mp_apikey=$(GA_MP_APIKEY) \
3435
-t version=$(TAG) \
3536
| kubectl apply -f - --dry-run=server
@@ -47,20 +48,21 @@ push.next:
4748
@docker push us.gcr.io/$(PROJECT)/next.hofstadter.io:$(TAG)
4849

4950
deploy.next:
50-
@cue export ci/cuelm.cue -e Install \
51+
@hof export ci/cuelm.cue -e Install \
5152
-t ga_mp_apikey=$(GA_MP_APIKEY) \
5253
-t version=$(TAG) \
5354
-t name=hof-next-docs \
5455
-t domain="next.hofstadter.io" \
56+
--out yaml \
5557
| kubectl apply -f -
5658
deploy.next.view:
57-
@cue export ci/cuelm.cue -e Install \
59+
@hof export ci/cuelm.cue -e Install \
5860
-t ga_mp_apikey=$(GA_MP_APIKEY) \
5961
-t version=$(TAG) \
6062
-t name=hof-next-docs\
6163
-t domain="next.hofstadter.io"
6264
deploy.next.vet:
63-
@cue export ci/cuelm.cue -e Install \
65+
@hof export ci/cuelm.cue -e Install \
6466
-t ga_mp_apikey=$(GA_MP_APIKEY) \
6567
-t version=$(TAG) \
6668
-t name=hof-next-docs\

formatters/tools/prettier/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version": "0.0.1",
44
"description": "a collection of formatters as a server",
55
"main": "prettier.js",
6+
"type": "module",
67
"scripts": {
78
"test": "echo \"Error: no test specified\" && exit 1"
89
},
@@ -15,7 +16,6 @@
1516
"prettier": "^2.8.4",
1617
"prettier-plugin-go-template": "^0.0.13",
1718
"prettier-plugin-groovy": "^0.0.2",
18-
"prettier-plugin-java": "^2.0.0",
1919
"prettier-plugin-rust": "^0.1.8",
2020
"prettier-plugin-sql": "^0.13.0"
2121
}

formatters/tools/prettier/prettier.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
const express = require('express');
2-
const prettier = require("prettier");
1+
// const express = require('express');
2+
// const prettier = require("prettier");
3+
import express from 'express'
4+
import prettier from 'prettier'
35

46
const app = express();
57

formatters/tools/prettier/yarn.lock

+9-4
Original file line numberDiff line numberDiff line change
@@ -546,11 +546,16 @@ prettier-plugin-sql@^0.13.0:
546546
sql-formatter "^11.0.2"
547547
tslib "^2.4.0"
548548

549-
[email protected], prettier@>=2.3.0:
549+
550550
version "3.2.5"
551551
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
552552
integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
553553

554+
prettier@>=2.3.0:
555+
version "3.3.1"
556+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.1.tgz#e68935518dd90bb7ec4821ba970e68f8de16e1ac"
557+
integrity sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==
558+
554559
prettier@^2.7.1, prettier@^2.8.4:
555560
version "2.8.8"
556561
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
@@ -689,9 +694,9 @@ [email protected]:
689694
integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
690695

691696
tslib@^2.4.0:
692-
version "2.6.2"
693-
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
694-
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
697+
version "2.6.3"
698+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
699+
integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
695700

696701
type-is@~1.6.18:
697702
version "1.6.18"

0 commit comments

Comments
 (0)