Cleanup

tooling/prettier/index.mjs

@@ -4,25 +4,32 @@
 
 /** @type { PrettierConfig | SortImportsConfig | TailwindConfig } */
 const config = {
-  plugins: [
-    "@ianvs/prettier-plugin-sort-imports",
-    "prettier-plugin-tailwindcss",
-  ],
-  tailwindConfig: "../../tooling/tailwind",
+  tabWidth: 2,
+  useTabs: false,
+  semi: true,
+  printWidth: 80,
+  singleQuote: true,
+  arrowParens: 'always',
   importOrder: [
-    "^(react/(.*)$)|^(react$)|^(react-native(.*)$)",
-    "^(next/(.*)$)|^(next$)",
-    "^(expo(.*)$)|^(expo$)",
-    "<THIRD_PARTY_MODULES>",
-    "",
-    "^@acme/(.*)$",
-    "",
-    "^~/",
-    "^[../]",
-    "^[./]",
+    '/^(?!.*\\.css).*/',
+    '^react$',
+    '^react-dom$',
+    '^next$',
+    '^next/(.*)$',
+    '^@supabase/supabase-js$',
+    '^@supabase/gotrue-js$',
+    '<THIRD_PARTY_MODULES>',
+    '^@packages/(.*)$',
+    '^@kit/(.*)$',
+    '^~/(.*)$', // app-specific imports
+    '^[./]', // relative imports
+  ],
+  importOrderSeparation: true,
+  importOrderSortSpecifiers: true,
+  plugins: [
+    '@trivago/prettier-plugin-sort-imports',
+    'prettier-plugin-tailwindcss',
   ],
-  importOrderParserPlugins: ["typescript", "jsx", "decorators-legacy"],
-  importOrderTypeScriptVersion: "4.4.0",
 };
 
 export default config;

tooling/prettier/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@acme/prettier-config",
+  "name": "@kit/prettier-config",
   "private": true,
   "version": "0.1.0",
   "main": "index.mjs",
@@ -14,8 +14,8 @@
     "prettier-plugin-tailwindcss": "^0.5.11"
   },
   "devDependencies": {
-    "@acme/tsconfig": "^0.1.0",
+    "@kit/tsconfig": "^0.1.0",
     "typescript": "^5.3.3"
   },
-  "prettier": "@acme/prettier-config"
+  "prettier": "./index.mjs"
 }

tooling/prettier/tsconfig.json

@@ -1,8 +1,8 @@
 {
-  "extends": "@acme/tsconfig/base.json",
+  "extends": "@kit/tsconfig/base.json",
   "compilerOptions": {
-    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",
+    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
   },
   "include": ["."],
-  "exclude": ["node_modules"],
+  "exclude": ["node_modules"]
 }