diff --git a/.eslintrc b/.eslintrc index 33c234e..21bb2ee 100644 --- a/.eslintrc +++ b/.eslintrc @@ -10,6 +10,7 @@ "plugin:react/recommended", "plugin:react/jsx-runtime", "plugin:react-hooks/recommended", + "plugin:tailwindcss/recommended", "prettier" ], diff --git a/.prettierrc b/.prettierrc index d976a56..806e3c5 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,6 +3,5 @@ "singleQuote": true, "trailingComma": "none", "printWidth": 120, - "plugins": ["prettier-plugin-tailwindcss"], "tailwindFunction": ["clsx"] } diff --git a/package.json b/package.json index acfabbc..95752a1 100644 --- a/package.json +++ b/package.json @@ -63,12 +63,12 @@ "eslint-plugin-promise": "^6.1.1", "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-tailwindcss": "^3.13.0", "husky": "^8.0.3", "lint-staged": "^13.2.3", "npm-run-all": "^4.1.5", "postcss": "^8.4.25", "prettier": "^3.0.0", - "prettier-plugin-tailwindcss": "^0.4.0", "react": "^18.2.0", "react-dom": "^18.2.0", "rimraf": "^5.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f629992..6de0736 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,6 +145,9 @@ devDependencies: eslint-plugin-react-hooks: specifier: ^4.6.0 version: 4.6.0(eslint@8.44.0) + eslint-plugin-tailwindcss: + specifier: ^3.13.0 + version: 3.13.0(tailwindcss@3.3.2) husky: specifier: ^8.0.3 version: 8.0.3 @@ -160,9 +163,6 @@ devDependencies: prettier: specifier: ^3.0.0 version: 3.0.0 - prettier-plugin-tailwindcss: - specifier: ^0.4.0 - version: 0.4.0(prettier@3.0.0) react: specifier: ^18.2.0 version: 18.2.0 @@ -3453,6 +3453,17 @@ packages: string.prototype.matchall: 4.0.8 dev: true + /eslint-plugin-tailwindcss@3.13.0(tailwindcss@3.3.2): + resolution: {integrity: sha512-Fcep4KDRLWaK3KmkQbdyKHG0P4GdXFmXdDaweTIPcgOP60OOuWFbh1++dufRT28Q4zpKTKaHwTsXPJ4O/EjU2Q==} + engines: {node: '>=12.13.0'} + peerDependencies: + tailwindcss: ^3.3.2 + dependencies: + fast-glob: 3.3.0 + postcss: 8.4.25 + tailwindcss: 3.3.2(ts-node@10.9.1) + dev: true + /eslint-scope@5.1.1: resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} engines: {node: '>=8.0.0'} @@ -6348,61 +6359,6 @@ packages: fast-diff: 1.3.0 dev: true - /prettier-plugin-tailwindcss@0.4.0(prettier@3.0.0): - resolution: {integrity: sha512-Rna0sDPETA0KNhMHlN8wxKNgfSa8mTl2hPPAGxnbv6tUcHT6J4RQmQ8TLXyhB7Dm5Von4iHloBxTyClYM6wT0A==} - engines: {node: '>=12.17.0'} - peerDependencies: - '@ianvs/prettier-plugin-sort-imports': '*' - '@prettier/plugin-pug': '*' - '@shopify/prettier-plugin-liquid': '*' - '@shufo/prettier-plugin-blade': '*' - '@trivago/prettier-plugin-sort-imports': '*' - prettier: ^2.2 || ^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: '*' - peerDependenciesMeta: - '@ianvs/prettier-plugin-sort-imports': - optional: true - '@prettier/plugin-pug': - optional: true - '@shopify/prettier-plugin-liquid': - optional: true - '@shufo/prettier-plugin-blade': - optional: true - '@trivago/prettier-plugin-sort-imports': - optional: true - prettier-plugin-astro: - optional: true - prettier-plugin-css-order: - optional: true - prettier-plugin-import-sort: - optional: true - prettier-plugin-jsdoc: - optional: true - prettier-plugin-marko: - optional: true - prettier-plugin-organize-attributes: - optional: true - prettier-plugin-organize-imports: - optional: true - prettier-plugin-style-order: - optional: true - prettier-plugin-svelte: - optional: true - prettier-plugin-twig-melody: - optional: true - dependencies: - prettier: 3.0.0 - dev: true - /prettier@3.0.0: resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==} engines: {node: '>=14'} diff --git a/src/views/AppContainer/index.tsx b/src/views/AppContainer/index.tsx index 7fc2aea..9e29e54 100644 --- a/src/views/AppContainer/index.tsx +++ b/src/views/AppContainer/index.tsx @@ -6,7 +6,7 @@ export interface AppContainerProps { const AppContainer: FC = ({ children }) => { return ( -
+
{children}
) diff --git a/src/views/Header/index.tsx b/src/views/Header/index.tsx index 5071ecc..26eede9 100644 --- a/src/views/Header/index.tsx +++ b/src/views/Header/index.tsx @@ -7,7 +7,7 @@ const Header: FC = () => { const websiteInfo = getWebSiteInfo() return ( -
+