Merge branch 'hotfixes' into 'pregmod-master'

ESlint Two

See merge request pregmodfan/fc-pregmod!4216

.eslintrc.json

+{
+    "root": true,
+    "env": {
+        "browser": true,
+        "es6": true,
+        "jquery": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "SugarCube": false,
+        "Config": false,
+        "State": false,
+        "Story": false,
+        "settings": false,
+        "setup": false,
+        "App": false,
+        "prehistory": true,
+        "predisplay": true,
+        "prerender": true,
+        "postrender": true,
+        "postdisplay": true
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018,
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "impliedStrict": true
+        }
+    },
+    "rules": {
+        "semi-spacing": "warn",
+        "semi-style": "warn",
+        "eqeqeq": "error",
+        "no-fallthrough": "error",
+        "camelcase": "warn",
+        "comma-spacing": "error",
+        "comma-style": "error",
+        "object-curly-newline": "off",
+        "object-curly-spacing": "error",
+        "no-var": "error",
+        "spaced-comment": "warn",
+        "no-undef": "off",
+        "no-unused-vars": "error",
+        "block-scoped-var": "warn",
+        "dot-notation": "off",
+        "linebreak-style": ["error", "unix"],
+        "eol-last": "warn",
+        "unicode-bom": [
+            "error",
+            "never"
+        ],
+        "valid-jsdoc": [
+        "warn",
+        {
+            "requireParamDescription": false,
+            "requireReturnDescription": false,
+            "requireReturn": false
+        }
+        ]
+    }
+}

.gitignore

@@ -95,8 +95,6 @@ ENV/
 src/config/start.tw
 
 # eslint
-.eslintrc.js
-.eslintrc.json
 node_modules
 package-lock.json
 package.json