aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-10-30 17:48:04 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-10-30 17:48:04 -0700
commit08e0a51036b761ab74927ec82ea422c185a140fe (patch)
tree98b1b5be592679892a26e9e96c1035b6ce9ece63
parent8e0f21cc917b18dab1b634b60370b42662b2ebe0 (diff)
downloadbun-08e0a51036b761ab74927ec82ea422c185a140fe.tar.gz
bun-08e0a51036b761ab74927ec82ea422c185a140fe.tar.zst
bun-08e0a51036b761ab74927ec82ea422c185a140fe.zip
Add prettier to makefile & package.json
-rw-r--r--Makefile5
-rw-r--r--package.json3
-rw-r--r--pnpm-lock.yaml8
3 files changed, 13 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7ed16dbab..1f11826aa 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ BUILD_ID = $(shell cat ./build-id)
PACKAGE_JSON_VERSION = 0.0.$(BUILD_ID)
BUN_BUILD_TAG = bun-v$(PACKAGE_JSON_VERSION)
BUN_RELEASE_BIN = $(PACKAGE_DIR)/bun
+PRETTIER ?= $(shell which prettier || echo "./node_modules/.bin/prettier")
NPM_CLIENT = $(shell which pnpm || which npm)
ZIG ?= $(shell which zig || echo -e "error: Missing zig. Please make sure zig is in PATH. Or set ZIG=/path/to-zig-executable")
@@ -375,8 +376,8 @@ all-js: runtime_js fallback_decoder bun_error node-fallbacks
api:
$(NPM_CLIENT) install; ./node_modules/.bin/peechy --schema src/api/schema.peechy --esm src/api/schema.js --ts src/api/schema.d.ts --zig src/api/schema.zig
$(ZIG) fmt src/api/schema.zig
- prettier --write src/api/schema.js
- prettier --write src/api/schema.d.ts
+ $(PRETTIER) --write src/api/schema.js
+ $(PRETTIER) --write src/api/schema.d.ts
node-fallbacks:
@cd src/node-fallbacks; $(NPM_CLIENT) install; npm run --silent build
diff --git a/package.json b/package.json
index facce36e4..bab443f2b 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
"peechy": "0.4.20",
"puppeteer": "^10.2.0",
"react": "^17.0.2",
- "react-dom": "^17.0.2"
+ "react-dom": "^17.0.2",
+ "prettier": "latest"
},
"scripts": {
"build-runtime": "esbuild --target=esnext --bundle src/runtime/index.ts --format=iife --platform=browser --global-name=BUN_RUNTIME > src/runtime.out.js; cat src/runtime.footer.js >> src/runtime.out.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4af99c63c..9c58e6f89 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,7 @@ specifiers:
'@types/puppeteer': ^5.4.4
moment: ^2.29.1
peechy: 0.4.20
+ prettier: latest
puppeteer: ^10.2.0
react: ^17.0.2
react-dom: ^17.0.2
@@ -12,6 +13,7 @@ specifiers:
dependencies:
moment: 2.29.1
peechy: 0.4.20
+ prettier: 2.4.1
puppeteer: 10.4.0
react: 17.0.2
react-dom: 17.0.2_react@17.0.2
@@ -385,6 +387,12 @@ packages:
find-up: 4.1.0
dev: false
+ /prettier/2.4.1:
+ resolution: {integrity: sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==}
+ engines: {node: '>=10.13.0'}
+ hasBin: true
+ dev: false
+
/progress/2.0.1:
resolution: {integrity: sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==}
engines: {node: '>=0.4.0'}