Bug 1362947 - Upgrade eslint-plugin-html to 2.0.3 to pick up --fix support. r=jaws

MozReview-Commit-ID: 5fVG7akPnGM

--HG--
extra : rebase_source : f1b9eeb1b2048b551ee8c0a596e6395d0031cc4d

.eslintignore

@@ -55,6 +55,8 @@ b2g/locales/en-US/b2g-l10n.js
 browser/app/**
 browser/branding/**/firefox-branding.js
 browser/base/content/test/general/file_csp_block_all_mixedcontent.html
+# Gzipped test file.
+browser/base/content/test/general/gZipOfflineChild.html
 browser/base/content/test/urlbar/file_blank_but_not_blank.html
 browser/base/content/newtab/**
 # Test files that are really json not js, and don't need to be linted.

.eslintrc.js

@@ -21,6 +21,12 @@ module.exports = {
     "no-implied-eval": "error",
     "no-eval": "error",
   },
+  // The html plugin is enabled via a command line option on eslint. To avoid
+  // bad interactions with the xml preprocessor in eslint-plugin-mozilla, we
+  // turn off processing of the html plugin for .xml files.
+  "settings": {
+    "html/xml-extensions": [ ".xhtml" ]
+  },
   "env": {
     "es6": true
   },

npm-shrinkwrap.json

@@ -19,9 +19,9 @@
       }
     },
     "ajv": {
-      "version": "4.11.6",
+      "version": "4.11.8",
       "from": "ajv@>=4.7.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz"
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz"
     },
     "ajv-keywords": {
       "version": "1.5.1",
@@ -80,7 +80,7 @@
     },
     "brace-expansion": {
       "version": "1.1.7",
-      "from": "brace-expansion@>=1.0.0 <2.0.0",
+      "from": "brace-expansion@>=1.1.7 <2.0.0",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
     },
     "buffer-shims": {
@@ -149,9 +149,9 @@
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz"
     },
     "debug": {
-      "version": "2.6.3",
+      "version": "2.6.6",
       "from": "debug@>=2.1.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz"
     },
     "deep-is": {
       "version": "0.1.3",
@@ -191,14 +191,14 @@
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
     },
     "domhandler": {
-      "version": "2.3.0",
+      "version": "2.4.1",
       "from": "domhandler@>=2.3.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz"
     },
     "domutils": {
-      "version": "1.5.1",
+      "version": "1.6.2",
       "from": "domutils@>=1.5.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz"
     },
     "entities": {
       "version": "1.1.1",
@@ -261,9 +261,9 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"
     },
     "eslint-plugin-html": {
-      "version": "1.5.2",
+      "version": "2.0.3",
-      "from": "eslint-plugin-html@1.5.2",
+      "from": "eslint-plugin-html@2.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-1.5.2.tgz"
+      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz"
     },
     "eslint-plugin-react": {
       "version": "6.10.3",
@@ -278,9 +278,9 @@
       }
     },
     "espree": {
-      "version": "3.4.1",
+      "version": "3.4.3",
       "from": "espree@>=3.4.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.1.tgz"
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz"
     },
     "esprima": {
       "version": "3.1.3",
@@ -405,9 +405,9 @@
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"
     },
     "ignore": {
-      "version": "3.2.7",
+      "version": "3.3.0",
       "from": "ignore@>=3.2.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz"
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.0.tgz"
     },
     "imurmurhash": {
       "version": "0.1.4",
@@ -435,9 +435,9 @@
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"
     },
     "interpret": {
-      "version": "1.0.2",
+      "version": "1.0.3",
       "from": "interpret@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz"
     },
     "is-callable": {
       "version": "1.1.3",
@@ -525,9 +525,9 @@
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"
     },
     "jsx-ast-utils": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "from": "jsx-ast-utils@>=1.3.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.0.tgz"
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz"
     },
     "levn": {
       "version": "0.3.0",
@@ -540,9 +540,9 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
     },
     "minimatch": {
-      "version": "3.0.3",
+      "version": "3.0.4",
       "from": "minimatch@>=3.0.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
     },
     "minimist": {
       "version": "0.0.8",
@@ -555,9 +555,9 @@
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
     },
     "ms": {
-      "version": "0.7.2",
+      "version": "0.7.3",
-      "from": "ms@0.7.2",
+      "from": "ms@0.7.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz"
     },
     "mute-stream": {
       "version": "0.0.5",
@@ -680,9 +680,9 @@
       "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"
     },
     "resolve": {
-      "version": "1.3.2",
+      "version": "1.3.3",
       "from": "resolve@>=1.1.6 <2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz"
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"
     },
     "resolve-from": {
       "version": "1.0.1",

package.json

@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "dependencies": {
     "eslint": "3.19.0",
-    "eslint-plugin-html": "1.5.2",
+    "eslint-plugin-html": "2.0.3",
     "eslint-plugin-react": "6.10.3",
     "escope": "^3.6.0",
     "espree": "^3.4.0",

security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html

@@ -21,7 +21,7 @@
     window.location = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs";
     window.setTimeout(function() {
       isSecurityState("insecure", "location.href doesn't effect the security state");
-      is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content");
+      is(document.body.innerHTML, "This is an unsecure page!\n", "Document has not changed content");
       finish();
     }, 1000);
   }
@@ -29,7 +29,7 @@
   function afterNavigationTest()
   {
     isSecurityState("insecure", "still not secure after navigation");
-    is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content");
+    is(document.body.innerHTML, "This is an unsecure page!\n", "Document has not changed content");
     finish();
   }
 

security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html

@@ -31,7 +31,7 @@
 
   function afterNavigationTest()
   {
-    is(document.getElementById("buddy").innerHTML, "", "innerHTML back to previous");
+    is(document.getElementById("buddy").innerHTML, "\n", "innerHTML back to previous");
     isSecurityState("secure");
     finish();
   }

security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html

@@ -29,7 +29,7 @@
 
   function afterNavigationTest()
   {
-    is(document.getElementById("buddy").innerHTML, "", "innerHTML back to previous");
+    is(document.getElementById("buddy").innerHTML, "\n", "innerHTML back to previous");
     isSecurityState("secure");
     finish();
   }

tools/lint/eslint/manifest.tt

@@ -1,8 +1,8 @@
 [
   {
-    "size": 3009784,
+    "size": 3020742,
     "visibility": "public",
-    "digest": "4819d3b7faf0f6bbbbf213246e7a5158f27fcaae9bd352f18d3476775931b1daca1bc4e20c589b3e8559d01e5022a4fd3708a96f2e480e354a4f9b247eab1ba6",
+    "digest": "ff65beda308192c9831a9c290182a5a314da3f4783f0e473ad4aa23f073773fee0b4b51ff39dbd6c3d4d88cd3aac5c0c6ee5ad91d0cf8c6facbf12a6505b8746",
     "algorithm": "sha512",
     "filename": "eslint.tar.gz"
   }