Skip to content

Commit

Permalink
fix prettier formatter, java plugin broken (#386)
Browse files Browse the repository at this point in the history
Co-authored-by: Tony Worm <[email protected]>
  • Loading branch information
verdverm and Tony Worm authored Jun 7, 2024
1 parent 8b576be commit 7f04ae5
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 14 deletions.
16 changes: 9 additions & 7 deletions docs/hack/make/publish.inc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
config.yaml: config.cue
cue export config.cue --out yaml --outfile config.yaml --force
hof export config.cue --out yaml --outfile config.yaml --force

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

deploy.prod:
@cue export ci/cuelm.cue -e Install \
@hof export ci/cuelm.cue -e Install \
-t ga_mp_apikey=$(GA_MP_APIKEY) \
-t version=$(TAG) \
--out yaml \
| kubectl apply -f -
deploy.prod.view:
@cue export ci/cuelm.cue -e Install \
@hof export ci/cuelm.cue -e Install \
-t ga_mp_apikey=$(GA_MP_APIKEY) \
-t version=$(TAG)
deploy.prod.vet:
@cue export ci/cuelm.cue -e Install \
@hof export ci/cuelm.cue -e Install \
-t ga_mp_apikey=$(GA_MP_APIKEY) \
-t version=$(TAG) \
| kubectl apply -f - --dry-run=server
Expand All @@ -47,20 +48,21 @@ push.next:
@docker push us.gcr.io/$(PROJECT)/next.hofstadter.io:$(TAG)

deploy.next:
@cue export ci/cuelm.cue -e Install \
@hof export ci/cuelm.cue -e Install \
-t ga_mp_apikey=$(GA_MP_APIKEY) \
-t version=$(TAG) \
-t name=hof-next-docs \
-t domain="next.hofstadter.io" \
--out yaml \
| kubectl apply -f -
deploy.next.view:
@cue export ci/cuelm.cue -e Install \
@hof export ci/cuelm.cue -e Install \
-t ga_mp_apikey=$(GA_MP_APIKEY) \
-t version=$(TAG) \
-t name=hof-next-docs\
-t domain="next.hofstadter.io"
deploy.next.vet:
@cue export ci/cuelm.cue -e Install \
@hof export ci/cuelm.cue -e Install \
-t ga_mp_apikey=$(GA_MP_APIKEY) \
-t version=$(TAG) \
-t name=hof-next-docs\
Expand Down
2 changes: 1 addition & 1 deletion formatters/tools/prettier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.0.1",
"description": "a collection of formatters as a server",
"main": "prettier.js",
"type": "module",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
Expand All @@ -15,7 +16,6 @@
"prettier": "^2.8.4",
"prettier-plugin-go-template": "^0.0.13",
"prettier-plugin-groovy": "^0.0.2",
"prettier-plugin-java": "^2.0.0",
"prettier-plugin-rust": "^0.1.8",
"prettier-plugin-sql": "^0.13.0"
}
Expand Down
6 changes: 4 additions & 2 deletions formatters/tools/prettier/prettier.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const express = require('express');
const prettier = require("prettier");
// const express = require('express');
// const prettier = require("prettier");
import express from 'express'
import prettier from 'prettier'

const app = express();

Expand Down
13 changes: 9 additions & 4 deletions formatters/tools/prettier/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -546,11 +546,16 @@ prettier-plugin-sql@^0.13.0:
sql-formatter "^11.0.2"
tslib "^2.4.0"

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

prettier@>=2.3.0:
version "3.3.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.1.tgz#e68935518dd90bb7ec4821ba970e68f8de16e1ac"
integrity sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==

prettier@^2.7.1, prettier@^2.8.4:
version "2.8.8"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
Expand Down Expand Up @@ -689,9 +694,9 @@ [email protected]:
integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==

tslib@^2.4.0:
version "2.6.2"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
version "2.6.3"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==

type-is@~1.6.18:
version "1.6.18"
Expand Down

0 comments on commit 7f04ae5

Please sign in to comment.