From cb037ceffc20d12c7a73cf1bfd63e99b0b76ced8 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Sat, 11 Apr 2026 10:26:20 +0800 Subject: [PATCH] fix(ci): restore ota typing and tailwind config compatibility --- packages/configs/package.json | 2 +- packages/configs/tailwindcss/web.ts | 28 ++++++++++++---------------- pnpm-lock.yaml | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/packages/configs/package.json b/packages/configs/package.json index c06b302b4..339c53917 100644 --- a/packages/configs/package.json +++ b/packages/configs/package.json @@ -8,7 +8,7 @@ "./tsconfig.extend.json": "./tsconfig.extend.json" }, "peerDependencies": { - "tailwindcss": ">=3 || <4" + "tailwindcss": ">=3 <4" }, "dependencies": { "@egoist/tailwindcss-icons": "1.9.2", diff --git a/packages/configs/tailwindcss/web.ts b/packages/configs/tailwindcss/web.ts index a20766440..1eeca7ee1 100644 --- a/packages/configs/tailwindcss/web.ts +++ b/packages/configs/tailwindcss/web.ts @@ -6,7 +6,6 @@ import { cleanupSVG, importDirectorySync, isEmptyColor, parseColors, runSVGO } f import { compareColors, stringToColor } from "@iconify/utils/lib/colors" import { merge } from "es-toolkit/compat" import path, { resolve } from "pathe" -import { theme } from "tailwindcss/defaultConfig" import type { Config } from "tailwindcss/types/config" import { withUIKit } from "tailwindcss-uikit-colors/src/macos/tailwind" import { workspaceRootSync } from "workspace-root" @@ -26,22 +25,19 @@ const twConfig = { "2xl": "1400px", }, }, - - fontSize: { - ...theme?.fontSize, - largeTitle: ["1.625rem", "2rem"], // 26px - title1: ["1.375rem", "1.625rem"], // 22px - title2: ["1.0625rem", "1.375rem"], // 17px - title3: ["0.9375rem", "1.25rem"], // 15px - headline: ["0.8125rem", "1rem"], // 13px - body: ["0.8125rem", "1rem"], // 13px - callout: ["0.75rem", "0.9375rem"], // 12px - subheadline: ["0.6875rem", "0.875rem"], // 11px - footnote: ["0.625rem", "0.8125rem"], // 10px - caption: ["0.625rem", "0.8125rem"], // 10px - }, - extend: { + fontSize: { + largeTitle: ["1.625rem", "2rem"], // 26px + title1: ["1.375rem", "1.625rem"], // 22px + title2: ["1.0625rem", "1.375rem"], // 17px + title3: ["0.9375rem", "1.25rem"], // 15px + headline: ["0.8125rem", "1rem"], // 13px + body: ["0.8125rem", "1rem"], // 13px + callout: ["0.75rem", "0.9375rem"], // 12px + subheadline: ["0.6875rem", "0.875rem"], // 11px + footnote: ["0.625rem", "0.8125rem"], // 10px + caption: ["0.625rem", "0.8125rem"], // 10px + }, fontFamily: { theme: "var(--fo-font-family)", }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b6208f29d..85c845c5a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1702,7 +1702,7 @@ importers: specifier: 1.44.0 version: 1.44.0 tailwindcss: - specifier: '>=3 || <4' + specifier: '>=3 <4' version: 3.4.17(ts-node@10.9.2(@types/node@25.2.3)(typescript@5.9.3)) tailwindcss-animate: specifier: 1.0.7