From 0eb1f2ca267ffa73e32df6810f9ecf8ae012f7ee Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Tue, 21 Mar 2017 14:50:45 +0100 Subject: [PATCH] Bug 1349203 - Upgrade ESLint to version 3.18.0 to pick up performance and other fixes. Also update other dependencies for ESLint. r=mossop MozReview-Commit-ID: C1oB0pQ3fev --HG-- extra : rebase_source : 93e63db48f815e173b80611ae592806e4ef43fae --- .eslintignore | 4 - toolkit/modules/Preferences.jsm | 4 +- .../eslint/eslint-plugin-mozilla/package.json | 4 +- tools/lint/eslint/manifest.tt | 4 +- tools/lint/eslint/npm-shrinkwrap.json | 160 ++++++++++-------- tools/lint/eslint/package.json | 6 +- 6 files changed, 93 insertions(+), 89 deletions(-) diff --git a/.eslintignore b/.eslintignore index 59576d3e93cf..3ed9aa149d47 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,10 +1,6 @@ # Always ignore node_modules. **/node_modules/**/*.* -# Include these to speed up ESLint, see bug 1347906. -.hg -.git - # Exclude expected objdirs. obj*/** diff --git a/toolkit/modules/Preferences.jsm b/toolkit/modules/Preferences.jsm index 8aa33029750d..024d0a99ce96 100644 --- a/toolkit/modules/Preferences.jsm +++ b/toolkit/modules/Preferences.jsm @@ -115,9 +115,7 @@ Preferences._set = function(prefName, prefValue) { switch (prefType) { case "String": - { - this._prefBranch.setStringPref(prefName, prefValue); - } + this._prefBranch.setStringPref(prefName, prefValue); break; case "Number": diff --git a/tools/lint/eslint/eslint-plugin-mozilla/package.json b/tools/lint/eslint/eslint-plugin-mozilla/package.json index c93c184d2bc6..a466347313f6 100644 --- a/tools/lint/eslint/eslint-plugin-mozilla/package.json +++ b/tools/lint/eslint/eslint-plugin-mozilla/package.json @@ -21,11 +21,11 @@ "main": "lib/index.js", "dependencies": { "escope": "^3.6.0", - "espree": "^3.2.0", + "espree": "^3.4.0", "estraverse": "^4.2.0", "globals": "^9.14.0", "ini-parser": "^0.0.2", - "sax": "^1.1.4" + "sax": "^1.2.2" }, "engines": { "node": ">=6.9.1" diff --git a/tools/lint/eslint/manifest.tt b/tools/lint/eslint/manifest.tt index 7a08c3faea16..90533addbc30 100644 --- a/tools/lint/eslint/manifest.tt +++ b/tools/lint/eslint/manifest.tt @@ -1,8 +1,8 @@ [ { - "size": 2912397, + "size": 2828427, "visibility": "public", - "digest": "9eeeea0b924ea15998159734d2e8dcd2a7c85fca151c22d1f477a2dd1b3b47bb625b73857678ca7fecf39cd3cfd509313155f4da8a317d53d00d653fce2bc4ee", + "digest": "7419df6e059132577ec1fc8337a813656514fa229393bbbc25e33264f2ea204dd363c906a28d7778e388fc2abb30016174ff7513fd6075fdee0d9803a52b976d", "algorithm": "sha512", "filename": "eslint.tar.gz" } diff --git a/tools/lint/eslint/npm-shrinkwrap.json b/tools/lint/eslint/npm-shrinkwrap.json index 612180f8e7a7..cf8cba451181 100644 --- a/tools/lint/eslint/npm-shrinkwrap.json +++ b/tools/lint/eslint/npm-shrinkwrap.json @@ -3,7 +3,7 @@ "dependencies": { "acorn": { "version": "4.0.4", - "from": "acorn@>=4.0.1 <5.0.0", + "from": "acorn@4.0.4", "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz" }, "acorn-jsx": { @@ -19,14 +19,14 @@ } }, "ajv": { - "version": "4.10.3", + "version": "4.11.5", "from": "ajv@>=4.7.0 <5.0.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.10.3.tgz" + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz" }, "ajv-keywords": { - "version": "1.5.0", + "version": "1.5.1", "from": "ajv-keywords@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.0.tgz" + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz" }, "ansi-escapes": { "version": "1.4.0", @@ -34,9 +34,9 @@ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz" }, "ansi-regex": { - "version": "2.0.0", + "version": "2.1.1", "from": "ansi-regex@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz" + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz" }, "ansi-styles": { "version": "2.2.1", @@ -64,9 +64,9 @@ "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz" }, "babel-code-frame": { - "version": "6.20.0", + "version": "6.22.0", "from": "babel-code-frame@>=6.16.0 <7.0.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.20.0.tgz" + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz" }, "balanced-match": { "version": "0.4.2", @@ -130,7 +130,7 @@ }, "concat-stream": { "version": "1.6.0", - "from": "concat-stream@>=1.4.6 <2.0.0", + "from": "concat-stream@>=1.5.2 <2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz" }, "core-util-is": { @@ -139,14 +139,14 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" }, "d": { - "version": "0.1.1", - "from": "d@>=0.1.1 <0.2.0", - "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz" + "version": "1.0.0", + "from": "d@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz" }, "debug": { - "version": "2.6.0", + "version": "2.6.3", "from": "debug@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz" + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz" }, "deep-is": { "version": "0.1.3", @@ -159,9 +159,9 @@ "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz" }, "doctrine": { - "version": "1.5.0", - "from": "doctrine@>=1.2.2 <2.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz" + "version": "2.0.0", + "from": "doctrine@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz" }, "dom-serializer": { "version": "0.1.0", @@ -196,34 +196,34 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz" }, "es5-ext": { - "version": "0.10.12", - "from": "es5-ext@>=0.10.11 <0.11.0", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz" + "version": "0.10.15", + "from": "es5-ext@>=0.10.14 <0.11.0", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.15.tgz" }, "es6-iterator": { - "version": "2.0.0", - "from": "es6-iterator@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz" + "version": "2.0.1", + "from": "es6-iterator@>=2.0.1 <2.1.0", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz" }, "es6-map": { - "version": "0.1.4", + "version": "0.1.5", "from": "es6-map@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.4.tgz" + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz" }, "es6-set": { - "version": "0.1.4", - "from": "es6-set@>=0.1.3 <0.2.0", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz" + "version": "0.1.5", + "from": "es6-set@>=0.1.5 <0.2.0", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz" }, "es6-symbol": { - "version": "3.1.0", - "from": "es6-symbol@>=3.1.0 <3.2.0", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz" + "version": "3.1.1", + "from": "es6-symbol@>=3.1.1 <3.2.0", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz" }, "es6-weak-map": { - "version": "2.0.1", + "version": "2.0.2", "from": "es6-weak-map@>=2.0.1 <3.0.0", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz" + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz" }, "escape-string-regexp": { "version": "1.0.5", @@ -236,9 +236,9 @@ "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz" }, "eslint": { - "version": "3.12.2", - "from": "eslint@3.12.2", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.12.2.tgz" + "version": "3.18.0", + "from": "eslint@3.18.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz" }, "eslint-plugin-html": { "version": "1.5.2", @@ -251,14 +251,19 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-4.2.3.tgz" }, "espree": { - "version": "3.3.2", - "from": "espree@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz" + "version": "3.4.0", + "from": "espree@>=3.4.0 <4.0.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.0.tgz" }, "esprima": { - "version": "2.7.3", - "from": "esprima@>=2.6.0 <3.0.0", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz" + "version": "3.1.3", + "from": "esprima@>=3.1.1 <4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz" + }, + "esquery": { + "version": "1.0.0", + "from": "esquery@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz" }, "esrecurse": { "version": "4.1.0", @@ -283,9 +288,9 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz" }, "event-emitter": { - "version": "0.3.4", - "from": "event-emitter@>=0.3.4 <0.4.0", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz" + "version": "0.3.5", + "from": "event-emitter@>=0.3.5 <0.4.0", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz" }, "exit-hook": { "version": "1.1.1", @@ -333,9 +338,9 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz" }, "globals": { - "version": "9.14.0", + "version": "9.16.0", "from": "globals@>=9.14.0 <10.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz" + "resolved": "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz" }, "globby": { "version": "5.0.0", @@ -358,9 +363,9 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz" }, "ignore": { - "version": "3.2.0", + "version": "3.2.6", "from": "ignore@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.2.0.tgz" + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz" }, "imurmurhash": { "version": "0.1.4", @@ -398,9 +403,9 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" }, "is-my-json-valid": { - "version": "2.15.0", + "version": "2.16.0", "from": "is-my-json-valid@>=2.10.0 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz" + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz" }, "is-path-cwd": { "version": "1.0.0", @@ -433,14 +438,14 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" }, "js-tokens": { - "version": "2.0.0", - "from": "js-tokens@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz" + "version": "3.0.1", + "from": "js-tokens@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz" }, "js-yaml": { - "version": "3.7.0", + "version": "3.8.2", "from": "js-yaml@>=3.5.1 <4.0.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz" + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz" }, "json-stable-stringify": { "version": "1.0.1", @@ -463,9 +468,9 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz" }, "lodash": { - "version": "4.17.3", + "version": "4.17.4", "from": "lodash@>=4.0.0 <5.0.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.3.tgz" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" }, "minimatch": { "version": "3.0.3", @@ -503,9 +508,9 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz" }, "object-assign": { - "version": "4.1.0", + "version": "4.1.1", "from": "object-assign@>=4.0.1 <5.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz" + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" }, "once": { "version": "1.4.0", @@ -537,6 +542,11 @@ "from": "path-is-inside@>=1.0.1 <2.0.0", "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz" }, + "path-parse": { + "version": "1.0.5", + "from": "path-parse@>=1.0.5 <2.0.0", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz" + }, "pify": { "version": "2.3.0", "from": "pify@>=2.0.0 <3.0.0", @@ -573,9 +583,9 @@ "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz" }, "readable-stream": { - "version": "2.2.2", + "version": "2.2.6", "from": "readable-stream@>=2.2.2 <3.0.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz" + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz" }, "readline2": { "version": "1.0.1", @@ -593,9 +603,9 @@ "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz" }, "resolve": { - "version": "1.2.0", + "version": "1.3.2", "from": "resolve@>=1.1.6 <2.0.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz" + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz" }, "resolve-from": { "version": "1.0.1", @@ -608,9 +618,9 @@ "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz" }, "rimraf": { - "version": "2.5.4", + "version": "2.6.1", "from": "rimraf@>=2.2.8 <3.0.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz" + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz" }, "run-async": { "version": "0.1.0", @@ -623,14 +633,14 @@ "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz" }, "sax": { - "version": "1.2.1", - "from": "sax@>=1.1.4 <2.0.0", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz" + "version": "1.2.2", + "from": "sax@>=1.2.2 <2.0.0", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz" }, "shelljs": { - "version": "0.7.5", + "version": "0.7.7", "from": "shelljs@>=0.7.5 <0.8.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.5.tgz" + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz" }, "slice-ansi": { "version": "0.0.4", @@ -663,9 +673,9 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" }, "strip-json-comments": { - "version": "1.0.4", - "from": "strip-json-comments@>=1.0.1 <1.1.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" + "version": "2.0.1", + "from": "strip-json-comments@>=2.0.1 <2.1.0", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" }, "supports-color": { "version": "2.0.0", diff --git a/tools/lint/eslint/package.json b/tools/lint/eslint/package.json index f100effaaf41..c87a8ed55ad3 100644 --- a/tools/lint/eslint/package.json +++ b/tools/lint/eslint/package.json @@ -4,13 +4,13 @@ "repository": {}, "license": "MPL-2.0", "dependencies": { - "eslint": "3.12.2", + "eslint": "3.18.0", "eslint-plugin-html": "1.5.2", "eslint-plugin-react": "4.2.3", "escope": "^3.6.0", - "espree": "^3.2.0", + "espree": "^3.4.0", "estraverse": "^4.2.0", "ini-parser": "^0.0.2", - "sax": "^1.1.4" + "sax": "^1.2.2" } }