Merge pull request #476 from munierujp/update-eslint-packages

ESLint関連パッケージを更新
codeforjapan · Jan 17, 2024 · 0af129b · 0af129b
2 parents 25ceab9 + 31144ad
commit 0af129b
Show file tree

Hide file tree

Showing 9 changed files with 642 additions and 428 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -46,4 +46,16 @@ module.exports = {
     'keyword-spacing': 2,
     'camelcase': 0,
   },
+  overrides: [
+    {
+      files: [
+        'layouts/*.vue',
+        'pages/*.vue'
+      ],
+      rules: {
+        // 1単語のコンポーネント名を許容
+        'vue/multi-word-component-names': 'off'
+      }
+    }
+  ]
 }
diff --git a/components/Logo.vue b/components/Logo.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/multi-word-component-names -->
 <template lang="pug">
 <div class="VueToNuxtLogo">
   <div class="Triangle Triangle--two" />

diff --git a/components/Modal.vue b/components/Modal.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vue/multi-word-component-names -->
 <template lang="pug">
 div
   .modal(v-bind:class='{open: isOpen}')

diff --git a/components/PrintableMap.vue b/components/PrintableMap.vue
@@ -248,10 +248,12 @@ export default {
           self.mapConfig.layer_settings,
           source.updated_search_key
         );
+        // eslint-disable-next-line array-callback-return
         markers.map((marker) => {
           categories[marker.category] = true;
         });
         source.updated_at = updated_at;
+        // eslint-disable-next-line array-callback-return
         Object.keys(categories).map((category) => {
           const categoryExists = self.mapConfig.layer_settings[category];
 
@@ -329,6 +331,7 @@ export default {
     },
     getMarkerNameText(markerProperties, locale) {
       let name = markerProperties.name;
+      // eslint-disable-next-line no-prototype-builtins
       if (markerProperties.hasOwnProperty("name:" + locale)) {
         name = markerProperties["name:" + locale];
       }

diff --git a/createtiles.js b/createtiles.js
@@ -33,6 +33,7 @@ const _make_tilejson = (dir, base_name) => {
 
 // load config
 const list = require(`${CONFIG_DIR}list.json`)
+// eslint-disable-next-line array-callback-return
 list.map((name) => {
   // load map config
   console.log(`loading ${CONFIG_DIR}${name}`)

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -9,6 +9,7 @@ try {
   if (fs.existsSync("./nuxt-router-override.config.js")) {
     router = require("./nuxt-router-override.config").default;
   }
+// eslint-disable-next-line no-empty
 } finally {
 }
 

diff --git a/package.json b/package.json
@@ -53,8 +53,8 @@
     "@babel/preset-typescript": "^7.23.3",
     "@nuxt/test-utils": "^3.9.0",
     "@nuxt/typescript-build": "^0.2.10",
-    "@nuxtjs/eslint-config": "^1.0.1",
-    "@nuxtjs/eslint-module": "^1.2.0",
+    "@nuxtjs/eslint-config": "^8.0.0",
+    "@nuxtjs/eslint-module": "^4.1.0",
     "@playwright/test": "^1.40.1",
     "@types/geojson": "^7946.0.7",
     "@types/jest": "^29.5.11",
@@ -70,11 +70,11 @@
     "babel-preset-vue": "^2.0.2",
     "cross-env": "^6.0.3",
     "css-mqpacker": "^7.0.0",
-    "eslint": "^6.8.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-html": "^6.1.1",
-    "eslint-plugin-nuxt": "^2.0.0",
-    "eslint-plugin-vue": "^7.7.0",
+    "eslint-plugin-html": "^7.1.0",
+    "eslint-plugin-nuxt": "^4.0.0",
+    "eslint-plugin-vue": "^9.19.2",
     "fs": "0.0.1-security",
     "jest": "^29.7.0",
     "jest-dom": "^4.0.0",

diff --git a/plugins/simplebar.js b/plugins/simplebar.js
@@ -1,4 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import Vue from 'vue'
 import simplebar from 'simplebar-vue'
+// eslint-disable-next-line vue/multi-word-component-names
 Vue.component('Simplebar', simplebar)