From 9baa3ca471d6996eb4a4491eb62d917f00b038c5 Mon Sep 17 00:00:00 2001
From: Raindrop <h_villiger@163.com>
Date: Fri, 8 Nov 2024 18:07:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20eslint=20v9=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/.eslintignore    |  4 ----
 web/.eslintrc.js     | 17 -----------------
 web/eslint.config.js | 17 +++++++++++++++++
 web/package.json     |  8 +++++---
 4 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 web/.eslintignore
 delete mode 100644 web/.eslintrc.js
 create mode 100644 web/eslint.config.js

diff --git a/web/.eslintignore b/web/.eslintignore
deleted file mode 100644
index e6529fc09c..0000000000
--- a/web/.eslintignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build/*.js
-src/assets
-public
-dist
diff --git a/web/.eslintrc.js b/web/.eslintrc.js
deleted file mode 100644
index 0821611b52..0000000000
--- a/web/.eslintrc.js
+++ /dev/null
@@ -1,17 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    parser: '@babel/eslint-parser',
-    sourceType: 'module'
-  },
-  env: {
-    browser: true,
-    node: true,
-    es6: true
-  },
-  extends: ['plugin:vue/recommended', 'eslint:recommended'],
-  rules: {
-    "vue/max-attributes-per-line" : 0,
-    "vue/no-v-model-argument" : 0
-  }
-}
diff --git a/web/eslint.config.js b/web/eslint.config.js
new file mode 100644
index 0000000000..fa9a85bb50
--- /dev/null
+++ b/web/eslint.config.js
@@ -0,0 +1,17 @@
+import js from '@eslint/js'
+import pluginVue from 'eslint-plugin-vue'
+
+export default [
+  {
+    name: 'app/files-to-lint',
+    files: ['**/*.{js,mjs,jsx,vue}'],
+  },
+
+  {
+    name: 'app/files-to-ignore',
+    ignores: ['**/dist/**', '**/build/*.js', '**/src/assets/**', '**/public/**'],
+  },
+
+  js.configs.recommended,
+  ...pluginVue.configs['flat/essential'],
+]
diff --git a/web/package.json b/web/package.json
index d66ea30496..69f8a62cd3 100644
--- a/web/package.json
+++ b/web/package.json
@@ -2,6 +2,7 @@
     "name": "gin-vue-admin",
     "version": "2.7.7",
     "private": true,
+    "type": "module",
     "scripts": {
         "serve": "node openDocument.js && vite --host --mode development",
         "build": "vite build --mode production",
@@ -49,8 +50,9 @@
     },
     "devDependencies": {
         "@babel/eslint-parser": "^7.25.1",
+        "@eslint/js": "^9.14.0",
         "@vitejs/plugin-legacy": "^5.4.2",
-        "@vitejs/plugin-vue": "^5.1.3",
+        "@vitejs/plugin-vue": "^5.1.4",
         "@vue/cli-plugin-babel": "~5.0.8",
         "@vue/cli-plugin-eslint": "~5.0.8",
         "@vue/cli-plugin-router": "~5.0.8",
@@ -60,8 +62,8 @@
         "babel-plugin-import": "^1.13.8",
         "chalk": "^5.3.0",
         "dotenv": "^16.4.5",
-        "eslint": "^9.9.1",
-        "eslint-plugin-vue": "^9.28.0",
+        "eslint": "^9.14.0",
+        "eslint-plugin-vue": "^9.30.0",
         "sass": "^1.78.0",
         "terser": "^5.31.6",
         "vite": "^5.4.3",

From 762e117a71871f32e67a7a70cd2d0be187a23b63 Mon Sep 17 00:00:00 2001
From: Raindrop <h_villiger@163.com>
Date: Fri, 8 Nov 2024 23:10:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20eslint=20=E9=85=8D=E7=BD=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0,=20=E9=80=82=E9=85=8D=E4=BD=8E=E7=89=88=E6=9C=AC=20no?=
 =?UTF-8?q?de?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/{eslint.config.js => eslint.config.mjs} | 16 ++++++++++++----
 web/package.json                            |  1 -
 2 files changed, 12 insertions(+), 5 deletions(-)
 rename web/{eslint.config.js => eslint.config.mjs} (59%)

diff --git a/web/eslint.config.js b/web/eslint.config.mjs
similarity index 59%
rename from web/eslint.config.js
rename to web/eslint.config.mjs
index fa9a85bb50..9fb969c25b 100644
--- a/web/eslint.config.js
+++ b/web/eslint.config.mjs
@@ -1,17 +1,25 @@
 import js from '@eslint/js'
 import pluginVue from 'eslint-plugin-vue'
+import globals from "globals"
 
 export default [
+  js.configs.recommended,
+  ...pluginVue.configs['flat/essential'],
   {
     name: 'app/files-to-lint',
     files: ['**/*.{js,mjs,jsx,vue}'],
+    languageOptions: {
+      ecmaVersion: 'latest',
+      sourceType: "module",
+      globals: globals.node
+    },
+    rules: {
+      "vue/max-attributes-per-line" : 0,
+      "vue/no-v-model-argument" : 0
+    },
   },
-
   {
     name: 'app/files-to-ignore',
     ignores: ['**/dist/**', '**/build/*.js', '**/src/assets/**', '**/public/**'],
   },
-
-  js.configs.recommended,
-  ...pluginVue.configs['flat/essential'],
 ]
diff --git a/web/package.json b/web/package.json
index 69f8a62cd3..741335c570 100644
--- a/web/package.json
+++ b/web/package.json
@@ -2,7 +2,6 @@
     "name": "gin-vue-admin",
     "version": "2.7.7",
     "private": true,
-    "type": "module",
     "scripts": {
         "serve": "node openDocument.js && vite --host --mode development",
         "build": "vite build --mode production",