Merge pull request #1605 from diowa/feature/remove-standard

Remove standard in favour of eslint
diowa · Dec 25, 2023 · 4558ae9 · 4558ae9
2 parents 3572842 + 2ca846b
commit 4558ae9
Show file tree

Hide file tree

Showing 6 changed files with 196 additions and 645 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,3 @@
+/**/vendor/*.js
+/app/assets/config/manifest.js
+/config/**/*.js
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -0,0 +1,23 @@
+module.exports = {
+  root: true,
+  extends: [
+    'standard'
+  ],
+  globals: {
+    '$': true,
+    'ClientSideValidations': true,
+    'google': true,
+    'Handlebars': true,
+    'HandlebarsTemplates': true,
+    'I18n': true,
+    'InfoBox': true,
+    'initGoogleMaps': true
+  },
+  settings: {
+    'import/resolver': {
+      node: {
+        paths: ['app/javascript']
+      }
+    }
+  }
+}
diff --git a/config/webpack/development.js b/config/webpack/development.js
@@ -1,28 +1,14 @@
+const ESLintPlugin = require('eslint-webpack-plugin')
 const StyleLintPlugin = require('stylelint-webpack-plugin')
 
 module.exports = {
   envSpecificConfig: {
-    module: {
-      rules: [
-        {
-          test: /\.js$/,
-          exclude: /vendor\/.+\.js$/,
-          loader: 'standard-loader',
-          options: {
-            globals: [
-              '$',
-              'ClientSideValidations',
-              'google',
-              'Handlebars',
-              'HandlebarsTemplates',
-              'InfoBox',
-              'initGoogleMaps'
-            ]
-          }
-        }
-      ]
-    },
     plugins: [
+      new ESLintPlugin({
+        failOnError: false,
+        files: 'app/javascript/**/*.js',
+        exclude: 'app/javascript/**/vendor/*.js'
+      }),
       new StyleLintPlugin({
         failOnError: false,
         files: 'app/javascript/**/*.(s(c|a)ss|css)'

diff --git a/lib/tasks/yarn_linters.rake b/lib/tasks/yarn_linters.rake
@@ -24,12 +24,12 @@ namespace :yarn do
     Rake::Task['yarn:run'].execute(command: "stylelint #{Dir.glob('app/**/*.scss').join(' ')}")
   end
 
-  desc 'Run `bin/yarn standard`'
-  task :standard do
-    Rake::Task['yarn:run'].execute(command: 'standard')
+  desc 'Run `bin/yarn eslint`'
+  task :eslint do
+    Rake::Task['yarn:run'].execute(command: 'eslint app/**/*.js')
   end
   # rubocop:enable Rails/RakeEnvironment
 end
 
 task(:lint).sources.push 'yarn:stylelint'
-task(:lint).sources.push 'yarn:standard'
+task(:lint).sources.push 'yarn:eslint'
diff --git a/package.json b/package.json
@@ -54,35 +54,19 @@
     "@babel/eslint-parser": "^7.23.3",
     "@types/express": "^4.17.21",
     "@webpack-cli/serve": "^2.0.5",
-    "eslint": "^8.56.0",
-    "standard": "^16.0.3",
-    "standard-loader": "^7.0.0",
+    "eslint": ">=8.27.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-n": "^16.5.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-webpack-plugin": "^4.0.1",
     "stylelint": "^15.11.0",
     "stylelint-config-twbs-bootstrap": "^12.0.0",
     "stylelint-order": "^6.0.4",
     "stylelint-scss": "^5.3.2",
     "stylelint-webpack-plugin": "^4.1.1",
     "webpack-dev-server": "^4.15.1"
   },
-  "standard": {
-    "parser": "@babel/eslint-parser",
-    "ignore": [
-      "/*.js",
-      "app/assets/javascripts",
-      "app/javascript/src/vendor",
-      "/config"
-    ],
-    "globals": [
-      "$",
-      "ClientSideValidations",
-      "google",
-      "Handlebars",
-      "HandlebarsTemplates",
-      "I18n",
-      "InfoBox",
-      "initGoogleMaps"
-    ]
-  },
   "babel": {
     "presets": [
       "./node_modules/shakapacker/package/babel/preset.js"