Skip to content

Commit

Permalink
chore: update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbrusegard committed Jun 23, 2024
1 parent 26b63c0 commit 6d357b0
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 61 deletions.
31 changes: 24 additions & 7 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,36 +1,53 @@
/** @type {import("eslint").Linter.Config} */
/** @type {import('eslint').Linter.Config} */
const config = {
parser: '@typescript-eslint/parser',
parserOptions: {
project: true,
},
plugins: ['@typescript-eslint'],
plugins: ['@typescript-eslint', 'drizzle'],
extends: [
'next/core-web-vitals',
'plugin:@typescript-eslint/recommended-type-checked',
'plugin:@typescript-eslint/stylistic-type-checked',
'plugin:prettier/recommended',
'prettier',
],
rules: {
'@typescript-eslint/array-type': 'off',
'@typescript-eslint/consistent-type-definitions': 'off',

'@typescript-eslint/consistent-type-imports': [
'warn',
{
prefer: 'type-imports',
fixStyle: 'inline-type-imports',
},
],
'@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
'@typescript-eslint/no-unused-vars': [
'warn',
{
argsIgnorePattern: '^_',
},
],
'@typescript-eslint/require-await': 'off',
'@typescript-eslint/no-misused-promises': [
'error',
{
checksVoidReturn: { attributes: false },
checksVoidReturn: {
attributes: false,
},
},
],
'drizzle/enforce-delete-with-where': [
'error',
{
drizzleObjectName: ['db', 'ctx.db'],
},
],
'drizzle/enforce-update-with-where': [
'error',
{
drizzleObjectName: ['db', 'ctx.db'],
},
],
},
};

module.exports = config;
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

bunx lint-staged
Binary file modified bun.lockb
Binary file not shown.
96 changes: 53 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,67 +1,77 @@
{
"name": "website-frontend",
"name": "website-next",
"version": "0.1.0",
"private": true,
"type": "module",
"scripts": {
"prepare": "husky install",
"prepare": "husky",
"postbuild": "next-sitemap",
"build": "next build",
"dev": "next dev",
"dev": "next dev --turbo",
"lint": "next lint",
"start": "next start"
"start": "next start",
"format": "prettier --write ."
},
"lint-staged": {
"*.{js,cjs,ts,tsx}": [
"eslint --fix"
"next lint",
"prettier --write"
]
},
"dependencies": {
"@radix-ui/react-avatar": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-tooltip": "^1.0.7",
"@t3-oss/env-nextjs": "^0.7.1",
"autoprefixer": "^10.4.17",
"clsx": "^2.1.0",
"country-flag-icons": "^1.5.9",
"@libsql/client": "^0.6.2",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.1",
"@t3-oss/env-nextjs": "^0.10.1",
"@tanstack/react-query": "^5.45.1",
"@trpc/client": "^10.45.2",
"@trpc/react-query": "^10.45.2",
"@trpc/server": "^10.45.2",
"autoprefixer": "^10.4.19",
"clsx": "^2.1.1",
"country-flag-icons": "^1.5.12",
"cva": "^1.0.0-beta.1",
"husky": "^9.0.10",
"lucide-react": "^0.312.0",
"next": "^14.0.4",
"next-intl": "^3.4.4",
"drizzle-orm": "^0.31.2",
"husky": "^9.0.11",
"lucide-react": "^0.396.0",
"next": "^14.2.4",
"next-intl": "^3.15.2",
"next-sitemap": "^4.2.3",
"next-themes": "^0.2.1",
"nuqs": "^1.15.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"next-themes": "^0.3.0",
"nuqs": "^1.17.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"reading-time": "^1.5.0",
"sharp": "^0.33.2",
"tailwind-merge": "^2.2.0",
"zod": "^3.22.4"
"server-only": "^0.0.1",
"sharp": "^0.33.4",
"tailwind-merge": "^2.3.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/eslint": "^8.44.7",
"@types/node": "^18.17.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"eslint": "^8.54.0",
"eslint-config-next": "^14.0.4",
"@types/eslint": "^8.56.10",
"@types/node": "^20.14.8",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^7.13.1",
"@typescript-eslint/parser": "^7.13.1",
"drizzle-kit": "^0.22.7",
"eslint": "^8.57.0",
"eslint-config-next": "^14.2.4",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"lint-staged": "^15.2.0",
"postcss": "^8.4.31",
"prettier": "^3.1.0",
"prettier-plugin-tailwindcss": "^0.5.7",
"tailwind-scrollbar": "^3.0.5",
"tailwindcss": "^3.3.5",
"eslint-plugin-drizzle": "^0.2.3",
"lint-staged": "^15.2.7",
"postcss": "^8.4.38",
"prettier": "^3.3.2",
"prettier-plugin-tailwindcss": "^0.6.5",
"tailwind-scrollbar": "^3.1.0",
"tailwindcss": "^3.4.4",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.1.6"
"typescript": "^5.5.0"
},
"packageManager": "bun@1.0.24"
"packageManager": "bun@1.1.12"
}
4 changes: 2 additions & 2 deletions src/components/ui/Sheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const SheetOverlay = React.forwardRef<
>(({ className, ...props }, ref) => (
<SheetPrimitive.Overlay
className={cx(
'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
className,
)}
{...props}
Expand All @@ -38,7 +38,7 @@ const sheetVariants = cva({
'inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom',
left: 'inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm',
right:
'inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm',
'inset-y-0 right-0 h-full w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm',
},
},
defaultVariants: {
Expand Down
2 changes: 1 addition & 1 deletion src/design/Field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ const Field: React.FC<FieldProps> = ({
? 'bg-green-500 px-2'
: 'bg-accent-500 w-10',
index === buttons.length - 1
? ' rounded-l-none rounded-r-md'
? 'rounded-l-none rounded-r-md'
: 'rounded-none',
'disabled:bg-accent-500',
value.className,
Expand Down
10 changes: 5 additions & 5 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
/* Path Aliases */
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"],
},
"@/*": ["./src/*"]
}
},
"include": [
".eslintrc.cjs",
".eslintrc.js",
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",
"**/*.cjs",
"**/*.js",
".next/types/**/*.ts",
".next/types/**/*.ts"
],
"exclude": ["node_modules"],
"exclude": ["node_modules"]
}

0 comments on commit 6d357b0

Please sign in to comment.