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

chore: upgrade prettier to 3.0 #27

Merged
merged 2 commits into from
Oct 15, 2023
Merged

chore: upgrade prettier to 3.0 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92dc1ce
chore: upgrade prettier to 3.0
nix6839 Oct 15, 2023
d909962
style: run format
nix6839 Oct 15, 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
2 changes: 0 additions & 2 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
pnpm-lock.yaml
dist/
.astro/
4 changes: 2 additions & 2 deletions apps/portfolio/prettier.config.cjs → apps/portfolio/prettier.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const baseConfig = require('../../prettier.config.cjs');
import baseConfig from '../../prettier.config.js';

/** @satisfies {import('prettier').Config} */
const config = {
Expand All @@ -7,4 +7,4 @@ const config = {
tailwindConfig: './tailwind.config.ts',
};

module.exports = config;
export default config;
2 changes: 1 addition & 1 deletion apps/portfolio/src/components/Button.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion apps/portfolio/src/components/NotReadyDialogButton.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/portfolio/src/layouts/BaseLayout.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
3 changes: 2 additions & 1 deletion apps/portfolio/src/styles/jetbrains-mono.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
9 changes: 4 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
82 changes: 27 additions & 55 deletions pnpm-lock.yaml
View file
Open in desktop

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

10 changes: 6 additions & 4 deletions prettier.config.cjs → prettier.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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],

Expand All @@ -19,4 +21,4 @@ const config = {
],
};

module.exports = config;
export default config;