Skip to content

Commit 5b6d73d

Browse files
authored
Merge pull request #183 from vim-jp/feature/2025-prod
本番サイト作るぞー
2 parents 1c13362 + a442fdc commit 5b6d73d

33 files changed

+2503
-597
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
version: 10.4.0
2020
- run: pnpm install --frozen-lockfile
2121
- run: pnpm check
22-
- run: pnpm lint
22+
- run: pnpm prettier:check

2025/.prettierrc.mjs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// .prettierrc.mjs
2+
/** @type {import("prettier").Config} */
3+
export default {
4+
plugins: ['prettier-plugin-astro', 'prettier-plugin-tailwindcss'],
5+
tailwindStylesheet: 'src/styles/global.css',
6+
tailwindConfig: 'tailwind.config.ts',
7+
overrides: [
8+
{
9+
files: '*.astro',
10+
options: {
11+
parser: 'astro',
12+
},
13+
},
14+
{
15+
files: '*.svelte',
16+
options: {
17+
parser: 'svelte',
18+
},
19+
},
20+
],
21+
};

2025/astro.config.mjs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import react from '@astrojs/react';
2+
import tailwindcss from '@tailwindcss/vite';
3+
24
// @ts-check
35
import { defineConfig } from 'astro/config';
46

@@ -20,6 +22,7 @@ export default defineConfig({
2022
},
2123
plugins: [
2224
Macros(),
25+
tailwindcss(),
2326
],
2427
},
2528

2025/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
"astro": "astro",
1212
"check": "astro check",
1313
"lint": "eslint --cache .",
14-
"format": "nr lint --fix"
14+
"format": "nr lint --fix",
15+
"prettier:check": "prettier --cache --check --plugin-search-dir=. src",
16+
"prettier:fix": "prettier --cache --write --plugin-search-dir=. src"
1517
},
1618
"dependencies": {
1719
"@astrojs/react": "^4.2.0",
20+
"@tailwindcss/vite": "^4.1.6",
1821
"@types/react": "^19.0.8",
1922
"@types/react-dom": "^19.0.3",
2023
"astro": "^5.3.0",
@@ -23,6 +26,7 @@
2326
"react": "^19.0.0",
2427
"react-dom": "^19.0.0",
2528
"satori": "^0.12.1",
29+
"tailwindcss": "^4.1.6",
2630
"ufo": "^1.5.4"
2731
},
2832
"devDependencies": {
@@ -32,7 +36,11 @@
3236
"eslint": "^9.20.1",
3337
"eslint-plugin-astro": "^1.3.1",
3438
"eslint-plugin-format": "^1.0.1",
39+
"prettier": "^3.5.3",
40+
"prettier-plugin-astro": "^0.14.1",
41+
"prettier-plugin-tailwindcss": "^0.6.11",
3542
"sharp": "^0.33.5",
43+
"tailwind-merge": "^3.3.0",
3644
"typescript": "^5.7.3",
3745
"unplugin-macros": "^0.16.0"
3846
},

0 commit comments

Comments
 (0)