Skip to content

Commit 85faca8

Browse files
Friedrich482Friedrich482
authored
Merge pull request #117 from Friedrich482/features
Shadcn components migrations and dependencies update
2 parents 689600b + 6522784 commit 85faca8

26 files changed

Lines changed: 3384 additions & 1963 deletions

File tree

‎apps/api/package.json‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,55 +24,56 @@
2424
"test:e2e": "jest --config ./test/jest-e2e.json"
2525
},
2626
"dependencies": {
27-
"@nestjs/common": "^11.1.5",
28-
"@nestjs/config": "^4.0.2",
29-
"@nestjs/core": "^11.1.5",
30-
"@nestjs/jwt": "^11.0.0",
31-
"@nestjs/mapped-types": "*",
32-
"@nestjs/platform-express": "^11.1.5",
27+
"@nestjs/common": "^11.1.13",
28+
"@nestjs/config": "^4.0.3",
29+
"@nestjs/core": "^11.1.13",
30+
"@nestjs/jwt": "^11.0.2",
31+
"@nestjs/mapped-types": "^2.1.0",
32+
"@nestjs/platform-express": "^11.1.13",
3333
"@nestjs/throttler": "^6.5.0",
3434
"@repo/common": "*",
3535
"@trpc-limiter/memory": "^1.0.0",
36-
"@trpc/server": "^11.4.4",
36+
"@trpc/server": "^11.7.2",
3737
"bcrypt": "^6.0.0",
3838
"cookie-parser": "^1.4.7",
39-
"date-fns": "4.1.0",
40-
"drizzle-orm": "^0.44.4",
41-
"drizzle-kit": "^0.31.4",
42-
"google-auth-library": "^10.2.1",
43-
"pg": "^8.16.3",
39+
"date-fns": "^4.1.0",
40+
"drizzle-kit": "^0.31.8",
41+
"drizzle-orm": "^0.44.7",
42+
"google-auth-library": "^10.5.0",
43+
"pg": "^8.18.0",
4444
"reflect-metadata": "^0.2.2",
45-
"resend": "^6.5.2",
46-
"ulid": "^3.0.1",
47-
"zod": "^4.0.17"
45+
"resend": "^6.9.1",
46+
"superjson": "^2.2.6",
47+
"ulid": "^3.0.2",
48+
"zod": "^4.3.6"
4849
},
4950
"devDependencies": {
50-
"@eslint/js": "^9.32.0",
51-
"@nestjs/cli": "^11.0.10",
52-
"@nestjs/schematics": "^11.0.7",
53-
"@nestjs/testing": "^11.1.5",
51+
"@eslint/js": "^9.39.2",
52+
"@nestjs/cli": "^11.0.16",
53+
"@nestjs/schematics": "^11.0.9",
54+
"@nestjs/testing": "^11.1.13",
5455
"@types/bcrypt": "^6.0.0",
55-
"@types/cookie-parser": "^1.4.9",
56-
"@types/express": "^5.0.3",
57-
"@types/jest": "^29.5.12",
58-
"@types/node": "^24.2.0",
59-
"@types/pg": "^8.15.5",
56+
"@types/cookie-parser": "^1.4.10",
57+
"@types/express": "^5.0.6",
58+
"@types/jest": "^29.5.14",
59+
"@types/node": "^24.10.11",
60+
"@types/pg": "^8.16.0",
6061
"@types/supertest": "^6.0.3",
61-
"@typescript-eslint/eslint-plugin": "^8.39.0",
62-
"@typescript-eslint/parser": "^8.39.0",
63-
"eslint": "^9.32.0",
62+
"@typescript-eslint/eslint-plugin": "^8.54.0",
63+
"@typescript-eslint/parser": "^8.54.0",
64+
"eslint": "^9.39.2",
6465
"eslint-config-prettier": "^10.1.8",
65-
"eslint-plugin-prettier": "^5.5.3",
66-
"globals": "^16.3.0",
66+
"eslint-plugin-prettier": "^5.5.5",
67+
"globals": "^16.5.0",
6768
"jest": "^29.7.0",
68-
"prettier": "^3.6.2",
69+
"prettier": "^3.8.1",
6970
"source-map-support": "^0.5.21",
70-
"supertest": "^7.1.4",
71-
"ts-jest": "^29.4.1",
72-
"ts-loader": "^9.5.2",
71+
"supertest": "^7.2.2",
72+
"ts-jest": "^29.4.6",
73+
"ts-loader": "^9.5.4",
7374
"ts-node": "^10.9.2",
7475
"tsconfig-paths": "^4.2.0",
75-
"typescript": "^5.9.2"
76+
"typescript": "^5.9.3"
7677
},
7778
"jest": {
7879
"moduleFileExtensions": [

‎apps/dashboard/package.json‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,53 +10,54 @@
1010
"preview": "vite preview"
1111
},
1212
"dependencies": {
13-
"@fontsource-variable/inter": "^5.1.1",
14-
"@hookform/resolvers": "^5.0.1",
13+
"@fontsource-variable/inter": "^5.2.8",
14+
"@hookform/resolvers": "^5.2.2",
1515
"@repo/common": "*",
1616
"@repo/trpc": "*",
1717
"@repo/ui": "*",
18-
"@tanstack/react-query": "^5.74.3",
19-
"@tanstack/react-query-devtools": "^5.74.3",
20-
"@trpc/client": "^11.1.0",
21-
"@trpc/server": "^11.1.0",
22-
"@trpc/tanstack-react-query": "^11.1.0",
18+
"@tanstack/react-query": "^5.90.20",
19+
"@tanstack/react-query-devtools": "^5.91.3",
20+
"@trpc/client": "^11.7.2",
21+
"@trpc/server": "^11.7.2",
22+
"@trpc/tanstack-react-query": "^11.7.2",
2323
"d3-hierarchy": "^3.1.2",
2424
"date-fns": "^4.1.0",
2525
"js-md5": "^0.8.3",
26-
"react": "19.1.1",
27-
"react-dom": "19.1.1",
26+
"react": "^19.1.1",
27+
"react-dom": "^19.1.1",
2828
"react-error-boundary": "^5.0.0",
29-
"react-hook-form": "^7.56.1",
30-
"react-router": "^7.5.1",
29+
"react-hook-form": "^7.71.1",
30+
"react-router": "^7.13.0",
3131
"react-spinners": "^0.17.0",
32-
"recharts": "^2.15.1",
33-
"zod": "^4.0.17",
34-
"zustand": "^5.0.3"
32+
"recharts": "^2.15.4",
33+
"superjson": "^2.2.6",
34+
"zod": "^4.3.6",
35+
"zustand": "^5.0.11"
3536
},
3637
"devDependencies": {
37-
"@eslint/js": "^9.17.0",
38-
"@tailwindcss/vite": "^4.1.11",
38+
"@eslint/js": "^9.39.2",
39+
"@tailwindcss/vite": "^4.1.18",
3940
"@types/d3": "^7.4.3",
40-
"@types/node": "^22.12.0",
41-
"@types/react": "19.1.9",
42-
"@types/react-dom": "19.1.7",
41+
"@types/node": "^22.19.9",
42+
"@types/react": "^19.1.9",
43+
"@types/react-dom": "^19.1.7",
4344
"@types/recharts": "^1.8.29",
44-
"@vitejs/plugin-react-swc": "^3.5.0",
45-
"autoprefixer": "^10.4.20",
46-
"eslint": "^9.21.0",
45+
"@vitejs/plugin-react-swc": "^3.11.0",
46+
"autoprefixer": "^10.4.24",
47+
"eslint": "^9.39.2",
4748
"eslint-plugin-import": "^2.32.0",
48-
"eslint-plugin-react-hooks": "^5.0.0",
49-
"eslint-plugin-react-refresh": "^0.4.16",
50-
"globals": "^15.14.0",
51-
"postcss": "^8.5.1",
52-
"prettier": "^3.4.2",
49+
"eslint-plugin-react-hooks": "^5.2.0",
50+
"eslint-plugin-react-refresh": "^0.4.26",
51+
"globals": "^15.15.0",
52+
"postcss": "^8.5.6",
53+
"prettier": "^3.8.1",
5354
"prettier-plugin-tailwindcss": "^0.6.14",
54-
"rollup-plugin-visualizer": "^6.0.3",
55-
"tailwindcss": "^4.1.11",
56-
"typescript": "^5.7.2",
57-
"typescript-eslint": "^8.18.2",
58-
"vite": "^7.2.2",
55+
"rollup-plugin-visualizer": "^6.0.5",
56+
"tailwindcss": "^4.1.17",
57+
"typescript": "^5.9.3",
58+
"typescript-eslint": "^8.54.0",
59+
"vite": "^7.3.1",
5960
"vite-plugin-commonjs": "^0.10.4",
60-
"vite-plugin-svgr": "^4.3.0"
61+
"vite-plugin-svgr": "^4.5.0"
6162
}
6263
}

‎apps/dashboard/src/features/period-projects/components/period-projects.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ export const PeriodProjects = () => {
6565
onClick={handleGridLayoutButtonClick}
6666
className={cn(
6767
isGridLayout &&
68-
"bg-primary hover:bg-primary text-primary-foreground hover:text-primary-foreground",
68+
"bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground dark:hover:bg-primary",
6969
)}
7070
/>
7171
<Icon
7272
Icon={List}
7373
onClick={handleListLayoutButtonClick}
7474
className={cn(
7575
!isGridLayout &&
76-
"bg-primary hover:bg-primary text-primary-foreground hover:text-primary-foreground",
76+
"bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground dark:hover:bg-primary",
7777
)}
7878
/>
7979
</div>

‎apps/dashboard/src/stores/period/utils/correct-groupby.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { PERIODS_CONFIG } from "@/stores/period/constants";
2-
import { Period } from "@/types-schemas";
32
import { getPeriodResolution } from "@repo/common/get-period-resolution";
43
import { GroupBy } from "@repo/common/types-schemas";
54

5+
import { Period } from "../types-schemas";
6+
67
export const correctGroupBy = (
78
period: Period,
89
customRange: {

‎apps/vscode-extension/package.json‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "mooncode",
33
"displayName": "MoonCode",
44
"description": "MoonCode is an extension that tracks your coding time (like WakaTime) and gives you a detailed summary about all your coding statistics. With MoonCode, developers get the full history of their coding activity.",
5-
"version": "0.0.49",
5+
"version": "0.0.50",
66
"icon": "./public/moon.png",
77
"publisher": "Friedrich482",
88
"author": {
99
"name": "Friedrich482"
1010
},
1111
"engines": {
12-
"vscode": "^1.95.0"
12+
"vscode": "^1.109.0"
1313
},
1414
"repository": {
1515
"type": "git",
@@ -124,29 +124,30 @@
124124
},
125125
"devDependencies": {
126126
"@types/dotenv": "^6.1.1",
127-
"@types/mocha": "^10.0.9",
128-
"@types/node": "20.x",
129-
"@types/vscode": "^1.95.0",
127+
"@types/mocha": "^10.0.10",
128+
"@types/node": "^20.19.32",
129+
"@types/vscode": "^1.109.0",
130130
"@types/ws": "^8.18.1",
131-
"@typescript-eslint/eslint-plugin": "^8.23.0",
132-
"@typescript-eslint/parser": "^8.23.0",
131+
"@typescript-eslint/eslint-plugin": "^8.54.0",
132+
"@typescript-eslint/parser": "^8.54.0",
133133
"@vscode/test-cli": "^0.0.10",
134-
"@vscode/test-electron": "^2.4.1",
134+
"@vscode/test-electron": "^2.5.2",
135135
"@vscode/vsce": "^3.7.1",
136136
"esbuild": "^0.25.8",
137-
"eslint": "^9.13.0",
138-
"typescript": "^5.7.3"
137+
"eslint": "^9.39.2",
138+
"typescript": "^5.9.3"
139139
},
140140
"dependencies": {
141141
"@repo/common": "*",
142142
"@repo/trpc": "*",
143-
"@trpc/client": "^11.1.0",
144-
"@trpc/server": "^11.1.0",
145-
"date-fns": "4.1.0",
146-
"dotenv": "^16.0.3",
147-
"express": "^4.21.2",
143+
"@trpc/client": "^11.7.2",
144+
"@trpc/server": "^11.7.2",
145+
"date-fns": "^4.1.0",
146+
"dotenv": "^16.6.1",
147+
"express": "^4.22.1",
148148
"get-port": "^7.1.0",
149+
"superjson": "^2.2.6",
149150
"ws": "^8.19.0",
150-
"zod": "^4.0.17"
151+
"zod": "^4.3.6"
151152
}
152153
}

‎apps/web/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
"@repo/common": "*",
1313
"@repo/trpc": "*",
1414
"@repo/ui": "*",
15-
"next": "^16.0.7",
15+
"next": "^16.1.6",
1616
"next-themes": "^0.4.6",
17-
"react": "19.2.0",
18-
"react-dom": "19.2.0"
17+
"react": "^19.2.0",
18+
"react-dom": "^19.2.0"
1919
},
2020
"devDependencies": {
21-
"@types/node": "^20",
22-
"@types/react": "19.2.5",
23-
"@types/react-dom": "19.2.3",
24-
"autoprefixer": "^10.4.21",
25-
"eslint": "^9.39.1",
26-
"eslint-config-next": "16.0.3",
27-
"postcss": "^8.4.31",
28-
"tailwindcss": "^4.1.11",
29-
"typescript": "^5"
21+
"@types/node": "^20.19.32",
22+
"@types/react": "^19.2.5",
23+
"@types/react-dom": "^19.2.3",
24+
"autoprefixer": "^10.4.24",
25+
"eslint": "^9.39.2",
26+
"eslint-config-next": "^16.0.3",
27+
"postcss": "^8.5.6",
28+
"tailwindcss": "^4.1.17",
29+
"typescript": "^5.9.3"
3030
},
3131
"overrides": {
3232
"@types/react": "19.2.5",

0 commit comments

Comments
 (0)