Merge pull request #27 from nix6839/prettier-3.0

nix6839 · Oct 15, 2023 · 6b666a7 · 6b666a7
2 parents f833993 + d909962
commit 6b666a7
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 72 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1 @@
 pnpm-lock.yaml
-dist/
-.astro/
diff --git a/apps/portfolio/prettier.config.cjs → apps/portfolio/prettier.config.js b/apps/portfolio/prettier.config.cjs → apps/portfolio/prettier.config.js
@@ -1,4 +1,4 @@
-const baseConfig = require('../../prettier.config.cjs');
+import baseConfig from '../../prettier.config.js';
 
 /** @satisfies {import('prettier').Config} */
 const config = {
@@ -7,4 +7,4 @@ const config = {
   tailwindConfig: './tailwind.config.ts',
 };
 
-module.exports = config;
+export default config;
diff --git a/apps/portfolio/src/components/Button.astro b/apps/portfolio/src/components/Button.astro
@@ -14,7 +14,7 @@ const { type = 'button', class: className, ...restProps } = Astro.props;
 <button
   {type}
   class:list={[
-    'bg-transparent border-0 cursor-pointer inline-flex items-center justify-center',
+    'inline-flex cursor-pointer items-center justify-center border-0 bg-transparent',
     className,
   ]}
   {...restProps}

diff --git a/apps/portfolio/src/components/NotReadyDialogButton.astro b/apps/portfolio/src/components/NotReadyDialogButton.astro
@@ -25,7 +25,7 @@ const { class: className } = Astro.props;
   <dialog
     class:list={[
       'mx-auto mb-auto mt-16 max-h-none max-w-none bg-transparent backdrop:bg-backdrop',
-      'starting:open:translate-y-[-31.5rem] open:translate-y-0 translate-y-[-31.5rem]',
+      'translate-y-[-31.5rem] open:translate-y-0 starting:open:translate-y-[-31.5rem]',
       'transition-dialog',
     ]}
   >

diff --git a/apps/portfolio/src/layouts/BaseLayout.astro b/apps/portfolio/src/layouts/BaseLayout.astro
@@ -13,7 +13,7 @@ interface Props {
 const { title, pageName } = Astro.props;
 ---
 
-<!DOCTYPE html>
+<!doctype html>
 <html lang="ko" class="bg-primary font-default scheme-dark">
   <head>
     <meta charset="utf-8" />

diff --git a/apps/portfolio/src/styles/jetbrains-mono.css b/apps/portfolio/src/styles/jetbrains-mono.css
@@ -2,6 +2,7 @@
   font-family: 'JetBrains Mono';
   font-weight: 400;
   font-display: swap;
-  src: local('JetBrains Mono Regular'),
+  src:
+    local('JetBrains Mono Regular'),
     url(/fonts/JetBrains-Mono-Regular.woff2) format('woff2');
 }
diff --git a/package.json b/package.json
@@ -12,19 +12,18 @@
     "format:check": "prettier \"**/*.{astro,ts,cjs,css,json,md,yml,yaml}\" --check"
   },
   "devDependencies": {
-    "@nix6839/prettier-config": "1.0.8",
+    "@nix6839/prettier-config": "2.0.2",
     "@types/eslint": "8.44.4",
-    "@types/prettier": "2.7.3",
     "@typescript-eslint/eslint-plugin": "6.7.5",
     "@typescript-eslint/parser": "6.7.5",
     "eslint": "8.51.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-astro": "0.29.1",
     "nx": "16.10.0",
     "nx-cloud": "16.5.2",
-    "prettier": "2.8.8",
-    "prettier-plugin-astro": "0.10.0",
-    "prettier-plugin-tailwindcss": "0.4.1"
+    "prettier": "3.0.3",
+    "prettier-plugin-astro": "0.12.0",
+    "prettier-plugin-tailwindcss": "0.5.6"
   },
   "packageManager": "[email protected]+sha256.8f5264ad1d100da11a6add6bb8a94c6f1e913f9e9261b2a551fabefad2ec0fec"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/prettier.config.cjs → prettier.config.js b/prettier.config.cjs → prettier.config.js
@@ -1,9 +1,11 @@
-const tailwind = require('prettier-plugin-tailwindcss');
-const astro = require('prettier-plugin-astro');
+import hwyConfig from '@nix6839/prettier-config';
+
+const tailwind = 'prettier-plugin-tailwindcss'
+const astro = 'prettier-plugin-astro'
 
 /** @satisfies {import('prettier').Config} */
 const config = {
-  ...require('@nix6839/prettier-config'),
+  ...hwyConfig,
 
   plugins: [tailwind],
 
@@ -19,4 +21,4 @@ const config = {
   ],
 };
 
-module.exports = config;
+export default config;