Merge branch 'main' into nektro-patch-464

oven-sh · Feb 2, 2024 · 1467c6f · 1467c6f
2 parents d05cd6a + 8808437
commit 1467c6f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -290,7 +290,6 @@ ENV CCACHE_DIR=/ccache
 
 COPY Makefile ${BUN_DIR}/Makefile
 COPY src/deps/zstd ${BUN_DIR}/src/deps/zstd
-COPY .prettierrc.cjs ${BUN_DIR}/.prettierrc.cjs
 
 WORKDIR $BUN_DIR
 
@@ -378,7 +377,7 @@ RUN --mount=type=cache,target=/ccache  mkdir ${BUN_DIR}/build \
 
 FROM bun-base-with-zig as bun-codegen-for-zig
 
-COPY package.json bun.lockb Makefile .gitmodules .prettierrc.cjs ${BUN_DIR}/
+COPY package.json bun.lockb Makefile .gitmodules ${BUN_DIR}/
 COPY src/runtime ${BUN_DIR}/src/runtime
 COPY src/runtime.js src/runtime.bun.js ${BUN_DIR}/src/
 COPY packages/bun-error ${BUN_DIR}/packages/bun-error

diff --git a/Makefile b/Makefile
@@ -823,7 +823,6 @@ fmt: fmt-cpp fmt-zig
 api:
 	./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) --config=.prettierrc.cjs --write src/api/schema.js src/api/schema.d.ts
 
 .PHONY: node-fallbacks
 node-fallbacks:

diff --git a/bench/package.json b/bench/package.json
@@ -25,6 +25,5 @@
   },
   "devDependencies": {
     "fast-deep-equal": "^3.1.3"
-  },
-  "prettier": "../.prettierrc.cjs"
+  }
 }
diff --git a/packages/bun-vscode/assets/package.json b/packages/bun-vscode/assets/package.json
@@ -796,9 +796,6 @@
     "eslintConfig": {
       "$ref": "https://json.schemastore.org/eslintrc.json"
     },
-    "prettier": {
-      "$ref": "https://json.schemastore.org/prettierrc.json"
-    },
     "stylelint": {
       "$ref": "https://json.schemastore.org/stylelintrc.json"
     },

diff --git a/test/snippets/package.json b/test/snippets/package.json
@@ -10,6 +10,5 @@
     "react-dom": "^17.0.2",
     "redux": "^4.1.1",
     "styled-components": "^5.3.1"
-  },
-  "prettier": "../../.prettierrc.cjs"
+  }
 }