diff --git a/.prettierrc.cjs b/.prettierrc.cjs index 67800e7c..565450ea 100644 --- a/.prettierrc.cjs +++ b/.prettierrc.cjs @@ -4,4 +4,7 @@ module.exports = { semi: true, singleQuote: false, printWidth: 100, + // tailwind pluging config + plugins: ["prettier-plugin-tailwindcss"], + tailwindConfig: "./tailwind.config.cjs", }; diff --git a/package-lock.json b/package-lock.json index 76a93203..504291d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,8 +60,8 @@ "eslint-plugin-storybook": "0.6.13", "eslint-plugin-tsdoc": "0.2.17", "jsdom": "^22.1.0", - "prettier": "^3.0.0", - "prettier-plugin-tailwindcss": "0.3.0", + "prettier": "^3.0.3", + "prettier-plugin-tailwindcss": "0.5.5", "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -21608,9 +21608,9 @@ } }, "node_modules/prettier": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.0.tgz", - "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -21635,12 +21635,12 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.3.0.tgz", - "integrity": "sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.5.tgz", + "integrity": "sha512-voy0CjWv/CM8yeaduv5ZwovovpTGMR5LbzlhGF+LtEvMJt9wBeVTVnW781hL38R/RcDXCJwN2rolsgr94B/n0Q==", "dev": true, "engines": { - "node": ">=12.17.0" + "node": ">=14.21.3" }, "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", @@ -21648,17 +21648,15 @@ "@shopify/prettier-plugin-liquid": "*", "@shufo/prettier-plugin-blade": "*", "@trivago/prettier-plugin-sort-imports": "*", - "prettier": ">=2.2.0", + "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", - "prettier-plugin-marko": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-style-order": "*", - "prettier-plugin-svelte": "*", - "prettier-plugin-twig-melody": "*" + "prettier-plugin-svelte": "*" }, "peerDependenciesMeta": { "@ianvs/prettier-plugin-sort-imports": { diff --git a/package.json b/package.json index 06f46d83..c2c9b5a4 100644 --- a/package.json +++ b/package.json @@ -91,8 +91,8 @@ "eslint-plugin-storybook": "0.6.13", "eslint-plugin-tsdoc": "0.2.17", "jsdom": "^22.1.0", - "prettier": "^3.0.0", - "prettier-plugin-tailwindcss": "0.3.0", + "prettier": "^3.0.3", + "prettier-plugin-tailwindcss": "0.5.5", "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/src/components/dialog/dialog.stories.tsx b/src/components/dialog/dialog.stories.tsx index ff292858..5428cbde 100644 --- a/src/components/dialog/dialog.stories.tsx +++ b/src/components/dialog/dialog.stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryObj } from "@storybook/react"; import React, { useState } from "react"; -import { Dialog } from "./dialog"; import { getStoryDescription, hiddenArgControl } from "../../util/storybook-utils"; +import { Dialog } from "./dialog"; const SpanFooter = () => test footer 🍭; const footerOptions = { undefined, SpanFooter: }; @@ -39,7 +39,7 @@ const meta: Meta = { diff --git a/src/components/form-field/single-combobox/single-combobox-input.tsx b/src/components/form-field/single-combobox/single-combobox-input.tsx index 2ed89ee4..425f5d54 100644 --- a/src/components/form-field/single-combobox/single-combobox-input.tsx +++ b/src/components/form-field/single-combobox/single-combobox-input.tsx @@ -25,7 +25,7 @@ export const SingleComboboxInput = ({ placeholder={placeholder} displayValue={displayValue} onChange={onChange} - className="paragraph-100 flex h-8 w-full items-center rounded border border-neutral-400 py-2 pl-3 pr-8 focus-visible:border-primary-400 focus-visible:ring-2 focus-visible:ring-primary-200 disabled:bg-neutral-100 disabled:text-neutral-600 disabled:border-neutral-300" + className="paragraph-100 flex h-8 w-full items-center rounded border border-neutral-400 py-2 pl-3 pr-8 focus-visible:border-primary-400 focus-visible:ring-2 focus-visible:ring-primary-200 disabled:border-neutral-300 disabled:bg-neutral-100 disabled:text-neutral-600" /> {showButton ? ( diff --git a/src/components/form-field/text-input/text-input.tsx b/src/components/form-field/text-input/text-input.tsx index b5e2258f..b8a08f67 100644 --- a/src/components/form-field/text-input/text-input.tsx +++ b/src/components/form-field/text-input/text-input.tsx @@ -60,7 +60,7 @@ export const TextInput = ({
{LeftIcon ? (