Merge branch 'webdevcody:main' into #664-top-language-field-sort

webdevcody · Aug 6, 2023 · 66ce670 · 66ce670
2 parents 6963b4b + 7363b87
commit 66ce670
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 46 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -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",
@@ -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",
@@ -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",

diff --git a/packages/app/src/config/prettier-plugin.d.ts b/packages/app/src/config/prettier-plugin.d.ts
@@ -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";
diff --git a/packages/app/src/config/site.ts b/packages/app/src/config/site.ts
@@ -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",
@@ -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"],