fix: eslint/prettier finally works correctly

.changeset/large-buckets-cheer.md

@@ -0,0 +1,6 @@
+---
+"solidui-cli": minor
+"docs": minor
+---
+
+all eslint/prettier problems are finally fixed & update to tailwind 3.4 (for size-x)

.eslintrc.json

@@ -1,45 +1,14 @@
 {
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "./tsconfig.json"
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:tailwindcss/recommended"
-  ],
-  "plugins": ["@typescript-eslint", "import", "tailwindcss"],
+  "root": true,
+  "extends": ["eslint:recommended", "plugin:solid/recommended", "plugin:tailwindcss/recommended"],
+  "plugins": ["solid", "tailwindcss"],
   "rules": {
-    "@typescript-eslint/consistent-type-imports": "warn",
-    "@typescript-eslint/no-empty-interface": "warn",
-    "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/no-unused-vars": [
-      "warn",
-      { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }
-    ],
-    "import/order": [
-      "error",
-      {
-        "groups": ["builtin", "external", "internal"],
-        "pathGroups": [
-          { "pattern": "solid-js", "group": "builtin" },
-          { "pattern": "solid-start", "group": "builtin" },
-          { "pattern": "solid-js/*", "group": "builtin" }
-        ],
-        "pathGroupsExcludedImportTypes": ["solid-js", "solid-start", "solid-js/*"],
-        "newlines-between": "always",
-        "alphabetize": {
-          "order": "asc",
-          "caseInsensitive": true
-        }
-      }
-    ],
     "tailwindcss/no-custom-classname": "off",
     "tailwindcss/classnames-order": "error"
   },
   "settings": {
     "tailwindcss": {
-      "callees": ["cn"],
+      "callees": ["cn", "cva"],
       "config": "tailwind.config.cjs"
     }
   },

.prettierignore

@@ -0,0 +1,3 @@
+node_modules
+build
+dist

.prettierrc.json

@@ -1,8 +1,30 @@
 {
   "endOfLine": "lf",
+  "semi": false,
   "singleQuote": false,
   "tabWidth": 2,
-  "trailingComma": "none",
   "printWidth": 100,
-  "semi": false
+  "trailingComma": "none",
+  "importOrder": [
+    "^(solid-js/(.*)$)|^(solid-js$)",
+    "",
+    "<THIRD_PARTY_MODULES>",
+    "",
+    "^types$",
+    "^~/config/(.*)$",
+    "^~/lib/(.*)$",
+    "^~/hooks/(.*)$",
+    "^~/components/ui/(.*)$",
+    "^~/components/(.*)$",
+    "^~/registry/(.*)$",
+    "",
+    "^[./]"
+  ],
+  "importOrderSeparation": false,
+  "importOrderSortSpecifiers": true,
+  "importOrderBuiltinModulesToTop": true,
+  "importOrderParserPlugins": ["typescript", "jsx", "decorators-legacy"],
+  "importOrderMergeDuplicateImports": true,
+  "importOrderCombineTypeAndValueImports": true,
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"]
 }

apps/docs/package.json

@@ -37,15 +37,10 @@
     "@mdx-js/rollup": "^2.3.0",
     "@types/node": "^18.17.3",
     "@types/unist": "^3.0.1",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
     "autoprefixer": "^10.4.15",
-    "eslint": "^8.49.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-tailwindcss": "^3.13.0",
+    "eslint": "^8.56.0",
     "estree-util-value-to-estree": "^3.0.1",
     "postcss": "^8.4.30",
-    "prettier": "^3.0.3",
     "rehype-pretty-code": "^0.10.1",
     "rehype-slug": "^6.0.0",
     "remark-frontmatter": "^5.0.0",

apps/docs/public/registry/ui/accordion.json

@@ -7,7 +7,7 @@
   "files": [
     {
       "name": "accordion.tsx",
-      "content": "import type { Component } from \"solid-js\"\nimport { splitProps } from \"solid-js\"\n\nimport { Accordion as AccordionPrimitive } from \"@kobalte/core\"\nimport { TbChevronDown } from \"solid-icons/tb\"\n\nimport { cn } from \"~/lib/utils\"\n\nconst Accordion = AccordionPrimitive.Root\n\nconst AccordionItem: Component<AccordionPrimitive.AccordionItemProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return <AccordionPrimitive.Item class={cn(\"border-b\", props.class)} {...rest} />\n}\n\nconst AccordionTrigger: Component<AccordionPrimitive.AccordionTriggerProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\", \"children\"])\n  return (\n    <AccordionPrimitive.Header class=\"flex\">\n      <AccordionPrimitive.Trigger\n        class={cn(\n          \"flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-expanded]>svg]:rotate-180\",\n          props.class\n        )}\n        {...rest}\n      >\n        {props.children}\n        <TbChevronDown class=\"h-4 w-4 shrink-0 transition-transform duration-200\" />\n      </AccordionPrimitive.Trigger>\n    </AccordionPrimitive.Header>\n  )\n}\n\nconst AccordionContent: Component<AccordionPrimitive.AccordionContentProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\", \"children\"])\n  return (\n    <AccordionPrimitive.Content\n      class={cn(\n        \"animate-accordion-up data-[expanded]:animate-accordion-down overflow-hidden text-sm transition-all\",\n        props.class\n      )}\n      {...rest}\n    >\n      <div class=\"pb-4 pt-0\">{props.children}</div>\n    </AccordionPrimitive.Content>\n  )\n}\n\nexport { Accordion, AccordionItem, AccordionTrigger, AccordionContent }\n"
+      "content": "import type { Component } from \"solid-js\"\nimport { splitProps } from \"solid-js\"\n\nimport { Accordion as AccordionPrimitive } from \"@kobalte/core\"\nimport { TbChevronDown } from \"solid-icons/tb\"\n\nimport { cn } from \"~/lib/utils\"\n\nconst Accordion = AccordionPrimitive.Root\n\nconst AccordionItem: Component<AccordionPrimitive.AccordionItemProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return <AccordionPrimitive.Item class={cn(\"border-b\", props.class)} {...rest} />\n}\n\nconst AccordionTrigger: Component<AccordionPrimitive.AccordionTriggerProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\", \"children\"])\n  return (\n    <AccordionPrimitive.Header class=\"flex\">\n      <AccordionPrimitive.Trigger\n        class={cn(\n          \"flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-expanded]>svg]:rotate-180\",\n          props.class\n        )}\n        {...rest}\n      >\n        {props.children}\n        <TbChevronDown class=\"size-4 shrink-0 transition-transform duration-200\" />\n      </AccordionPrimitive.Trigger>\n    </AccordionPrimitive.Header>\n  )\n}\n\nconst AccordionContent: Component<AccordionPrimitive.AccordionContentProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\", \"children\"])\n  return (\n    <AccordionPrimitive.Content\n      class={cn(\n        \"animate-accordion-up overflow-hidden text-sm transition-all data-[expanded]:animate-accordion-down\",\n        props.class\n      )}\n      {...rest}\n    >\n      <div class=\"pb-4 pt-0\">{props.children}</div>\n    </AccordionPrimitive.Content>\n  )\n}\n\nexport { Accordion, AccordionItem, AccordionTrigger, AccordionContent }\n"
     }
   ],
   "type": "ui"

apps/docs/public/registry/ui/alert-dialog.json

@@ -6,7 +6,7 @@
   "files": [
     {
       "name": "alert-dialog.tsx",
-      "content": "import type { Component } from \"solid-js\"\nimport { splitProps } from \"solid-js\"\n\nimport { AlertDialog as AlertDialogPrimitive } from \"@kobalte/core\"\nimport { TbX } from \"solid-icons/tb\"\n\nimport { cn } from \"~/lib/utils\"\n\nconst AlertDialog = AlertDialogPrimitive.Root\nconst AlertDialogTrigger = AlertDialogPrimitive.Trigger\nconst AlertDialogPortal = AlertDialogPrimitive.Portal\n\nconst AlertDialogOverlay: Component<AlertDialogPrimitive.AlertDialogOverlayProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return (\n    <AlertDialogPrimitive.Overlay\n      class={cn(\n        \"bg-background/80 data-[expanded]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0 fixed inset-0 z-50 backdrop-blur-sm\",\n        props.class\n      )}\n      {...rest}\n    />\n  )\n}\n\nconst AlertDialogContent: Component<AlertDialogPrimitive.AlertDialogContentProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\", \"children\"])\n  return (\n    <AlertDialogPortal>\n      <AlertDialogOverlay />\n      <AlertDialogPrimitive.Content\n        class={cn(\n          \"bg-background data-[expanded]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0 data-[closed]:zoom-out-95 data-[expanded]:zoom-in-95 data-[closed]:slide-out-to-left-1/2 data-[closed]:slide-out-to-top-[48%] data-[expanded]:slide-in-from-left-1/2 data-[expanded]:slide-in-from-top-[48%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg md:w-full\",\n          props.class\n        )}\n        {...rest}\n      >\n        {props.children}\n        <AlertDialogPrimitive.CloseButton class=\"ring-offset-background focus:ring-ring data-[expanded]:bg-accent data-[expanded]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none\">\n          <TbX class=\"h-4 w-4\" />\n          <span class=\"sr-only\">Close</span>\n        </AlertDialogPrimitive.CloseButton>\n      </AlertDialogPrimitive.Content>\n    </AlertDialogPortal>\n  )\n}\n\nconst AlertDialogTitle: Component<AlertDialogPrimitive.AlertDialogTitleProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return <AlertDialogPrimitive.Title class={cn(\"text-lg font-semibold\", props.class)} {...rest} />\n}\n\nconst AlertDialogDescription: Component<AlertDialogPrimitive.AlertDialogDescriptionProps> = (\n  props\n) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return (\n    <AlertDialogPrimitive.Description\n      class={cn(\"text-muted-foreground text-sm\", props.class)}\n      {...rest}\n    />\n  )\n}\n\nexport {\n  AlertDialog,\n  AlertDialogPortal,\n  AlertDialogOverlay,\n  AlertDialogTrigger,\n  AlertDialogContent,\n  AlertDialogTitle,\n  AlertDialogDescription\n}\n"
+      "content": "import type { Component } from \"solid-js\"\nimport { splitProps } from \"solid-js\"\n\nimport { AlertDialog as AlertDialogPrimitive } from \"@kobalte/core\"\nimport { TbX } from \"solid-icons/tb\"\n\nimport { cn } from \"~/lib/utils\"\n\nconst AlertDialog = AlertDialogPrimitive.Root\nconst AlertDialogTrigger = AlertDialogPrimitive.Trigger\nconst AlertDialogPortal = AlertDialogPrimitive.Portal\n\nconst AlertDialogOverlay: Component<AlertDialogPrimitive.AlertDialogOverlayProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return (\n    <AlertDialogPrimitive.Overlay\n      class={cn(\n        \"fixed inset-0 z-50 bg-background/80 backdrop-blur-sm data-[expanded]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0\",\n        props.class\n      )}\n      {...rest}\n    />\n  )\n}\n\nconst AlertDialogContent: Component<AlertDialogPrimitive.AlertDialogContentProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\", \"children\"])\n  return (\n    <AlertDialogPortal>\n      <AlertDialogOverlay />\n      <AlertDialogPrimitive.Content\n        class={cn(\n          \"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[expanded]:animate-in data-[closed]:animate-out data-[closed]:fade-out-0 data-[expanded]:fade-in-0 data-[closed]:zoom-out-95 data-[expanded]:zoom-in-95 data-[closed]:slide-out-to-left-1/2 data-[closed]:slide-out-to-top-[48%] data-[expanded]:slide-in-from-left-1/2 data-[expanded]:slide-in-from-top-[48%] sm:rounded-lg md:w-full\",\n          props.class\n        )}\n        {...rest}\n      >\n        {props.children}\n        <AlertDialogPrimitive.CloseButton class=\"absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[expanded]:bg-accent data-[expanded]:text-muted-foreground\">\n          <TbX class=\"size-4\" />\n          <span class=\"sr-only\">Close</span>\n        </AlertDialogPrimitive.CloseButton>\n      </AlertDialogPrimitive.Content>\n    </AlertDialogPortal>\n  )\n}\n\nconst AlertDialogTitle: Component<AlertDialogPrimitive.AlertDialogTitleProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return <AlertDialogPrimitive.Title class={cn(\"text-lg font-semibold\", props.class)} {...rest} />\n}\n\nconst AlertDialogDescription: Component<AlertDialogPrimitive.AlertDialogDescriptionProps> = (\n  props\n) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return (\n    <AlertDialogPrimitive.Description\n      class={cn(\"text-sm text-muted-foreground\", props.class)}\n      {...rest}\n    />\n  )\n}\n\nexport {\n  AlertDialog,\n  AlertDialogPortal,\n  AlertDialogOverlay,\n  AlertDialogTrigger,\n  AlertDialogContent,\n  AlertDialogTitle,\n  AlertDialogDescription\n}\n"
     }
   ],
   "type": "ui"

apps/docs/public/registry/ui/alert.json

@@ -6,7 +6,7 @@
   "files": [
     {
       "name": "alert.tsx",
-      "content": "import type { Component, ComponentProps } from \"solid-js\"\nimport { splitProps } from \"solid-js\"\n\nimport { Alert as AlertPrimitive } from \"@kobalte/core\"\nimport type { VariantProps } from \"class-variance-authority\"\nimport { cva } from \"class-variance-authority\"\n\nimport { cn } from \"~/lib/utils\"\n\nconst alertVariants = cva(\n  \"[&>svg]:text-foreground relative w-full rounded-lg border p-4 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg~*]:pl-7\",\n  {\n    variants: {\n      variant: {\n        default: \"bg-background text-foreground\",\n        destructive:\n          \"border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive\"\n      }\n    },\n    defaultVariants: {\n      variant: \"default\"\n    }\n  }\n)\n\ninterface AlertProps extends AlertPrimitive.AlertRootProps, VariantProps<typeof alertVariants> {}\n\nconst Alert: Component<AlertProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\", \"variant\"])\n  return (\n    <AlertPrimitive.Root\n      class={cn(alertVariants({ variant: props.variant }), props.class)}\n      {...rest}\n    />\n  )\n}\n\nconst AlertTitle: Component<ComponentProps<\"h5\">> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return <h5 class={cn(\"mb-1 font-medium leading-none tracking-tight\", props.class)} {...rest} />\n}\n\nconst AlertDescription: Component<ComponentProps<\"div\">> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return <div class={cn(\"text-sm [&_p]:leading-relaxed\", props.class)} {...rest} />\n}\n\nexport { Alert, AlertTitle, AlertDescription }\n"
+      "content": "import type { Component, ComponentProps } from \"solid-js\"\nimport { splitProps } from \"solid-js\"\n\nimport { Alert as AlertPrimitive } from \"@kobalte/core\"\nimport type { VariantProps } from \"class-variance-authority\"\nimport { cva } from \"class-variance-authority\"\n\nimport { cn } from \"~/lib/utils\"\n\nconst alertVariants = cva(\n  \"relative w-full rounded-lg border p-4 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground [&>svg~*]:pl-7\",\n  {\n    variants: {\n      variant: {\n        default: \"bg-background text-foreground\",\n        destructive:\n          \"border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive\"\n      }\n    },\n    defaultVariants: {\n      variant: \"default\"\n    }\n  }\n)\n\ninterface AlertProps extends AlertPrimitive.AlertRootProps, VariantProps<typeof alertVariants> {}\n\nconst Alert: Component<AlertProps> = (props) => {\n  const [, rest] = splitProps(props, [\"class\", \"variant\"])\n  return (\n    <AlertPrimitive.Root\n      class={cn(alertVariants({ variant: props.variant }), props.class)}\n      {...rest}\n    />\n  )\n}\n\nconst AlertTitle: Component<ComponentProps<\"h5\">> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return <h5 class={cn(\"mb-1 font-medium leading-none tracking-tight\", props.class)} {...rest} />\n}\n\nconst AlertDescription: Component<ComponentProps<\"div\">> = (props) => {\n  const [, rest] = splitProps(props, [\"class\"])\n  return <div class={cn(\"text-sm [&_p]:leading-relaxed\", props.class)} {...rest} />\n}\n\nexport { Alert, AlertTitle, AlertDescription }\n"
     }
   ],
   "type": "ui"