Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump down Prettier 3.0.0 to 2.8.8 #663

Merged
merged 4 commits into from
Aug 6, 2023
Merged

Bump down Prettier 3.0.0 to 2.8.8 #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aa5f5e
changed plugins array from array "string" to array imported object in…
phoukiethseng Aug 5, 2023
64ca99e
fixed `child_process` module not found by removing Ruby prettier plugin
phoukiethseng Aug 5, 2023
f78749b
Bump down Prettier form 3.0.0 to 2.8.8
phoukiethseng Aug 5, 2023
c7ebfba
Merge branch 'main' into 644-prettier-code-format
phoukiethseng Aug 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 13 additions & 28 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"@code-racer/wss": "file:../wss",
"@hookform/resolvers": "^3.1.1",
"@next-auth/prisma-adapter": "^1.0.7",
"@prettier/plugin-ruby": "3.1.2",
"@prisma/client": "^5.0.0",
"@radix-ui/react-avatar": "^1.0.3",
"@radix-ui/react-checkbox": "^1.0.4",
Expand Down Expand Up @@ -56,6 +57,9 @@
"nextjs-toploader": "^1.4.2",
"openai": "^3.3.0",
"postcss": "8.4.25",
"prettier": "2.8.8",
"prettier-plugin-go-template": "0.0.13",
"prettier-plugin-java": "2.2.0",
"react": "18.2.0",
"react-confetti": "^6.1.0",
"react-dom": "18.2.0",
Expand All @@ -73,11 +77,7 @@
"tailwindcss-animate": "^1.0.6",
"unstyled-table": "^0.0.3-alpha-3",
"uuid": "^9.0.0",
"zod": "^3.21.4",
"@prettier/plugin-ruby": "^4.0.2",
"prettier": "^3.0.0",
"prettier-plugin-go-template": "^0.0.15",
"prettier-plugin-java": "^2.2.0"
"zod": "^3.21.4"
},
"devDependencies": {
"@flydotio/dockerfile": "^0.3.3",
Expand Down
14 changes: 8 additions & 6 deletions packages/app/src/config/prettier-plugin.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
declare module "prettier-plugin-java" {
export { languages, parsers, printers, options, defaultOptions };
}
declare module "@prettier/plugin-ruby" {
export { languages, parsers, printers, options, defaultOptions };
}
// declare module "prettier-plugin-java" {
// export { languages, parsers, printers, options, defaultOptions };
// }
// declare module "@prettier/plugin-ruby" {
// export { languages, parsers, printers, options, defaultOptions };
// }

declare module "prettier";
14 changes: 7 additions & 7 deletions packages/app/src/config/site.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
/// <reference path="prettier-plugin.d.ts" />
/* eslint-enable */

import { type Options as PrettierOptions } from "prettier";
// import { type Options as PrettierOptions } from "prettier";
import { type Language } from "./languages";
export type SiteConfig = typeof siteConfig;

import * as prettierPluginJava from "prettier-plugin-java";
import * as prettierPluginGo from "prettier-plugin-go-template";
import * as prettierPluginRuby from "@prettier/plugin-ruby";
// import * as prettierPluginJava from "prettier-plugin-java";
// import * as prettierPluginGo from "prettier-plugin-go-template";
// import * as prettierPluginRuby from "@prettier/plugin-ruby";

export const siteConfig = {
name: "CodeRacer",
Expand Down Expand Up @@ -86,12 +86,12 @@ export const siteConfig = {
singleAttributePerLine: false,
plugins: [
"prettier-plugin-java",
"prettier-plugin-go-template",
// "prettier-plugin-go-template",
"@prettier/plugin-ruby",
],
} satisfies PrettierOptions,
},
parserMap: new Map<Language, string>([
["go", "go-template"],
// ["go", "go-template"],
["java", "java"],
["html", "html"],
["javascript", "babel"],
Expand Down
Loading