diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..ca83014 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,16 @@ +{ + "printWidth": 120, + "trailingComma": "all", + "tabWidth": 2, + "semi": true, + "singleQuote": true, + "bracketSpacing": true, + "arrowParens": "always", + "useTabs": false, + "plugins": ["@trivago/prettier-plugin-sort-imports", "prettier-plugin-tailwindcss"], + "importOrder": ["^react(.*)$", "^@components(.*)$", "", "^[./]"], + "importOrderSeparation": false, + "importOrderSortSpecifiers": true, + "importOrderCaseInsensitive": true, + "importOrderParserPlugins": ["typescript", "jsx"] +} diff --git a/apps/admin/package.json b/apps/admin/package.json index f5a733b..04aa2da 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -19,7 +19,6 @@ "devDependencies": { "@eslint/eslintrc": "^3", "@repo/eslint-config": "*", - "@repo/prettier-config": "*", "@repo/tailwind-config": "*", "@repo/ui": "*", "@types/node": "^20", @@ -31,6 +30,5 @@ "postcss": "^8.4.49", "tailwindcss": "^3.4.17", "typescript": "^5" - }, - "prettier": "@repo/prettier-config" + } } diff --git a/apps/client/package.json b/apps/client/package.json index 1a6fed2..74e99d7 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -20,7 +20,6 @@ "devDependencies": { "@eslint/js": "^9.17.0", "@repo/eslint-config": "*", - "@repo/prettier-config": "*", "@repo/tailwind-config": "*", "@repo/ui": "*", "@types/react": "^18.3.18", @@ -36,6 +35,5 @@ "typescript": "~5.6.2", "typescript-eslint": "^8.18.2", "vite": "^6.0.5" - }, - "prettier": "@repo/prettier-config" + } } diff --git a/configs/prettier-config/index.js b/configs/prettier-config/index.js deleted file mode 100644 index e6c4d88..0000000 --- a/configs/prettier-config/index.js +++ /dev/null @@ -1,24 +0,0 @@ -module.exports = { - printWidth: 100, - trailingComma: "all", - tabWidth: 2, - semi: true, - singleQuote: true, - bracketSpacing: true, - arrowParens: "always", - useTabs: false, - plugins: [ - "@trivago/prettier-plugin-sort-imports", - "prettier-plugin-tailwindcss", - ], - importOrder: [ - "^react(.*)$", - "^@components(.*)$", - "", - "^[./]", - ], - importOrderSeparation: false, - importOrderSortSpecifiers: true, - importOrderCaseInsensitive: true, - importOrderParserPlugins: ["typescript", "jsx"], -}; diff --git a/configs/prettier-config/package.json b/configs/prettier-config/package.json deleted file mode 100644 index bd77fdf..0000000 --- a/configs/prettier-config/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "@repo/prettier-config", - "main": "index.js", - "version": "1.0.0", - "devDependencies": { - "@trivago/prettier-plugin-sort-imports": "^5.2.1", - "prettier": "3.4.2", - "prettier-plugin-tailwindcss": "^0.6.9" - } -} diff --git a/package-lock.json b/package-lock.json index f90903f..001ff81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,9 +10,11 @@ "configs/*" ], "devDependencies": { + "@trivago/prettier-plugin-sort-imports": "^5.2.1", "commitizen": "^4.3.1", "cz-customizable": "^7.4.0", "prettier": "^3.2.5", + "prettier-plugin-tailwindcss": "^0.6.9", "turbo": "^2.3.3", "typescript": "5.5.4" }, @@ -33,7 +35,6 @@ "devDependencies": { "@eslint/eslintrc": "^3", "@repo/eslint-config": "*", - "@repo/prettier-config": "*", "@repo/tailwind-config": "*", "@repo/ui": "*", "@types/node": "^20", @@ -89,7 +90,6 @@ "devDependencies": { "@eslint/js": "^9.17.0", "@repo/eslint-config": "*", - "@repo/prettier-config": "*", "@repo/tailwind-config": "*", "@repo/ui": "*", "@types/react": "^18.3.18", @@ -986,6 +986,7 @@ "configs/prettier-config": { "name": "@repo/prettier-config", "version": "1.0.0", + "extraneous": true, "devDependencies": { "@trivago/prettier-plugin-sort-imports": "^5.2.1", "prettier": "3.4.2", @@ -1015,7 +1016,6 @@ "devDependencies": { "@repo/eslint-config": "*", "@repo/typescript-config": "*", - "@storybook/react": "^8.4.7", "@turbo/gen": "^1.12.4", "@types/node": "^20.11.24", "@types/react": "18.3.0", @@ -1023,115 +1023,6 @@ "typescript": "5.5.4" } }, - "configs/ui/node_modules/@storybook/components": { - "version": "8.4.7", - "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.4.7.tgz", - "integrity": "sha512-uyJIcoyeMWKAvjrG9tJBUCKxr2WZk+PomgrgrUwejkIfXMO76i6jw9BwLa0NZjYdlthDv30r9FfbYZyeNPmF0g==", - "dev": true, - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "peerDependencies": { - "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0" - } - }, - "configs/ui/node_modules/@storybook/manager-api": { - "version": "8.4.7", - "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.4.7.tgz", - "integrity": "sha512-ELqemTviCxAsZ5tqUz39sDmQkvhVAvAgiplYy9Uf15kO0SP2+HKsCMzlrm2ue2FfkUNyqbDayCPPCB0Cdn/mpQ==", - "dev": true, - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "peerDependencies": { - "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0" - } - }, - "configs/ui/node_modules/@storybook/preview-api": { - "version": "8.4.7", - "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.4.7.tgz", - "integrity": "sha512-0QVQwHw+OyZGHAJEXo6Knx+6/4er7n2rTDE5RYJ9F2E2Lg42E19pfdLlq2Jhoods2Xrclo3wj6GWR//Ahi39Eg==", - "dev": true, - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "peerDependencies": { - "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0" - } - }, - "configs/ui/node_modules/@storybook/react": { - "version": "8.4.7", - "resolved": "https://registry.npmjs.org/@storybook/react/-/react-8.4.7.tgz", - "integrity": "sha512-nQ0/7i2DkaCb7dy0NaT95llRVNYWQiPIVuhNfjr1mVhEP7XD090p0g7eqUmsx8vfdHh2BzWEo6CoBFRd3+EXxw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@storybook/components": "8.4.7", - "@storybook/global": "^5.0.0", - "@storybook/manager-api": "8.4.7", - "@storybook/preview-api": "8.4.7", - "@storybook/react-dom-shim": "8.4.7", - "@storybook/theming": "8.4.7" - }, - "engines": { - "node": ">=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "peerDependencies": { - "@storybook/test": "8.4.7", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "storybook": "^8.4.7", - "typescript": ">= 4.2.x" - }, - "peerDependenciesMeta": { - "@storybook/test": { - "optional": true - }, - "typescript": { - "optional": true - } - } - }, - "configs/ui/node_modules/@storybook/react-dom-shim": { - "version": "8.4.7", - "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.4.7.tgz", - "integrity": "sha512-6bkG2jvKTmWrmVzCgwpTxwIugd7Lu+2btsLAqhQSzDyIj2/uhMNp8xIMr/NBDtLgq3nomt9gefNa9xxLwk/OMg==", - "dev": true, - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta", - "storybook": "^8.4.7" - } - }, - "configs/ui/node_modules/@storybook/theming": { - "version": "8.4.7", - "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.4.7.tgz", - "integrity": "sha512-99rgLEjf7iwfSEmdqlHkSG3AyLcK0sfExcr0jnc6rLiAkBhzuIsvcHjjUwkR210SOCgXqBPW0ZA6uhnuyppHLw==", - "dev": true, - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "peerDependencies": { - "storybook": "^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0" - } - }, "configs/ui/node_modules/@types/react": { "version": "18.3.0", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.0.tgz", @@ -1153,34 +1044,6 @@ "@types/react": "*" } }, - "configs/ui/node_modules/storybook": { - "version": "8.4.7", - "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.4.7.tgz", - "integrity": "sha512-RP/nMJxiWyFc8EVMH5gp20ID032Wvk+Yr3lmKidoegto5Iy+2dVQnUoElZb2zpbVXNHWakGuAkfI0dY1Hfp/vw==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@storybook/core": "8.4.7" - }, - "bin": { - "getstorybook": "bin/index.cjs", - "sb": "bin/index.cjs", - "storybook": "bin/index.cjs" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/storybook" - }, - "peerDependencies": { - "prettier": "^2 || ^3" - }, - "peerDependenciesMeta": { - "prettier": { - "optional": true - } - } - }, "node_modules/@adobe/css-tools": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.1.tgz", @@ -1760,7 +1623,6 @@ "os": [ "aix" ], - "peer": true, "engines": { "node": ">=18" } @@ -1778,7 +1640,6 @@ "os": [ "android" ], - "peer": true, "engines": { "node": ">=18" } @@ -1796,7 +1657,6 @@ "os": [ "android" ], - "peer": true, "engines": { "node": ">=18" } @@ -1814,7 +1674,6 @@ "os": [ "android" ], - "peer": true, "engines": { "node": ">=18" } @@ -1832,7 +1691,6 @@ "os": [ "darwin" ], - "peer": true, "engines": { "node": ">=18" } @@ -1850,7 +1708,6 @@ "os": [ "darwin" ], - "peer": true, "engines": { "node": ">=18" } @@ -1868,7 +1725,6 @@ "os": [ "freebsd" ], - "peer": true, "engines": { "node": ">=18" } @@ -1886,7 +1742,6 @@ "os": [ "freebsd" ], - "peer": true, "engines": { "node": ">=18" } @@ -1904,7 +1759,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -1922,7 +1776,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -1940,7 +1793,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -1958,7 +1810,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -1976,7 +1827,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -1994,7 +1844,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -2012,7 +1861,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -2030,7 +1878,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -2048,7 +1895,6 @@ "os": [ "linux" ], - "peer": true, "engines": { "node": ">=18" } @@ -2066,7 +1912,6 @@ "os": [ "netbsd" ], - "peer": true, "engines": { "node": ">=18" } @@ -2084,7 +1929,6 @@ "os": [ "netbsd" ], - "peer": true, "engines": { "node": ">=18" } @@ -2102,7 +1946,6 @@ "os": [ "openbsd" ], - "peer": true, "engines": { "node": ">=18" } @@ -2120,7 +1963,6 @@ "os": [ "openbsd" ], - "peer": true, "engines": { "node": ">=18" } @@ -2138,7 +1980,6 @@ "os": [ "sunos" ], - "peer": true, "engines": { "node": ">=18" } @@ -2156,7 +1997,6 @@ "os": [ "win32" ], - "peer": true, "engines": { "node": ">=18" } @@ -2174,7 +2014,6 @@ "os": [ "win32" ], - "peer": true, "engines": { "node": ">=18" } @@ -2192,7 +2031,6 @@ "os": [ "win32" ], - "peer": true, "engines": { "node": ">=18" } @@ -3261,10 +3099,6 @@ "resolved": "configs/eslint-config", "link": true }, - "node_modules/@repo/prettier-config": { - "resolved": "configs/prettier-config", - "link": true - }, "node_modules/@repo/tailwind-config": { "resolved": "configs/tailwind-config", "link": true diff --git a/package.json b/package.json index 0814409..e4b31e2 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "commitizen": "^4.3.1", "cz-customizable": "^7.4.0", "prettier": "^3.2.5", + "@trivago/prettier-plugin-sort-imports": "^5.2.1", + "prettier-plugin-tailwindcss": "^0.6.9", "turbo": "^2.3.3", "typescript": "5.5.4" },