Fix eslint errors after dep upgrades

Trinovantes · Jan 19, 2022 · c8b3552 · c8b3552
1 parent 2aaebcd
commit c8b3552
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 11 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -42,6 +42,14 @@ module.exports = {
         'vue',
     ],
 
+    settings: {
+        'import/resolver': {
+            'typescript': {
+                'alwaysTryTypes': true,
+            },
+        },
+    },
+
     rules: {
         'generator-star-spacing': ['error', 'before'],
         'arrow-parens': ['error', 'always'],
@@ -71,10 +79,7 @@ module.exports = {
         'vue/html-indent': ['error', 4],
         'vue/max-attributes-per-line': ['error', {
             singleline: 999,
-            multiline: {
-                max: 1,
-                allowFirstLine: false,
-            },
+            multiline: 1,
         }],
 
         '@typescript-eslint/type-annotation-spacing': 'error',

diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
         "esbuild-loader": "^2.16.0",
         "eslint": "^8.7.0",
         "eslint-config-standard": "^17.0.0-0",
+        "eslint-import-resolver-typescript": "^2.5.0",
         "eslint-plugin-import": "^2.22.0",
         "eslint-plugin-n": "^14.0.0",
         "eslint-plugin-node": "^11.1.0",

diff --git a/src/components/UserscriptApp.vue b/src/components/UserscriptApp.vue
@@ -9,7 +9,7 @@
                     {{ projectUrl }}
                 </a>
 
-                <Settings
+                <UserscriptAppSettings
                     @close="isOpen = false"
                 />
             </div>
@@ -44,12 +44,12 @@
 <script lang="ts">
 import { Action, Mutation, useTypedStore } from '@/store'
 import { ref, defineComponent, onMounted, computed } from 'vue'
-import Settings from './Settings.vue'
+import UserscriptAppSettings from './UserscriptAppSettings.vue'
 import { deleteWorkflowRuns } from '@/DeleteWorkflowRuns'
 
 export default defineComponent({
     components: {
-        Settings,
+        UserscriptAppSettings,
     },
 
     setup() {

diff --git a/src/components/Settings.vue → src/components/UserscriptAppSettings.vue b/src/components/Settings.vue → src/components/UserscriptAppSettings.vue
diff --git a/webpack.config.ts b/webpack.config.ts
@@ -5,6 +5,7 @@ import { VueLoaderPlugin } from 'vue-loader'
 import packageJson from './package.json'
 import url from 'url'
 import { EOL } from 'os'
+import 'webpack-dev-server'
 
 const isDev = (process.env.NODE_ENV === 'development')
 const srcDir = path.resolve(__dirname, 'src')
@@ -128,7 +129,7 @@ const config: webpack.Configuration = {
             },
             proxyScript: {
                 enable: isDev,
-                baseUrl: baseUrl,
+                baseUrl,
             },
         }),
     ],

diff --git a/yarn.lock b/yarn.lock
@@ -2063,7 +2063,7 @@ debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
   integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
@@ -2426,6 +2426,17 @@ eslint-import-resolver-node@0.3.4, eslint-import-resolver-node@^0.3.6:
     debug "^2.6.9"
     resolve "^1.13.1"
 
+eslint-import-resolver-typescript@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.5.0.tgz#07661966b272d14ba97f597b51e1a588f9722f0a"
+  integrity sha512-qZ6e5CFr+I7K4VVhQu3M/9xGv9/YmwsEXrsm3nimw8vWaVHRDrQRp26BgCypTxBp3vUp4o5aVEJRiy0F2DFddQ==
+  dependencies:
+    debug "^4.3.1"
+    glob "^7.1.7"
+    is-glob "^4.0.1"
+    resolve "^1.20.0"
+    tsconfig-paths "^3.9.0"
+
 eslint-module-utils@^2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
@@ -2950,7 +2961,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.1.3:
+glob@^7.1.3, glob@^7.1.7:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -4751,7 +4762,7 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tsconfig-paths@^3.12.0:
+tsconfig-paths@^3.12.0, tsconfig-paths@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
   integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==