Skip to content

Commit

Permalink
core: update
Browse files Browse the repository at this point in the history
  • Loading branch information
vgseven committed Oct 27, 2024
1 parent 8038d83 commit f1ba26d
Show file tree
Hide file tree
Showing 15 changed files with 533 additions and 274 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,8 @@ jobs:
- name: Performing Format
run: pnpm run format

- name: Performing Check
run: pnpm run check

- name: Performing Build
run: pnpm run build
run: pnpm run build
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pnpm run typecheck
pnpm run lint
pnpm run format
pnpm run check
pnpm run build
14 changes: 7 additions & 7 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev --turbo",
"dev": "next dev --turbopack",
"build": "next build",
"start": "next start",
"typecheck": "tsc --noEmit"
Expand All @@ -12,19 +12,19 @@
"@repo/ui": "workspace:*",
"@repo/lib": "workspace:*",
"geist": "^1.3.1",
"next": "14.2.14",
"next": "15.0.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@repo/tailwind-config": "workspace:*",
"@repo/ts-config": "workspace:*",
"@types/node": "^22.7.4",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/node": "^22.8.1",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.47",
"tailwindcss": "^3.4.13",
"typescript": "^5.6.2"
"tailwindcss": "^3.4.14",
"typescript": "^5.6.3"
}
}
2 changes: 1 addition & 1 deletion apps/web/src/lib/fonts.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GeistSans } from "geist/font/sans";
import { GeistMono } from "geist/font/mono";
import { GeistSans } from "geist/font/sans";

export const fonts = { GeistSans, GeistMono };
2 changes: 1 addition & 1 deletion apps/web/tailwind.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Config } from "tailwindcss";
import { default as twConfig } from "@repo/tailwind-config/tailwind";
import type { Config } from "tailwindcss";

const config: Pick<Config, "presets"> = {
presets: [
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,18 @@
"lint": "biome lint --write .",
"lint:fix": "biome lint --write --unsafe .",
"format": "biome format --write .",
"prepare": "husky"
"check": "biome check --write .",
"prepare": "husky",
"build:prepare": "pnpm run typecheck && pnpm run lint && pnpm run check && pnpm run format && pnpm run build"
},
"devDependencies": {
"@biomejs/biome": "^1.9.3",
"@biomejs/biome": "^1.9.4",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.9",
"husky": "^9.1.6",
"turbo": "^2.1.3"
"turbo": "^2.2.3"
},
"packageManager": "[email protected].0",
"packageManager": "[email protected].2",
"engines": {
"node": ">=20"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"typecheck": "tsc --noEmit"
},
"devDependencies": {
"typescript": "5.6.2",
"typescript": "5.6.3",
"@repo/ts-config": "workspace:*"
},
"dependencies": {
"clsx": "^2.1.1",
"tailwind-merge": "^2.5.3"
"tailwind-merge": "^2.5.4"
}
}
2 changes: 1 addition & 1 deletion packages/lib/src/utils/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { clsx, type ClassValue } from "clsx";
import { type ClassValue, clsx } from "clsx";
import { twMerge } from "tailwind-merge";

export function cn(...inputs: ClassValue[]) {
Expand Down
2 changes: 1 addition & 1 deletion packages/tailwind-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"./tailwind": "./configs/tailwind-presets.ts"
},
"devDependencies": {
"tailwindcss": "^3.4.13"
"tailwindcss": "^3.4.14"
},
"dependencies": {
"tailwindcss-animate": "^1.0.7"
Expand Down
2 changes: 1 addition & 1 deletion packages/ts-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"./next": "./configs/next.json"
},
"devDependencies": {
"typescript": "5.6.2"
"typescript": "5.6.3"
}
}
10 changes: 5 additions & 5 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"devDependencies": {
"@repo/tailwind-config": "workspace:*",
"@repo/ts-config": "workspace:*",
"@types/node": "^22.7.4",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/node": "^22.8.1",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.47",
"tailwindcss": "^3.4.13",
"typescript": "^5.6.2"
"tailwindcss": "^3.4.14",
"typescript": "^5.6.3"
},
"dependencies": {
"@repo/lib": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/primitives/label.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from "react";
import * as LabelPrimitive from "@radix-ui/react-label";
import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "@repo/lib";
import { type VariantProps, cva } from "class-variance-authority";
import * as React from "react";

const labelVariants = cva(
"font-medium text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/tailwind.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Config } from "tailwindcss";
import { default as twConfig } from "@repo/tailwind-config/tailwind";
import type { Config } from "tailwindcss";

const config: Pick<Config, "presets"> = {
presets: [
Expand Down
Loading

0 comments on commit f1ba26d

Please sign in to comment.