Skip to content

Commit 44b747a

Browse files
authored
Merge pull request #99 from Katsuyuki-Karasawa/tailwind
some changes
2 parents ab77d7c + 3e254f6 commit 44b747a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+4266
-4859
lines changed

.eslintrc.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"extends": [
3-
"next/core-web-vitals",
4-
"plugin:import/recommended",
5-
"plugin:import/warnings",
6-
"prettier"
7-
],
8-
"rules": {
9-
"import/order": [
10-
"error",
11-
{
12-
"alphabetize": {
13-
"order": "asc"
14-
}
15-
}
16-
]
17-
}
2+
"extends": [
3+
"next/core-web-vitals",
4+
"plugin:import/recommended",
5+
"plugin:import/warnings",
6+
"prettier"
7+
],
8+
"rules": {
9+
"import/order": [
10+
"error",
11+
{
12+
"alphabetize": {
13+
"order": "asc"
14+
}
15+
}
16+
]
17+
}
1818
}

.github/dependabot.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
version: 2
22
updates:
33
- package-ecosystem: "npm"
4-
directory: "/"
5-
schedule:
6-
interval: "daily"
7-
target:
8-
branches:
9-
- "main"
10-
- "dev"
11-
labels:
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
groups:
8+
dependencies:
9+
patterns:
10+
- "*"
11+
target:
12+
branches:
13+
- "main"
14+
- "dev"
15+
- "tailwind"
16+
labels:
1217
- "Dependabot"

.github/workflows/biome.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Biome
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- "./src"
9+
pull_request:
10+
branches:
11+
- main
12+
paths:
13+
- "./src"
14+
15+
jobs:
16+
run:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
- name: Setup Biome
22+
uses: biomejs/setup-biome@v1
23+
with:
24+
version: 1.3.3
25+
- name: Run Biome
26+
run: biome ci .

.github/workflows/lint-actions.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/lock-update.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"editor.defaultFormatter": "esbenp.prettier-vscode",
44
"editor.formatOnSave": true,
55
"editor.codeActionsOnSave": {
6-
"source.fixAll": true
6+
"source.fixAll": "explicit"
77
},
88
"eslint.alwaysShowStatus": true
99
}

biome.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"$schema": "https://biomejs.dev/schemas/1.4.1/schema.json",
3+
"organizeImports": {
4+
"enabled": true
5+
},
6+
"linter": {
7+
"enabled": true,
8+
"rules": {
9+
"recommended": true
10+
}
11+
},
12+
"formatter": {
13+
"enabled": true,
14+
"formatWithErrors": false,
15+
"indentStyle": "tab",
16+
"indentWidth": 2,
17+
"lineWidth": 80,
18+
"ignore": []
19+
},
20+
"files": {
21+
"ignore": [".next", "node_modules", "@/__generated__"]
22+
}
23+
}

components.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
"$schema": "https://ui.shadcn.com/schema.json",
3-
"style": "new-york",
4-
"rsc": true,
5-
"tsx": true,
6-
"tailwind": {
7-
"config": "tailwind.config.js",
8-
"css": "src\\app\\globals.css",
9-
"baseColor": "slate",
10-
"cssVariables": true
11-
},
12-
"aliases": {
13-
"components": "@/components",
14-
"utils": "@/lib/utils"
15-
}
2+
"$schema": "https://ui.shadcn.com/schema.json",
3+
"style": "new-york",
4+
"rsc": true,
5+
"tsx": true,
6+
"tailwind": {
7+
"config": "tailwind.config.js",
8+
"css": "src\\app\\globals.css",
9+
"baseColor": "slate",
10+
"cssVariables": true
11+
},
12+
"aliases": {
13+
"components": "@/components",
14+
"utils": "@/lib/utils"
15+
}
1616
}

i18n.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { getRequestConfig } from 'next-intl/server';
1+
import { getRequestConfig } from "next-intl/server";
22

3-
export default getRequestConfig(async ({locale}) => ({
4-
messages: (await import(`./locales/${locale}/common.json`)).default
5-
}));
3+
export default getRequestConfig(async ({ locale }) => ({
4+
messages: (await import(`./locales/${locale}/common.json`)).default,
5+
}));

i18next.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import "i18next";
22

33
declare module "i18next" {
4-
interface CustomTypeOptions {
5-
returnNull: false;
6-
}
4+
interface CustomTypeOptions {
5+
returnNull: false;
6+
}
77
}

0 commit comments

Comments
 (0)