From 672965316ad41cedafb5f6ef0f4aa95030ebb3f0 Mon Sep 17 00:00:00 2001
From: HappNTH <crayner.auburn@yahoo.co.uk>
Date: Sun, 7 Jul 2024 23:00:26 +0000
Subject: [PATCH] Resolve remaining tsc issues

---
 nuxt.config.ts                      |  2 +-
 package.json                        |  2 +-
 tests/unit/support/helpers/mount.ts |  2 +-
 yarn.lock                           | 25 +++++++++----------------
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index df65bd3df..6094b74ca 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,6 +1,6 @@
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 import publicConfig from './config.public';
-import eslintPlugin from 'vite-plugin-eslint';
+import eslintPlugin from 'vite-plugin-eslint2';
 
 // Define CSS Files to Bundle
 const cssFiles = [
diff --git a/package.json b/package.json
index 2983e0ae8..f5515640d 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "typescript": "^5.5.3",
     "unplugin-auto-import": "^0.17.6",
     "unplugin-vue-components": "^0.27.2",
-    "vite-plugin-eslint": "^1.8.1",
+    "vite-plugin-eslint2": "^4.4.0",
     "vitest": "^0.25.6",
     "vue-tsc": "^2.0.26",
     "webpack": "^5.92.1"
diff --git a/tests/unit/support/helpers/mount.ts b/tests/unit/support/helpers/mount.ts
index 81a59c03d..02556ba4c 100644
--- a/tests/unit/support/helpers/mount.ts
+++ b/tests/unit/support/helpers/mount.ts
@@ -1,7 +1,7 @@
 import { mount as vtuMount } from '@vue/test-utils';
 import type { Router, _RouteLocationBase } from 'vue-router';
 import { vi } from 'vitest';
-import { useApollo as originalUseApollo } from '@nuxtjs/apollo/dist/runtime/composables';
+import { useApollo as originalUseApollo } from '#imports';
 import { merge } from 'lodash';
 import { createTestingPinia } from '@pinia/testing';
 import publicConfig from '@/config.public';
diff --git a/yarn.lock b/yarn.lock
index 4785728be..9b8447203 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2925,7 +2925,7 @@
     smob "^1.0.0"
     terser "^5.17.4"
 
-"@rollup/pluginutils@^4.0.0", "@rollup/pluginutils@^4.2.1":
+"@rollup/pluginutils@^4.0.0":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
   integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
@@ -3374,7 +3374,7 @@
     "@types/eslint" "*"
     "@types/estree" "*"
 
-"@types/eslint@*", "@types/eslint@^8.4.5":
+"@types/eslint@*":
   version "8.56.10"
   resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d"
   integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==
@@ -11197,13 +11197,6 @@ rollup-plugin-visualizer@^5.12.0:
     source-map "^0.7.4"
     yargs "^17.5.1"
 
-rollup@^2.77.2:
-  version "2.79.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
-  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
-  optionalDependencies:
-    fsevents "~2.3.2"
-
 rollup@^3.27.1:
   version "3.29.4"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
@@ -12723,14 +12716,14 @@ vite-plugin-checker@^0.7.0:
     vscode-languageserver-textdocument "^1.0.1"
     vscode-uri "^3.0.2"
 
-vite-plugin-eslint@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-eslint/-/vite-plugin-eslint-1.8.1.tgz#0381b8272e7f0fd8b663311b64f7608d55d8b04c"
-  integrity sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==
+vite-plugin-eslint2@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/vite-plugin-eslint2/-/vite-plugin-eslint2-4.4.0.tgz#2de7fd5cff320b6e2fdc1b984c065ab23e5da897"
+  integrity sha512-xy5G4Gj18ke1bO5OS0zgyunkPvPy/vSLJFTyMpGmKGKTlYuuhPad3Xy1PWLuqRMoWnuCoFMf2ST1EGhz89uqrA==
   dependencies:
-    "@rollup/pluginutils" "^4.2.1"
-    "@types/eslint" "^8.4.5"
-    rollup "^2.77.2"
+    "@rollup/pluginutils" "^5.1.0"
+    chokidar "^3.6.0"
+    debug "^4.3.4"
 
 vite-plugin-inspect@^0.8.4:
   version "0.8.4"