Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add option to use Geist Sans instead of Inter #1821

Merged
merged 11 commits into from
May 7, 2024
Prev Previous commit
Next Next commit
Merge branch 't3-oss'
# Conflicts:
#	cli/package.json
#	package.json
#	pnpm-lock.yaml
  • Loading branch information
Ethan Zhou authored and Ethan Zhou committed May 2, 2024
commit dc25e9f0a308cff7b98cd6f2b896febae0b775dc
5 changes: 1 addition & 4 deletions cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,5 @@
"type-fest": "^3.7.0",
"typescript": "^5.4.2",
"zod": "^3.23.3"
},
"trustedDependencies": [
"es5-ext"
]
}
}
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@
},
"dependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.27.1",
"@changesets/cli": "^2.26.1",
"@manypkg/cli": "^0.20.0",
"@total-typescript/ts-reset": "^0.3.7",
"@types/eslint": "^8.56.10",
"@types/node": "^20.12.7",
"@typescript-eslint/eslint-plugin": "^7.7.1",
"@typescript-eslint/parser": "^7.7.1",
"@types/eslint": "^8.56.2",
"@types/node": "^20.11.20",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-isaacscript": "^2.6.7",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.1",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"prettier": "^3.2.5",
"turbo": "1.13.3-canary.3",
"typescript": "^5.4.5"
"typescript": "^5.4.2"
}
}
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.