chore(upstream): merge C4illin/ConvertX main (eslint v4, deps update)

Merged changes:
- chore: update eslint config (C4illin#521)
- PDF to DOCX using LibreOffice, fixes C4illin#425 (C4illin#510)
- chore: update deps (C4illin#522)
- chore(deps): eslint-plugin-better-tailwindcss to v4 (C4illin#506)

Conflict resolution:
- package.json: keep our @sinclair/typebox, upgrade eslint-plugin to v4
- eslint.config.ts: keep our extended ignores
- libreoffice.ts: keep our PDF import pipeline (more complete)
- root.tsx, history.tsx: keep our Chinese localized version

Author: Your Name

bun.lock

@@ -1,15 +1,10 @@
 import js from "@eslint/js";
-import eslintParserTypeScript from "@typescript-eslint/parser";
 import eslintPluginBetterTailwindcss from "eslint-plugin-better-tailwindcss";
+import { defineConfig } from "eslint/config";
 import globals from "globals";
-import tseslint from "typescript-eslint";
-import path from "path";
-import { fileURLToPath } from "url";
+import tseslint, { parser as eslintParserTypeScript } from "typescript-eslint";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export default tseslint.config(
+export default defineConfig(
   {
     ignores: [
       "**/node_modules/**",
@@ -22,18 +17,15 @@ export default tseslint.config(
   js.configs.recommended,
   tseslint.configs.recommended,
   {
-    files: ["**/*.{tsx,ts}"],
-    plugins: {
-      "better-tailwindcss": eslintPluginBetterTailwindcss,
-    },
+    files: ["**/*.{ts,tsx,cts,mts}"],
+    extends: [
+      eslintPluginBetterTailwindcss.configs.recommended,
+      eslintPluginBetterTailwindcss.configs.stylistic,
+    ],
     languageOptions: {
       parser: eslintParserTypeScript,
       parserOptions: {
         project: "./tsconfig.eslint.json",
-        tsconfigRootDir: __dirname,
-        ecmaFeatures: {
-          jsx: true,
-        },
       },
       globals: {
         ...globals.node,
@@ -45,17 +37,14 @@ export default tseslint.config(
       },
     },
     rules: {
-      ...(eslintPluginBetterTailwindcss.configs["recommended-warn"] ?? {}).rules,
-      ...(eslintPluginBetterTailwindcss.configs["stylistic-warn"] ?? {}).rules,
-      // "tailwindcss/classnames-order": "off",
       "better-tailwindcss/enforce-consistent-line-wrapping": [
         "warn",
         {
           group: "newLine",
           printWidth: 100,
         },
       ],
-      "better-tailwindcss/no-unregistered-classes": [
+      "better-tailwindcss/no-unknown-classes": [
         "warn",
         {
           ignore: [
@@ -74,6 +63,16 @@ export default tseslint.config(
       ],
     },
   },
+  {
+    files: ["**/*.{jsx,tsx}"],
+    languageOptions: {
+      parserOptions: {
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+    },
+  },
   {
     files: ["**/*.{js,cjs,mjs,jsx}"],
     extends: [tseslint.configs.disableTypeChecked],

eslint.config.ts

@@ -45,7 +45,7 @@
     "@types/node": "^24.10.9",
     "@typescript-eslint/parser": "^8.54.0",
     "eslint": "^9.39.2",
-    "eslint-plugin-better-tailwindcss": "^3.8.0",
+    "eslint-plugin-better-tailwindcss": "^4.0.2",
     "globals": "^17.1.0",
     "knip": "^5.82.1",
     "npm-run-all2": "^8.0.4",

package.json

@@ -10,7 +10,7 @@ export const chooseConverter = new Elysia().use(userService).post(
         <article
           class={`
             convert_to_popup absolute z-2 m-0 hidden h-[50vh] max-h-[50vh] w-full flex-col
-            overflow-x-hidden overflow-y-auto rounded bg-neutral-800
+            overflow-x-hidden overflow-y-auto rounded-sm bg-neutral-800
             sm:h-[30vh]
           `}
         >
@@ -28,7 +28,7 @@ export const chooseConverter = new Elysia().use(userService).post(
                     // https://stackoverflow.com/questions/121499/when-a-blur-event-occurs-how-can-i-find-out-which-element-focus-went-to#comment82388679_33325953
                     tabindex={0}
                     class={`
-                      target rounded bg-neutral-700 p-1 text-base
+                      target rounded-sm bg-neutral-700 p-1 text-base
                       hover:bg-neutral-600
                     `}
                     data-value={`${target},${converter}`}

src/pages/chooseConverter.tsx

@@ -38,7 +38,7 @@ export const listConverters = new Elysia().use(userService).get(
 
               <table
                 class={`
-                  w-full table-auto rounded bg-neutral-900 text-left
+                  w-full table-auto rounded-sm bg-neutral-900 text-left
                   [&_td]:p-4
                   [&_tr]:rounded-sm [&_tr]:border-b [&_tr]:border-neutral-800
                   [&_ul]:list-inside [&_ul]:list-disc

src/pages/listConverters.tsx

@@ -55,15 +55,15 @@ function ResultsArticle({
         class={`
           mb-4 inline-block h-2 w-full appearance-none overflow-hidden rounded-full border-0
           bg-neutral-700 bg-none text-accent-500 accent-accent-500
-          [&::-moz-progress-bar]:bg-accent-500 [&::-webkit-progress-value]:rounded-full
-          [&::-webkit-progress-value]:[background:none]
+          [&::-moz-progress-bar]:bg-accent-500
+          [&::-webkit-progress-value]:rounded-full [&::-webkit-progress-value]:[background:none]
           [&[value]::-webkit-progress-value]:bg-accent-500
           [&[value]::-webkit-progress-value]:transition-[inline-size]
         `}
       />
       <table
         class={`
-          w-full table-auto rounded bg-neutral-900 text-left
+          w-full table-auto rounded-sm bg-neutral-900 text-left
           [&_td]:p-4
           [&_tr]:rounded-sm [&_tr]:border-b [&_tr]:border-neutral-800
         `}
@@ -72,23 +72,23 @@ function ResultsArticle({
           <tr>
             <th
               class={`
-                px-2 py-2
+                p-2
                 sm:px-4
               `}
             >
               {t("results", "convertedFileName")}
             </th>
             <th
               class={`
-                px-2 py-2
+                p-2
                 sm:px-4
               `}
             >
               {t("results", "status")}
             </th>
             <th
               class={`
-                px-2 py-2
+                p-2
                 sm:px-4
               `}
             >