Bug 1558517 - Pre 2: Move the **/*.*html overrides to recommended.js, r=standard8

Differential Revision: https://phabricator.services.mozilla.com/D34534

--HG--
extra : source : ed2cf27ca3ec535e1dbc634f3a603ad41678e646
extra : intermediate-source : 9b1f833b858f9bcdeed1fd7cd45d3fe051748712

.eslintrc.js

@@ -40,24 +40,10 @@ module.exports = {
     "plugin:mozilla/recommended"
   ],
   "plugins": [
-    "html",
     "mozilla"
   ],
-  // To avoid bad interactions of the html plugin with the xml preprocessor in
-  // eslint-plugin-mozilla, we turn off processing of the html plugin for .xml
-  // files.
-  "settings": {
-    "html/xml-extensions": [ ".xhtml" ]
-  },
 
   "overrides": [{
-    // eslint-plugin-html handles eol-last slightly different - it applies to
-    // each set of script tags, so we turn it off here.
-    "files": "**/*.*html",
-    "rules": {
-      "eol-last": "off",
-    }
-  }, {
     // These xbl bindings are assumed to be in the browser-window environment,
     // we would mark it in the files, but ESLint made this more difficult with
     // our xml processor, so we list them here. Bug 1397874 & co are working
@@ -88,7 +74,6 @@ module.exports = {
     // This would be expensive and slow, and it isn't worth it for head files.
     // We could get developers to declare as exported, but that doesn't seem worth it.
     "files": xpcshellTestPaths.map(path => `${path}head*.js`),
-
     "rules": {
       "no-unused-vars": ["error", {
         "args": "none",

tools/lint/eslint/eslint-plugin-mozilla/lib/configs/recommended.js

@@ -50,6 +50,13 @@ module.exports = {
   },
 
   "overrides": [{
+    // eslint-plugin-html handles eol-last slightly different - it applies to
+    // each set of script tags, so we turn it off here.
+    "files": "**/*.*html",
+    "rules": {
+      "eol-last": "off",
+    },
+  }, {
     // Turn off use-services for xml files. XBL bindings are going away, and
     // working out the valid globals for those is difficult.
     "files": "**/*.xml",
@@ -81,6 +88,7 @@ module.exports = {
 
   // When adding items to this file please check for effects on sub-directories.
   "plugins": [
+    "html",
     "fetch-options",
     "no-unsanitized",
     "prettier",
@@ -389,4 +397,11 @@ module.exports = {
     // Requires or disallows a whitespace (space or tab) beginning a comment
     "spaced-comment": ["error", "always", { "markers": ["#"] }],
   },
+
+  // To avoid bad interactions of the html plugin with the xml preprocessor in
+  // eslint-plugin-mozilla, we turn off processing of the html plugin for .xml
+  // files.
+  "settings": {
+    "html/xml-extensions": [ ".xhtml" ],
+  },
 };