Merge branch 'eslintx' into 'pregmod-master'

Yet more eslint rules

See merge request pregmodfan/fc-pregmod!4390

.eslintrc.json

@@ -30,7 +30,9 @@
 	"rules": {
 		"semi": ["error", "always"],
 		"semi-spacing": "warn",
-		"semi-style": "warn",
+		"semi-style": "warn",	
+		"block-spacing": ["warn", "always"],
+		"curly": ["warn", "all"], 
 		"eqeqeq": "error",
 		"no-fallthrough": "error",
 		"space-before-function-paren": ["error", "never"],
@@ -48,6 +50,7 @@
 		],
 		"object-curly-spacing": "error",
 		"no-var": "error",
+		"no-template-curly-in-string": "error",
 		"spaced-comment": "warn",
 		"no-undef": "off",
 		"no-unused-vars": "error",