diff --git a/.changeset/clean-dolphins-tell.md b/.changeset/clean-dolphins-tell.md new file mode 100644 index 000000000..3eb583dee --- /dev/null +++ b/.changeset/clean-dolphins-tell.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/ui': patch +--- + +Update styles of toaster diff --git a/.changeset/curly-ants-speak.md b/.changeset/curly-ants-speak.md new file mode 100644 index 000000000..f5024fb22 --- /dev/null +++ b/.changeset/curly-ants-speak.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/ui': patch +--- + +Add margin to video elements in typography styles diff --git a/.changeset/curly-hats-look.md b/.changeset/curly-hats-look.md new file mode 100644 index 000000000..212ac391c --- /dev/null +++ b/.changeset/curly-hats-look.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/ui': patch +--- + +Update build process and style imports for better organization diff --git a/.changeset/curly-pumas-shout.md b/.changeset/curly-pumas-shout.md new file mode 100644 index 000000000..dc102b6ed --- /dev/null +++ b/.changeset/curly-pumas-shout.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/eslint-config': patch +--- + +Temporarily disable tailwindcss plugin diff --git a/.changeset/fair-pears-repeat.md b/.changeset/fair-pears-repeat.md new file mode 100644 index 000000000..9b7362d0c --- /dev/null +++ b/.changeset/fair-pears-repeat.md @@ -0,0 +1,8 @@ +--- +'@tszhong0411/prettier-config': patch +--- + +Upgrade some dependencies + +- Upgrade prettier-plugin-sort-json from `^4.0.0` to `^4.1.1` +- Upgrade prettier-plugin-tailwindcss from `^0.6.9` to `^0.6.11` diff --git a/.changeset/happy-hotels-impress.md b/.changeset/happy-hotels-impress.md new file mode 100644 index 000000000..c8c12b2a0 --- /dev/null +++ b/.changeset/happy-hotels-impress.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/ui': patch +--- + +Update paths for CSS files and include CSS in build process diff --git a/.changeset/lazy-fans-grin.md b/.changeset/lazy-fans-grin.md new file mode 100644 index 000000000..27bb8a66f --- /dev/null +++ b/.changeset/lazy-fans-grin.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/ui': patch +--- + +Add `@tailwindcss/typography` for v4 diff --git a/.changeset/odd-zebras-refuse.md b/.changeset/odd-zebras-refuse.md new file mode 100644 index 000000000..adca23d52 --- /dev/null +++ b/.changeset/odd-zebras-refuse.md @@ -0,0 +1,7 @@ +--- +'@tszhong0411/prettier-plugin-package-json': patch +'@tszhong0411/prettier-config': patch +'@tszhong0411/utils': patch +--- + +Remove `sideEffects` in package.json diff --git a/.changeset/quiet-keys-share.md b/.changeset/quiet-keys-share.md new file mode 100644 index 000000000..3d0d052f5 --- /dev/null +++ b/.changeset/quiet-keys-share.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/ui': patch +--- + +Adjust Callout component styles for improved appearance diff --git a/.changeset/smooth-falcons-wash.md b/.changeset/smooth-falcons-wash.md new file mode 100644 index 000000000..ddadabae1 --- /dev/null +++ b/.changeset/smooth-falcons-wash.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/ui': patch +--- + +Simplify CSS selectors for Shiki styles diff --git a/.changeset/unlucky-masks-perform.md b/.changeset/unlucky-masks-perform.md new file mode 100644 index 000000000..8c267eee5 --- /dev/null +++ b/.changeset/unlucky-masks-perform.md @@ -0,0 +1,5 @@ +--- +'@tszhong0411/ui': patch +--- + +Adjust line-height for highlighted code blocks in shiki.css diff --git a/apps/docs/package.json b/apps/docs/package.json index 2c8cec5c5..0f1dd7ba3 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -38,9 +38,9 @@ }, "devDependencies": { "@next/bundle-analyzer": "^15.1.3", + "@tailwindcss/postcss": "^4.0.1", "@tszhong0411/eslint-config": "workspace:*", "@tszhong0411/shared": "workspace:*", - "@tszhong0411/tailwind-config": "workspace:*", "@tszhong0411/tsconfig": "workspace:*", "@types/node": "^22.10.2", "@types/react": "19.0.2", @@ -49,7 +49,7 @@ "postcss": "^8.5.1", "postcss-lightningcss": "^1.0.1", "postcss-load-config": "^6.0.1", - "tailwindcss": "^3.4.17" + "tailwindcss": "^4.0.1" }, "lint-staged": { "*.{cjs,mjs,js,jsx,cts,mts,ts,tsx,json}": "eslint --fix", diff --git a/apps/docs/postcss.config.mjs b/apps/docs/postcss.config.mjs index dd433ece8..d3ae09cc5 100644 --- a/apps/docs/postcss.config.mjs +++ b/apps/docs/postcss.config.mjs @@ -1,7 +1,7 @@ /** @type {import('postcss-load-config').Config} */ export default { plugins: { - tailwindcss: {}, + '@tailwindcss/postcss': {}, 'postcss-lightningcss': { browsers: '>= .25%' } diff --git a/apps/docs/src/app/layout.tsx b/apps/docs/src/app/layout.tsx index d51fb78d2..18a386f98 100644 --- a/apps/docs/src/app/layout.tsx +++ b/apps/docs/src/app/layout.tsx @@ -2,7 +2,6 @@ import type { Metadata, Viewport } from 'next' import '@/styles/globals.css' -import { Toaster } from '@tszhong0411/ui' import { cn } from '@tszhong0411/utils' import { GeistMono } from 'geist/font/mono' import { GeistSans } from 'geist/font/sans' @@ -119,7 +118,6 @@ const Layout = (props: LayoutProps) => {
{children}
- diff --git a/apps/docs/src/app/providers.tsx b/apps/docs/src/app/providers.tsx index 6426a84e0..cee478465 100644 --- a/apps/docs/src/app/providers.tsx +++ b/apps/docs/src/app/providers.tsx @@ -2,6 +2,8 @@ import { ThemeProvider } from 'next-themes' +import Sonner from '@/components/sonner' + type ProvidesProps = { children: React.ReactNode } @@ -18,6 +20,7 @@ const Providers = (props: ProvidesProps) => { disableTransitionOnChange > {children} + ) } diff --git a/apps/docs/src/components/demos/navigation-menu/navigation-menu.tsx b/apps/docs/src/components/demos/navigation-menu/navigation-menu.tsx index e24b904fc..01670d052 100644 --- a/apps/docs/src/components/demos/navigation-menu/navigation-menu.tsx +++ b/apps/docs/src/components/demos/navigation-menu/navigation-menu.tsx @@ -61,7 +61,7 @@ const NavigationMenuDemo = () => {
  • @@ -110,7 +110,7 @@ const ListItem = (props: ListItemProps) => { { return ( -
    +
    diff --git a/apps/docs/src/components/layout/search.tsx b/apps/docs/src/components/layout/search.tsx index dd37e5676..92cac420e 100644 --- a/apps/docs/src/components/layout/search.tsx +++ b/apps/docs/src/components/layout/search.tsx @@ -62,7 +62,7 @@ const Search = () => { }} > Search documentation - + K diff --git a/apps/docs/src/components/sonner.tsx b/apps/docs/src/components/sonner.tsx new file mode 100644 index 000000000..46a329d7a --- /dev/null +++ b/apps/docs/src/components/sonner.tsx @@ -0,0 +1,21 @@ +'use client' + +import { Toaster, type ToasterProps } from '@tszhong0411/ui' +import { useTheme } from 'next-themes' + +const Sonner = () => { + const { theme } = useTheme() + + return ( + + ) +} + +export default Sonner diff --git a/apps/docs/src/styles/globals.css b/apps/docs/src/styles/globals.css index 52beae7ec..587c00cce 100644 --- a/apps/docs/src/styles/globals.css +++ b/apps/docs/src/styles/globals.css @@ -1,23 +1,12 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import 'tailwindcss'; +@import '@tszhong0411/ui/styles/preset.css'; +@import '@tszhong0411/ui/styles/shiki.css'; +@import '@tszhong0411/ui/styles/typography.css'; +@source '../../../../packages/ui/src/**/*.{js,jsx,ts,tsx}'; -.shiki span { - color: var(--shiki-light); -} - -.dark .shiki span { - color: var(--shiki-dark); -} - -pre.shiki { - font-size: 13px; -} +@theme { + --max-width-8xl: 92rem; -pre.shiki .highlighted { - margin: 0 -16px; - padding: 0 16px; - display: inline-block; - min-width: calc(100% + 32px); - background-color: theme('colors.primary.DEFAULT / 10%'); + --font-sans: var(--font-geist-sans); + --font-mono: var(--font-geist-mono); } diff --git a/apps/docs/tailwind.config.ts b/apps/docs/tailwind.config.ts deleted file mode 100644 index 0464eb2fc..000000000 --- a/apps/docs/tailwind.config.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type { Config } from 'tailwindcss' - -import sharedConfig from '@tszhong0411/tailwind-config' - -const config: Config = { - content: ['./src/**/*.{js,ts,jsx,tsx,md,mdx}', '../../packages/ui/src/**/*.{js,ts,jsx,tsx}'], - presets: [sharedConfig], - theme: { - extend: { - maxWidth: { - '8xl': '92rem' - } - } - } -} - -export default config diff --git a/apps/web/package.json b/apps/web/package.json index caef739e1..f7f897e91 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -78,12 +78,12 @@ "devDependencies": { "@axe-core/playwright": "^4.10.1", "@next/bundle-analyzer": "^15.1.3", + "@tailwindcss/postcss": "^4.0.1", "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.2.0", "@tszhong0411/eslint-config": "workspace:*", "@tszhong0411/kv": "workspace:*", "@tszhong0411/shared": "workspace:*", - "@tszhong0411/tailwind-config": "workspace:*", "@tszhong0411/tsconfig": "workspace:*", "@types/canvas-confetti": "^1.9.0", "@types/node": "^22.10.2", @@ -98,7 +98,7 @@ "postcss-load-config": "^6.0.1", "schema-dts": "^1.1.2", "sharp": "^0.33.5", - "tailwindcss": "^3.4.17" + "tailwindcss": "^4.0.1" }, "lint-staged": { "*.{cjs,mjs,js,jsx,cts,mts,ts,tsx,json}": "eslint --fix", diff --git a/apps/web/postcss.config.mjs b/apps/web/postcss.config.mjs index dd433ece8..d3ae09cc5 100644 --- a/apps/web/postcss.config.mjs +++ b/apps/web/postcss.config.mjs @@ -1,7 +1,7 @@ /** @type {import('postcss-load-config').Config} */ export default { plugins: { - tailwindcss: {}, + '@tailwindcss/postcss': {}, 'postcss-lightningcss': { browsers: '>= .25%' } diff --git a/apps/web/src/app/[locale]/(main)/blog/[slug]/header.tsx b/apps/web/src/app/[locale]/(main)/blog/[slug]/header.tsx index 139465a7a..0c029b20e 100644 --- a/apps/web/src/app/[locale]/(main)/blog/[slug]/header.tsx +++ b/apps/web/src/app/[locale]/(main)/blog/[slug]/header.tsx @@ -41,7 +41,7 @@ const Header = () => { return (
    -

    +

    {title}

    diff --git a/apps/web/src/app/[locale]/(main)/dashboard/metrics.tsx b/apps/web/src/app/[locale]/(main)/dashboard/metrics.tsx index ccfe6ba42..fef2316a9 100644 --- a/apps/web/src/app/[locale]/(main)/dashboard/metrics.tsx +++ b/apps/web/src/app/[locale]/(main)/dashboard/metrics.tsx @@ -136,7 +136,7 @@ const Metrics = () => {
    diff --git a/apps/web/src/app/[locale]/(main)/guestbook/loader.tsx b/apps/web/src/app/[locale]/(main)/guestbook/loader.tsx index 6d867c83b..d66b855ac 100644 --- a/apps/web/src/app/[locale]/(main)/guestbook/loader.tsx +++ b/apps/web/src/app/[locale]/(main)/guestbook/loader.tsx @@ -2,7 +2,7 @@ import { Skeleton } from '@tszhong0411/ui' import { cn, range } from '@tszhong0411/utils' const Placeholder = () => ( -
    +
    diff --git a/apps/web/src/app/[locale]/(main)/guestbook/messages.tsx b/apps/web/src/app/[locale]/(main)/guestbook/messages.tsx index 0dd24f75f..a86e12d3b 100644 --- a/apps/web/src/app/[locale]/(main)/guestbook/messages.tsx +++ b/apps/web/src/app/[locale]/(main)/guestbook/messages.tsx @@ -111,7 +111,7 @@ const Message = (props: MessageProps) => { return ( -
    +
    { return ( -
    +
    @@ -27,7 +27,7 @@ const Pinned = () => {
    -
    +
    ) } diff --git a/apps/web/src/app/[locale]/(main)/guestbook/sign-in.tsx b/apps/web/src/app/[locale]/(main)/guestbook/sign-in.tsx index 2def2b6c6..a13c809ca 100644 --- a/apps/web/src/app/[locale]/(main)/guestbook/sign-in.tsx +++ b/apps/web/src/app/[locale]/(main)/guestbook/sign-in.tsx @@ -11,7 +11,7 @@ const SignIn = () => { return ( <>