Skip to content

Commit

Permalink
Merge branch 'main' into next15
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusmarminge committed Nov 23, 2024
2 parents f0c8da2 + 066e7e6 commit d796f59
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.18
20.18
2 changes: 1 addition & 1 deletion apps/auth-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@acme/prettier-config": "workspace:*",
"@acme/tailwind-config": "workspace:*",
"@acme/tsconfig": "workspace:*",
"@types/node": "^20.17.6",
"@types/node": "^20.17.7",
"eslint": "catalog:",
"h3": "^1.13.0",
"nitropack": "^2.10.4",
Expand Down
4 changes: 2 additions & 2 deletions apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
"@acme/prettier-config": "workspace:*",
"@acme/tailwind-config": "workspace:*",
"@acme/tsconfig": "workspace:*",
"@types/node": "^20.17.6",
"@types/node": "^20.17.7",
"@types/react": "catalog:react19",
"@types/react-dom": "catalog:react19",
"dotenv-cli": "^7.4.4",
"dotenv-cli": "^7.4.2",
"eslint": "catalog:",
"jiti": "^1.21.6",
"prettier": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"engines": {
"node": ">=20.18.1",
"pnpm": "^9.6.0"
"pnpm": "^9.14.2"
},
"packageManager": "[email protected]",
"scripts": {
Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

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

0 comments on commit d796f59

Please sign in to comment.