From 157ba09980f9204b540040bfb6f8eabc38042650 Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Fri, 6 Dec 2024 22:30:54 -0500 Subject: [PATCH] Added fluid-tailwind and updated React to stable --- package.json | 19 ++++------- tailwind.config.ts | 22 ++++++++----- yarn.lock | 80 +++++++++++++++++++++++++++++++--------------- 3 files changed, 74 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index ae45170..57c7355 100644 --- a/package.json +++ b/package.json @@ -44,9 +44,9 @@ "lodash": "^4.17.21", "lucide-react": "^0.462.0", "next": "^15.0.3", - "react": "19.0.0-rc.1", + "react": "^19.0.0", "react-day-picker": "^9.3.2", - "react-dom": "19.0.0-rc.1", + "react-dom": "^19.0.0", "sharp": "^0.33.5", "sonner": "^1.7.0", "stripe": "^17.4.0", @@ -69,8 +69,8 @@ "@types/dompurify": "^3", "@types/lodash": "^4.17.13", "@types/node": "^22.10.1", - "@types/react": "npm:types-react@19.0.0-rc.1", - "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1", + "@types/react": "^19.0.0", + "@types/react-dom": "^19.0.0", "@typescript-eslint/eslint-plugin": "^8.15.0", "@typescript-eslint/parser": "^8.16.0", "autoprefixer": "^10.4.20", @@ -79,6 +79,7 @@ "eslint-config-next": "15.0.3", "eslint-config-prettier": "^9.1.0", "eslint-plugin-react-compiler": "^19.0.0-beta-63b359f-20241101", + "fluid-tailwind": "^1.0.4", "mintlify": "^4.0.285", "postcss": "^8.4.49", "prettier": "^3.3.3", @@ -87,13 +88,5 @@ "tailwindcss": "^3.4.13", "typescript": "^5.6.3" }, - "overrides": { - "@types/react": "npm:types-react@rc", - "@types/react-dom": "npm:types-react-dom@rc" - }, - "packageManager": "yarn@4.5.3", - "resolutions": { - "@types/react": "npm:types-react@19.0.0-rc.1", - "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1" - } + "packageManager": "yarn@4.5.3" } diff --git a/tailwind.config.ts b/tailwind.config.ts index d621405..53882bc 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -1,20 +1,26 @@ +import fluid, { extract, screens, fontSize } from 'fluid-tailwind'; import type { Config } from 'tailwindcss'; const config = { darkMode: ['class'], - content: [ - './pages/**/*.{ts,tsx,md,mdx}', - './components/**/*.{ts,tsx,md,mdx}', - './app/**/*.{ts,tsx,md,mdx}', - './src/**/*.{ts,tsx,md,mdx}', - ], + content: { + files: [ + './pages/**/*.{ts,tsx,md,mdx}', + './components/**/*.{ts,tsx,md,mdx}', + './app/**/*.{ts,tsx,md,mdx}', + './src/**/*.{ts,tsx,md,mdx}', + ], + extract, + }, prefix: '', theme: { + screens, + fontSize, container: { center: true, padding: '2rem', screens: { - '2xl': '1400px', + '2xl': '84rem', }, }, extend: { @@ -74,7 +80,7 @@ const config = { }, }, }, - plugins: [require('tailwindcss-animate'), require('@tailwindcss/typography')], + plugins: [require('tailwindcss-animate'), require('@tailwindcss/typography'), fluid], } satisfies Config; export default config; diff --git a/yarn.lock b/yarn.lock index 6f806c9..e83a600 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3772,21 +3772,21 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:types-react-dom@19.0.0-rc.1": - version: 19.0.0-rc.1 - resolution: "types-react-dom@npm:19.0.0-rc.1" +"@types/react-dom@npm:^19.0.0": + version: 19.0.1 + resolution: "@types/react-dom@npm:19.0.1" dependencies: "@types/react": "npm:*" - checksum: 10c0/a6b3aea0ad4cd3b08afde28e869b30f4759a84ea8edf549c2e99d38328f07697f21b792842ef352e086e964b3fb947a54746390ae76ca586ae1a913338f94c1e + checksum: 10c0/fb40069a7c5c70475155dff91d25ff5a51226c14d45c8ad55894480366876426981c8be63ef322486af879bb220bf48443f2344c1a89cb75a47a1a761acee9d3 languageName: node linkType: hard -"@types/react@npm:types-react@19.0.0-rc.1": - version: 19.0.0-rc.1 - resolution: "types-react@npm:19.0.0-rc.1" +"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^19.0.0": + version: 19.0.1 + resolution: "@types/react@npm:19.0.1" dependencies: csstype: "npm:^3.0.2" - checksum: 10c0/408cd9f3f960e806d510f7a9a3569f92a7f1cff3c57f5465fab4c139f0020c88dc7a08e6f357d2a116bd2c76e641851ce84527cb765f36824a6e818e0d477bbc + checksum: 10c0/25eb69114abb9a6d5fc4414ee584388275bbc9ac32976449cf58b95fe9880efe6b3f936c3842be9bed8c571546a9752e8d3e2095288381e9c809269f5f574f2e languageName: node linkType: hard @@ -6697,6 +6697,13 @@ __metadata: languageName: node linkType: hard +"filter-obj@npm:^5.1.0": + version: 5.1.0 + resolution: "filter-obj@npm:5.1.0" + checksum: 10c0/716e8ad2bc352e206556b3e5695b3cdff8aab80c53ea4b00c96315bbf467b987df3640575100aef8b84e812cf5ea4251db4cd672bbe33b1e78afea88400c67dd + languageName: node + linkType: hard + "finalhandler@npm:1.3.1": version: 1.3.1 resolution: "finalhandler@npm:1.3.1" @@ -6750,6 +6757,19 @@ __metadata: languageName: node linkType: hard +"fluid-tailwind@npm:^1.0.4": + version: 1.0.4 + resolution: "fluid-tailwind@npm:1.0.4" + dependencies: + filter-obj: "npm:^5.1.0" + map-obj: "npm:^5.0.2" + picocolors: "npm:^1.0.0" + peerDependencies: + tailwindcss: ^3.2.0 + checksum: 10c0/279659e5473ad55437edf19674246da86e1b2d54bd56c41f33090ed47d636eff0c62608cab96df53b6027f3f91225f3c44d21e1dc559ae9ce8f536e40ea701ca + languageName: node + linkType: hard + "follow-redirects@npm:^1.15.6": version: 1.15.9 resolution: "follow-redirects@npm:1.15.9" @@ -8781,6 +8801,13 @@ __metadata: languageName: node linkType: hard +"map-obj@npm:^5.0.2": + version: 5.0.2 + resolution: "map-obj@npm:5.0.2" + checksum: 10c0/033f56d93ba08bb389be421819119765bb722ab9742a97b68688fde0d6d4dcbf79a665da9ee3273aef3987e0eb2ba6dab8dcd4ee883163b4a77b4d64e50d63c9 + languageName: node + linkType: hard + "markdown-extensions@npm:^1.0.0": version: 1.1.1 resolution: "markdown-extensions@npm:1.1.1" @@ -11698,14 +11725,14 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:19.0.0-rc.1": - version: 19.0.0-rc.1 - resolution: "react-dom@npm:19.0.0-rc.1" +"react-dom@npm:^19.0.0": + version: 19.0.0 + resolution: "react-dom@npm:19.0.0" dependencies: - scheduler: "npm:0.25.0-rc.1" + scheduler: "npm:^0.25.0" peerDependencies: - react: 19.0.0-rc.1 - checksum: 10c0/26fba423f41c8b3c7a47278ea490146506333175028e111e49eb39310110b6bda956cc772c77412abc8a7f28244eea80ebade15ec5b4382d79e2ac1b39bd2d0c + react: ^19.0.0 + checksum: 10c0/a36ce7ab507b237ae2759c984cdaad4af4096d8199fb65b3815c16825e5cfeb7293da790a3fc2184b52bfba7ba3ff31c058c01947aff6fd1a3701632aabaa6a9 languageName: node linkType: hard @@ -11787,10 +11814,10 @@ __metadata: languageName: node linkType: hard -"react@npm:19.0.0-rc.1": - version: 19.0.0-rc.1 - resolution: "react@npm:19.0.0-rc.1" - checksum: 10c0/8f453ee0ff05ec4b11701cf4240fb0039217e73f576d2a9b871a91e34ff17d66e16294ebd0fc72c237918a3a997cc42f0328c860bc0a2cfa18e6a41f49a1c871 +"react@npm:^19.0.0": + version: 19.0.0 + resolution: "react@npm:19.0.0" + checksum: 10c0/9cad8f103e8e3a16d15cb18a0d8115d8bd9f9e1ce3420310aea381eb42aa0a4f812cf047bb5441349257a05fba8a291515691e3cb51267279b2d2c3253f38471 languageName: node linkType: hard @@ -12424,10 +12451,10 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:0.25.0-rc.1": - version: 0.25.0-rc.1 - resolution: "scheduler@npm:0.25.0-rc.1" - checksum: 10c0/dd4549eeb54cf3019c04257c622c4bbee12ef99dc547c4a96e1d5da8985ae44534111275ebcc4fea84b0d1299197b69071f912928adc5da4cab1e8168d09a44d +"scheduler@npm:^0.25.0": + version: 0.25.0 + resolution: "scheduler@npm:0.25.0" + checksum: 10c0/a4bb1da406b613ce72c1299db43759526058fdcc413999c3c3e0db8956df7633acf395cb20eb2303b6a65d658d66b6585d344460abaee8080b4aa931f10eaafe languageName: node linkType: hard @@ -13247,8 +13274,8 @@ __metadata: "@types/lodash": "npm:^4.17.13" "@types/mdx": "npm:^2.0.13" "@types/node": "npm:^22.10.1" - "@types/react": "npm:types-react@19.0.0-rc.1" - "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1" + "@types/react": "npm:^19.0.0" + "@types/react-dom": "npm:^19.0.0" "@typescript-eslint/eslint-plugin": "npm:^8.15.0" "@typescript-eslint/parser": "npm:^8.16.0" "@vercel/analytics": "npm:^1.4.1" @@ -13264,6 +13291,7 @@ __metadata: eslint-config-next: "npm:15.0.3" eslint-config-prettier: "npm:^9.1.0" eslint-plugin-react-compiler: "npm:^19.0.0-beta-63b359f-20241101" + fluid-tailwind: "npm:^1.0.4" lodash: "npm:^4.17.21" lucide-react: "npm:^0.462.0" mintlify: "npm:^4.0.285" @@ -13272,9 +13300,9 @@ __metadata: prettier: "npm:^3.3.3" prettier-plugin-tailwindcss: "npm:^0.6.9" prisma: "npm:^6.0.0" - react: "npm:19.0.0-rc.1" + react: "npm:^19.0.0" react-day-picker: "npm:^9.3.2" - react-dom: "npm:19.0.0-rc.1" + react-dom: "npm:^19.0.0" sharp: "npm:^0.33.5" sonner: "npm:^1.7.0" stripe: "npm:^17.4.0"