Merge pull request #18 from duhrer/GH-17

Update to use ESLint without formatting rules and plugin with them.
fluid-project · Jan 12, 2024 · 44cf2b3 · 44cf2b3
2 parents 8ee4e39 + da49c20
commit 44cf2b3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/.eslintrc-fluid.json b/.eslintrc-fluid.json
@@ -1,4 +1,7 @@
 {
+    "plugins": [
+        "@stylistic/js"
+    ],
     "env": {
         "browser": true,
         "jquery": true
@@ -8,29 +11,29 @@
     },
     "rules": {
         "block-scoped-var": "error",
-        "comma-dangle": [
+        "@stylistic/js/comma-dangle": [
             "error",
             "never"
         ],
-        "comma-style": [
+        "@stylistic/js/comma-style": [
             "error",
             "last"
         ],
         "curly": [
             "error",
             "all"
         ],
-        "eol-last": "error",
+        "@stylistic/js/eol-last": "error",
         "eqeqeq": [
             "error",
             "allow-null"
         ],
-        "indent": [
+        "@stylistic/js/indent": [
             "error",
             4
         ],
-        "keyword-spacing": "error",
-        "linebreak-style": ["error", "unix"],
+        "@stylistic/js/keyword-spacing": "error",
+        "@stylistic/js/linebreak-style": ["error", "unix"],
         "new-cap": [
             "error",
             {
@@ -62,31 +65,31 @@
         "no-redeclare": "error",
         "no-script-url": "error",
         "no-sequences": "error",
-        "no-trailing-spaces": "error",
+        "@stylistic/js/no-trailing-spaces": "error",
         "no-undef": "error",
         "no-unused-vars": "error",
         "no-with": "error",
-        "quotes": [
+        "@stylistic/js/quotes": [
             "error",
             "double"
         ],
-        "semi": [
+        "@stylistic/js/semi": [
             "error",
             "always"
         ],
-        "space-before-blocks": [
+        "@stylistic/js/space-before-blocks": [
             "error",
             "always"
         ],
-        "space-before-function-paren": [
+        "@stylistic/js/space-before-function-paren": [
             "error",
             {
                 "anonymous": "always",
                 "named": "never"
             }
         ],
-        "space-infix-ops": "error",
-        "space-unary-ops": [
+        "@stylistic/js/space-infix-ops": "error",
+        "@stylistic/js/space-unary-ops": [
             "error",
             {
                 "words": true,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "eslint-config-fluid",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "description": "fluid-project eslint configuration",
     "main": "index.js",
     "engines": {
@@ -26,11 +26,13 @@
     },
     "homepage": "http://fluidproject.org",
     "dependencies": {
-        "eslint-plugin-jsdoc": "39.3.13"
+	"eslint": "8.53.0",
+        "eslint-plugin-jsdoc": "39.3.13",
+        "@stylistic/eslint-plugin-js": "1.0.0"
     },
     "devDependencies": {
-        "grunt": "1.5.3",
-        "grunt-eslint": "24.0.0",
+        "grunt": "1.6.1",
+        "grunt-eslint": "24.3.0",
         "grunt-jsonlint": "2.1.3"
     }
 }