Skip to content

Commit 8100e48

Browse files
committed
Merge branch 'development'
2 parents c4b09ab + c0c9451 commit 8100e48

6 files changed

Lines changed: 77 additions & 76 deletions

File tree

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: pnpm lint
4646

4747
- name: Format check
48-
run: pnpm exec biome format --check .
48+
run: pnpm exec biome ci .
4949

5050
- name: Test
5151
run: pnpm test --ci

next.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { NextConfig } from "next";
22

33
const nextConfig: NextConfig = {
4-
/* config options here */
4+
/* config options here */
55
};
66

77
export default nextConfig;

package.json

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
{
2-
"name": "devmetry",
3-
"version": "0.1.0",
4-
"private": true,
5-
"scripts": {
6-
"dev": "next dev",
7-
"build": "next build",
8-
"start": "next start",
9-
"lint": "biome check ./src",
10-
"lint:fix": "biome check --write ./src",
11-
"format": "biome format --write ./src",
12-
"test": "jest",
13-
"test:watch": "jest --watch"
14-
},
15-
"dependencies": {
16-
"@gsap/react": "^2.1.2",
17-
"class-variance-authority": "^0.7.1",
18-
"clsx": "^2.1.1",
19-
"gsap": "^3.14.2",
20-
"next": "16.2.1",
21-
"react": "19.2.4",
22-
"react-dom": "19.2.4",
23-
"tailwind-merge": "^3.5.0"
24-
},
25-
"devDependencies": {
26-
"@biomejs/biome": "^2.4.8",
27-
"@tailwindcss/postcss": "^4",
28-
"@testing-library/dom": "^10.4.1",
29-
"@testing-library/jest-dom": "^6.9.1",
30-
"@testing-library/react": "^16.3.2",
31-
"@types/jest": "^30.0.0",
32-
"@types/node": "^20",
33-
"@types/react": "^19",
34-
"@types/react-dom": "^19",
35-
"jest": "^30.3.0",
36-
"jest-environment-jsdom": "^30.3.0",
37-
"tailwindcss": "^4",
38-
"ts-node": "^10.9.2",
39-
"typescript": "^5"
40-
}
2+
"name": "devmetry",
3+
"version": "0.1.0",
4+
"private": true,
5+
"scripts": {
6+
"dev": "next dev",
7+
"build": "next build",
8+
"start": "next start",
9+
"lint": "biome check ./src",
10+
"lint:fix": "biome check --write ./src",
11+
"format": "biome format --write ./src",
12+
"test": "jest",
13+
"test:watch": "jest --watch"
14+
},
15+
"dependencies": {
16+
"@gsap/react": "^2.1.2",
17+
"class-variance-authority": "^0.7.1",
18+
"clsx": "^2.1.1",
19+
"gsap": "^3.14.2",
20+
"next": "16.2.1",
21+
"react": "19.2.4",
22+
"react-dom": "19.2.4",
23+
"tailwind-merge": "^3.5.0"
24+
},
25+
"devDependencies": {
26+
"@biomejs/biome": "^2.4.8",
27+
"@tailwindcss/postcss": "^4",
28+
"@testing-library/dom": "^10.4.1",
29+
"@testing-library/jest-dom": "^6.9.1",
30+
"@testing-library/react": "^16.3.2",
31+
"@types/jest": "^30.0.0",
32+
"@types/node": "^20",
33+
"@types/react": "^19",
34+
"@types/react-dom": "^19",
35+
"jest": "^30.3.0",
36+
"jest-environment-jsdom": "^30.3.0",
37+
"tailwindcss": "^4",
38+
"ts-node": "^10.9.2",
39+
"typescript": "^5"
40+
}
4141
}

postcss.config.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const config = {
2-
plugins: {
3-
"@tailwindcss/postcss": {},
4-
},
2+
plugins: {
3+
"@tailwindcss/postcss": {},
4+
},
55
};
66

77
export default config;

tsconfig.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
2-
"compilerOptions": {
3-
"target": "ES2017",
4-
"lib": ["dom", "dom.iterable", "esnext"],
5-
"allowJs": true,
6-
"skipLibCheck": true,
7-
"strict": true,
8-
"noEmit": true,
9-
"esModuleInterop": true,
10-
"module": "esnext",
11-
"moduleResolution": "bundler",
12-
"resolveJsonModule": true,
13-
"isolatedModules": true,
14-
"jsx": "react-jsx",
15-
"incremental": true,
16-
"plugins": [
17-
{
18-
"name": "next"
19-
}
20-
],
21-
"paths": {
22-
"@/*": ["./src/*"]
23-
}
24-
},
25-
"include": [
26-
"next-env.d.ts",
27-
"**/*.ts",
28-
"**/*.tsx",
29-
".next/types/**/*.ts",
30-
".next/dev/types/**/*.ts",
31-
"**/*.mts"
32-
],
33-
"exclude": ["node_modules"]
2+
"compilerOptions": {
3+
"target": "ES2017",
4+
"lib": ["dom", "dom.iterable", "esnext"],
5+
"allowJs": true,
6+
"skipLibCheck": true,
7+
"strict": true,
8+
"noEmit": true,
9+
"esModuleInterop": true,
10+
"module": "esnext",
11+
"moduleResolution": "bundler",
12+
"resolveJsonModule": true,
13+
"isolatedModules": true,
14+
"jsx": "react-jsx",
15+
"incremental": true,
16+
"plugins": [
17+
{
18+
"name": "next"
19+
}
20+
],
21+
"paths": {
22+
"@/*": ["./src/*"]
23+
}
24+
},
25+
"include": [
26+
"next-env.d.ts",
27+
"**/*.ts",
28+
"**/*.tsx",
29+
".next/types/**/*.ts",
30+
".next/dev/types/**/*.ts",
31+
"**/*.mts"
32+
],
33+
"exclude": ["node_modules"]
3434
}

0 commit comments

Comments
 (0)