From 5ab91b0f939387cd1381b6f15447879581b6d6ab Mon Sep 17 00:00:00 2001
From: Xingwang Liao <kuoruan@gmail.com>
Date: Mon, 25 Dec 2023 04:33:43 +0000
Subject: [PATCH] style: update eslint config and lint files

---
 .eslintrc.cjs                                  |  5 ++++-
 package.json                                   |  5 +++--
 pnpm-lock.yaml                                 | 11 +++++++++++
 src/components/LinksPopup.vue                  |  8 ++++----
 src/components/{Popup.vue => PopupWrapper.vue} |  4 ++--
 src/components/{Toast.vue => ToastItem.vue}    |  2 +-
 src/components/TorrentDownloadItem.vue         |  2 +-
 src/components/TreeItem.vue                    |  4 ----
 src/components/{Tree.vue => TreeRoot.vue}      |  2 +-
 src/main.js                                    |  9 +++++----
 src/pages/list.js                              |  9 +++++----
 src/pages/view.js                              | 11 ++++++-----
 vite.config.js                                 |  6 +++---
 13 files changed, 46 insertions(+), 32 deletions(-)
 rename src/components/{Popup.vue => PopupWrapper.vue} (96%)
 rename src/components/{Toast.vue => ToastItem.vue} (98%)
 rename src/components/{Tree.vue => TreeRoot.vue} (96%)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 5c1dacc..c2bd5f2 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -8,10 +8,13 @@ module.exports = {
     "plugin:vue/recommended",
     "@vue/prettier",
   ],
+  plugins: ["vue", "prettier", "simple-import-sort"],
   rules: {
     "no-console": "off",
     "no-debugger": "off",
     "no-undef": "off",
+
+    "simple-import-sort/imports": "error",
+    "simple-import-sort/exports": "error",
   },
-  plugins: ["vue", "prettier"],
 };
diff --git a/package.json b/package.json
index de47f08..c526d09 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
   "scripts": {
     "serve": "vite",
     "build": "vite build",
-    "lint": "eslint --ext .js,.vue src",
-    "lint:fix": "eslint --fix --ext .js,.vue src"
+    "lint": "eslint --ext .js,.cjs,.vue .",
+    "lint:fix": "eslint --fix --ext .js,.cjs,.vue ."
   },
   "repository": {
     "type": "git",
@@ -30,6 +30,7 @@
     "chalk": "^5.3.0",
     "eslint": "^8.56.0",
     "eslint-plugin-prettier": "^5.1.2",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-vue": "^9.19.2",
     "prettier": "^3.1.1",
     "pug": "^3.0.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cf7a3fd..c8ba56f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -28,6 +28,9 @@ devDependencies:
   eslint-plugin-prettier:
     specifier: ^5.1.2
     version: 5.1.2(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@3.1.1)
+  eslint-plugin-simple-import-sort:
+    specifier: ^10.0.0
+    version: 10.0.0(eslint@8.56.0)
   eslint-plugin-vue:
     specifier: ^9.19.2
     version: 9.19.2(eslint@8.56.0)
@@ -819,6 +822,14 @@ packages:
       synckit: 0.8.6
     dev: true
 
+  /eslint-plugin-simple-import-sort@10.0.0(eslint@8.56.0):
+    resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
+    peerDependencies:
+      eslint: '>=5.0.0'
+    dependencies:
+      eslint: 8.56.0
+    dev: true
+
   /eslint-plugin-vue@9.19.2(eslint@8.56.0):
     resolution: {integrity: sha512-CPDqTOG2K4Ni2o4J5wixkLVNwgctKXFu6oBpVJlpNq7f38lh9I80pRTouZSJ2MAebPJlINU/KTFSXyQfBUlymA==}
     engines: {node: ^14.17.0 || >=16.0.0}
diff --git a/src/components/LinksPopup.vue b/src/components/LinksPopup.vue
index c76abcf..92175a7 100644
--- a/src/components/LinksPopup.vue
+++ b/src/components/LinksPopup.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  popup(
+  popup-wrapper(
     :z-index="zIndex",
     @overlay-click="$emit('close')",
     :middle="false",
@@ -27,13 +27,13 @@
 </template>
 
 <script>
-import Popup from "@/components/Popup.vue";
+import PopupWrapper from "@/components/PopupWrapper.vue";
 import { getDefaultLinebreak } from "@/utils/misc";
 
 export default {
   name: "LinksPopup",
   components: {
-    Popup,
+    PopupWrapper,
   },
   props: {
     zIndex: {
@@ -120,7 +120,7 @@ export default {
       try {
         GM_setClipboard(
           this.content,
-          "{ type: 'text', mimetype: 'text/plain'}"
+          "{ type: 'text', mimetype: 'text/plain'}",
         );
         this.$toast.display("复制成功！");
       } catch (e) {
diff --git a/src/components/Popup.vue b/src/components/PopupWrapper.vue
similarity index 96%
rename from src/components/Popup.vue
rename to src/components/PopupWrapper.vue
index 47d6d26..4e2820b 100644
--- a/src/components/Popup.vue
+++ b/src/components/PopupWrapper.vue
@@ -14,7 +14,7 @@
 
 <script>
 export default {
-  name: "Popup",
+  name: "PopupWrapper",
   props: {
     zIndex: {
       type: Number,
@@ -38,7 +38,7 @@ export default {
       const { scrollTop, scrollHeight, clientHeight } = el;
 
       const isAutoOrScroll = /(auto|scroll)/.test(
-        overflow + overflowX + overflowY
+        overflow + overflowX + overflowY,
       ); // overflow is auto or scroll
 
       const scroll =
diff --git a/src/components/Toast.vue b/src/components/ToastItem.vue
similarity index 98%
rename from src/components/Toast.vue
rename to src/components/ToastItem.vue
index 62d377c..b72f6f4 100644
--- a/src/components/Toast.vue
+++ b/src/components/ToastItem.vue
@@ -5,7 +5,7 @@
 
 <script>
 export default {
-  name: "Toast",
+  name: "ToastItem",
   data() {
     return {
       text: "",
diff --git a/src/components/TorrentDownloadItem.vue b/src/components/TorrentDownloadItem.vue
index 3f10da8..4ad34af 100644
--- a/src/components/TorrentDownloadItem.vue
+++ b/src/components/TorrentDownloadItem.vue
@@ -54,7 +54,7 @@ export default {
           if (
             responseText &&
             (matches = responseText.match(
-              /<a href="((?:https?)?\/\/dl\.dmhy\.org\/[^"]+\.torrent)">(.+)?<\/a>/
+              /<a href="((?:https?)?\/\/dl\.dmhy\.org\/[^"]+\.torrent)">(.+)?<\/a>/,
             )) &&
             matches.length >= 3
           ) {
diff --git a/src/components/TreeItem.vue b/src/components/TreeItem.vue
index 8844e98..ef65aed 100644
--- a/src/components/TreeItem.vue
+++ b/src/components/TreeItem.vue
@@ -48,10 +48,6 @@ const Documents = [
 export default {
   name: "TreeItem",
   props: {
-    key: {
-      type: Number,
-      default: -1,
-    },
     parentKey: {
       type: Number,
       default: -1,
diff --git a/src/components/Tree.vue b/src/components/TreeRoot.vue
similarity index 96%
rename from src/components/Tree.vue
rename to src/components/TreeRoot.vue
index 968a5a8..1e2b4ca 100644
--- a/src/components/Tree.vue
+++ b/src/components/TreeRoot.vue
@@ -13,7 +13,7 @@
 import TreeItem from "@/components/TreeItem.vue";
 
 export default {
-  name: "Tree",
+  name: "TreeRoot",
   components: {
     TreeItem,
   },
diff --git a/src/main.js b/src/main.js
index d6f5484..803962e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,14 +1,15 @@
 import "@/assets/css/common.styl";
 
-import Toast from "@/components/Toast.vue";
 import Vue from "vue";
-import { mountFileListElement } from "@/pages/view";
+
+import ToastItem from "@/components/ToastItem.vue";
 import { mountListElement } from "@/pages/list";
+import { mountFileListElement } from "@/pages/view";
 
 // Init toast item
-const ToastVM = Vue.extend(Toast);
+const ToastItemVM = Vue.extend(ToastItem);
 
-const toast = new ToastVM().$mount();
+const toast = new ToastItemVM().$mount();
 document.body.appendChild(toast.$el);
 
 Object.defineProperty(Vue.prototype, "$toast", { value: toast });
diff --git a/src/pages/list.js b/src/pages/list.js
index cd63a26..007780c 100644
--- a/src/pages/list.js
+++ b/src/pages/list.js
@@ -1,10 +1,11 @@
-import TorrentDownloadHeader from "@/components/TorrentDownloadHeader.vue";
-import TorrentDownloadItem from "@/components/TorrentDownloadItem.vue";
+import Vue from "vue";
+
 import CheckboxHeader from "@/components/CheckboxHeader.vue";
 import CheckboxItem from "@/components/CheckboxItem.vue";
 import LinksPopup from "@/components/LinksPopup.vue";
 import ToolBar from "@/components/ToolBar.vue";
-import Vue from "vue";
+import TorrentDownloadHeader from "@/components/TorrentDownloadHeader.vue";
+import TorrentDownloadItem from "@/components/TorrentDownloadItem.vue";
 import { magnetLinksWithOptions } from "@/utils/misc";
 
 const CheckboxHeaderVM = Vue.extend(CheckboxHeader);
@@ -121,7 +122,7 @@ export function mountListElement(el) {
 
         tableContainer.insertBefore(
           headerToolbar.$el,
-          tableContainer.firstChild
+          tableContainer.firstChild,
         );
         tableContainer.appendChild(bottomToobar.$el);
 
diff --git a/src/pages/view.js b/src/pages/view.js
index 820538d..4c30df2 100644
--- a/src/pages/view.js
+++ b/src/pages/view.js
@@ -1,9 +1,10 @@
-import XBytes from "xbytes";
-import Tree from "@/components/Tree.vue";
 import Vue from "vue";
+import XBytes from "xbytes";
+
+import TreeRoot from "@/components/TreeRoot.vue";
 import { hashCode } from "@/utils/misc";
 
-const TreeVM = Vue.extend(Tree);
+const TreeRootVM = Vue.extend(TreeRoot);
 
 function folderTreeFromNodeList(fileNodeList) {
   const map = {};
@@ -49,7 +50,7 @@ function folderTreeFromNodeList(fileNodeList) {
 
       let baseName = filePath.substring(
         0,
-        filePath.indexOf(fileName) + fileName.length
+        filePath.indexOf(fileName) + fileName.length,
       );
       let key = hashCode(baseName);
 
@@ -98,7 +99,7 @@ export function mountFileListElement(el, title) {
     return;
   }
 
-  const tree = new TreeVM({
+  const tree = new TreeRootVM({
     propsData: {
       folders:
         (folders.length > 1 || folders[0].size) && title
diff --git a/vite.config.js b/vite.config.js
index 4d68cf0..e1c164e 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,8 +1,8 @@
-import fs from "fs";
+import vue2 from "@vitejs/plugin-vue2";
 import chalk from "chalk";
-import { defineConfig } from "vite";
+import fs from "fs";
 import { fileURLToPath } from "url";
-import vue2 from "@vitejs/plugin-vue2";
+import { defineConfig } from "vite";
 import banner from "vite-plugin-banner";
 
 import { createBanner } from "./userscript";