From 228eaee64fa7aa5b82e2d0a7c639d2d2c1f1aefb Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Mon, 11 Jul 2022 23:18:49 +0200
Subject: [PATCH 1/3] Fix eslint parsing errors

Introduce a separate .eslintrc in the Vue components folder to
selectively enable vue-eslint-parser there, so that the rest of the
files can use eslint's core parser which can deal with hashbangs.

The fact that the eslint-disable comments worked in HTML was a
unintended side-effect of the files being parsed via vue-eslint-parser,
so I had to disable the parsing of these files in .eslintrc.yaml to make
it work.
---
 .eslintrc.yaml                              | 13 +++----------
 Makefile                                    |  2 +-
 templates/base/head_script.tmpl             |  1 -
 templates/repo/issue/view_content/pull.tmpl |  1 -
 web_src/js/components/.eslintrc.yaml        | 16 ++++++++++++++++
 5 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 web_src/js/components/.eslintrc.yaml

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index ff62d9cc93b00..fbc23215cf2a0 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -3,6 +3,8 @@ reportUnusedDisableDirectives: true
 
 ignorePatterns:
   - /web_src/js/vendor
+  - /templates/base/head_script.tmpl
+  - /templates/repo/issue/view_content/pull.tmpl
 
 parserOptions:
   sourceType: module
@@ -11,13 +13,9 @@ parserOptions:
 plugins:
   - eslint-plugin-unicorn
   - eslint-plugin-import
-  - eslint-plugin-vue
   - eslint-plugin-html
   - eslint-plugin-jquery
 
-extends:
-  - plugin:vue/recommended
-
 env:
   es2022: true
   node: true
@@ -29,7 +27,7 @@ settings:
   html/html-extensions: [".tmpl"]
 
 overrides:
-  - files: ["web_src/**/*.js", "web_src/**/*.vue", "templates/**/*.tmpl"]
+  - files: ["web_src/**/*.js", "templates/**/*.tmpl", "docs/**/*.js"]
     env:
       browser: true
       node: false
@@ -502,11 +500,6 @@ rules:
   use-isnan: [2]
   valid-typeof: [2, {requireStringLiterals: true}]
   vars-on-top: [0]
-  vue/attributes-order: [0]
-  vue/component-definition-name-casing: [0]
-  vue/html-closing-bracket-spacing: [0]
-  vue/max-attributes-per-line: [0]
-  vue/one-component-per-file: [0]
   wrap-iife: [2, inside]
   wrap-regex: [0]
   yield-star-spacing: [2, after]
diff --git a/Makefile b/Makefile
index 5536788613c4f..69cab6daeb918 100644
--- a/Makefile
+++ b/Makefile
@@ -310,7 +310,7 @@ lint: lint-frontend lint-backend
 
 .PHONY: lint-frontend
 lint-frontend: node_modules
-	npx eslint --color --max-warnings=0 web_src/js build templates *.config.js docs/assets/js
+	npx eslint --color --max-warnings=0 --ext js,vue,tmpl web_src/js build templates *.config.js docs/assets/js
 	npx stylelint --color --max-warnings=0 web_src/less
 	npx spectral lint -q -F hint $(SWAGGER_SPEC)
 
diff --git a/templates/base/head_script.tmpl b/templates/base/head_script.tmpl
index 2f74b959e2a1a..48a3df693a39b 100644
--- a/templates/base/head_script.tmpl
+++ b/templates/base/head_script.tmpl
@@ -4,7 +4,6 @@ If you are customizing Gitea, please do not change this file.
 If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
 */}}
 <script>
-	<!-- /* eslint-disable */ -->
 	window.addEventListener('error', function(e) {window._globalHandlerErrors=window._globalHandlerErrors||[]; window._globalHandlerErrors.push(e);});
 	window.config = {
 		appVer: '{{AppVer}}',
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 60fe667a54899..be2c8f0c0ef4c 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -340,7 +340,6 @@
 						{{end}}
 						<div class="ui divider"></div>
 						<script>
-							<!-- /* eslint-disable */ -->
 							(() => {
 								const defaultMergeTitle = {{.DefaultMergeMessage}};
 								const defaultSquashMergeTitle = {{.DefaultSquashMergeMessage}};
diff --git a/web_src/js/components/.eslintrc.yaml b/web_src/js/components/.eslintrc.yaml
new file mode 100644
index 0000000000000..e19bd066372a6
--- /dev/null
+++ b/web_src/js/components/.eslintrc.yaml
@@ -0,0 +1,16 @@
+plugins:
+  - eslint-plugin-vue
+
+extends:
+  - ../../../.eslintrc.yaml
+  - plugin:vue/recommended
+
+env:
+  browser: true
+
+rules:
+  vue/attributes-order: [0]
+  vue/component-definition-name-casing: [0]
+  vue/html-closing-bracket-spacing: [0]
+  vue/max-attributes-per-line: [0]
+  vue/one-component-per-file: [0]

From a34734ecee3c843d64b21bd5a87645d55e74366f Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 12 Jul 2022 00:05:20 +0200
Subject: [PATCH 2/3] add comment

---
 .eslintrc.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index fbc23215cf2a0..aedd92099df78 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -1,6 +1,7 @@
 root: true
 reportUnusedDisableDirectives: true
 
+# put any .tmpl files here that fail to parse because of template syntax
 ignorePatterns:
   - /web_src/js/vendor
   - /templates/base/head_script.tmpl

From e5399c71eceaf1436c817de65edc58d2c9b43a7d Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 14 Jul 2022 20:03:15 +0200
Subject: [PATCH 3/3] remove eslint-plugin-html

---
 .eslintrc.yaml    | 13 +--------
 Makefile          |  2 +-
 package-lock.json | 68 -----------------------------------------------
 package.json      |  1 -
 4 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index aedd92099df78..3a906c44cd840 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -1,11 +1,8 @@
 root: true
 reportUnusedDisableDirectives: true
 
-# put any .tmpl files here that fail to parse because of template syntax
 ignorePatterns:
   - /web_src/js/vendor
-  - /templates/base/head_script.tmpl
-  - /templates/repo/issue/view_content/pull.tmpl
 
 parserOptions:
   sourceType: module
@@ -14,7 +11,6 @@ parserOptions:
 plugins:
   - eslint-plugin-unicorn
   - eslint-plugin-import
-  - eslint-plugin-html
   - eslint-plugin-jquery
 
 env:
@@ -24,18 +20,11 @@ env:
 globals:
   __webpack_public_path__: true
 
-settings:
-  html/html-extensions: [".tmpl"]
-
 overrides:
-  - files: ["web_src/**/*.js", "templates/**/*.tmpl", "docs/**/*.js"]
+  - files: ["web_src/**/*.js", "docs/**/*.js"]
     env:
       browser: true
       node: false
-  - files: ["templates/**/*.tmpl"]
-    rules:
-      no-tabs: [0]
-      indent: [2, tab, {SwitchCase: 1}]
   - files: ["web_src/**/*worker.js"]
     env:
       worker: true
diff --git a/Makefile b/Makefile
index 69cab6daeb918..5d1b54e852d35 100644
--- a/Makefile
+++ b/Makefile
@@ -310,7 +310,7 @@ lint: lint-frontend lint-backend
 
 .PHONY: lint-frontend
 lint-frontend: node_modules
-	npx eslint --color --max-warnings=0 --ext js,vue,tmpl web_src/js build templates *.config.js docs/assets/js
+	npx eslint --color --max-warnings=0 --ext js,vue web_src/js build *.config.js docs/assets/js
 	npx stylelint --color --max-warnings=0 web_src/less
 	npx spectral lint -q -F hint $(SWAGGER_SPEC)
 
diff --git a/package-lock.json b/package-lock.json
index 5032e50fc5250..605134201ebb9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -47,7 +47,6 @@
         "@happy-dom/jest-environment": "4.0.1",
         "@stoplight/spectral-cli": "6.4.1",
         "eslint": "8.15.0",
-        "eslint-plugin-html": "6.2.0",
         "eslint-plugin-import": "2.26.0",
         "eslint-plugin-jquery": "1.5.1",
         "eslint-plugin-unicorn": "42.0.0",
@@ -4839,18 +4838,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/entities": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
-      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/envinfo": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
@@ -5231,15 +5218,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/eslint-plugin-html": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
-      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
-      "dev": true,
-      "dependencies": {
-        "htmlparser2": "^7.1.2"
-      }
-    },
     "node_modules/eslint-plugin-import": {
       "version": "2.26.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
@@ -6262,25 +6240,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/htmlparser2": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
-      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
-      "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.2",
-        "domutils": "^2.8.0",
-        "entities": "^3.0.1"
-      }
-    },
     "node_modules/http-basic": {
       "version": "8.1.3",
       "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-8.1.3.tgz",
@@ -16221,12 +16180,6 @@
         "tapable": "^2.2.0"
       }
     },
-    "entities": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
-      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
-      "dev": true
-    },
     "envinfo": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
@@ -16519,15 +16472,6 @@
         }
       }
     },
-    "eslint-plugin-html": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.2.0.tgz",
-      "integrity": "sha512-vi3NW0E8AJombTvt8beMwkL1R/fdRWl4QSNRNMhVQKWm36/X0KF0unGNAY4mqUF06mnwVWZcIcerrCnfn9025g==",
-      "dev": true,
-      "requires": {
-        "htmlparser2": "^7.1.2"
-      }
-    },
     "eslint-plugin-import": {
       "version": "2.26.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
@@ -17317,18 +17261,6 @@
       "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
       "dev": true
     },
-    "htmlparser2": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
-      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.2",
-        "domutils": "^2.8.0",
-        "entities": "^3.0.1"
-      }
-    },
     "http-basic": {
       "version": "8.1.3",
       "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-8.1.3.tgz",
diff --git a/package.json b/package.json
index b55da05b3dec0..afc8d2a374e96 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,6 @@
     "@happy-dom/jest-environment": "4.0.1",
     "@stoplight/spectral-cli": "6.4.1",
     "eslint": "8.15.0",
-    "eslint-plugin-html": "6.2.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-jquery": "1.5.1",
     "eslint-plugin-unicorn": "42.0.0",