From 324cbb2280cba8681395ed9f2b76c0ccdbf77c8d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 May 2016 23:38:10 -0700 Subject: [PATCH 1/2] Upgrade ESlint to v1.7.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable new rules: * no-empty-pattern * no-magic-numbers (exempting 0 and ±1) Refs #19908 [skip sauce] [skip validator] --- js/.eslintrc | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/js/.eslintrc b/js/.eslintrc index e712f32474..813cd29a36 100644 --- a/js/.eslintrc +++ b/js/.eslintrc @@ -21,6 +21,7 @@ "no-duplicate-case": 2, "no-empty": 2, "no-empty-character-class": 2, + "no-empty-pattern": 2, "no-ex-assign": 2, "no-extra-boolean-cast": 2, "no-extra-parens": 0, @@ -29,6 +30,7 @@ "no-inner-declarations": 2, "no-invalid-regexp": 2, "no-irregular-whitespace": 2, + "no-magic-numbers": [2, {"ignore": [-1, 0, 1]}], "no-negated-in-lhs": 2, "no-obj-calls": 2, "no-regex-spaces": 2, diff --git a/package.json b/package.json index f4c96bb7bf..c7d0d9538e 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "autoprefixer": "^6.0.3", "babel-eslint": "^4.1.3", - "eslint": "^1.5.1", + "eslint": "^1.7.3", "grunt": "^0.4.5", "grunt-babel": "^5.0.3", "grunt-build-control": "^0.6.0", From 412481ba1422ef47d348c1624e8208e3c8aaea3c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 May 2016 23:43:28 -0700 Subject: [PATCH 2/2] Update shrinkwrap --- grunt/npm-shrinkwrap.json | 120 ++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 64 deletions(-) diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json index c5c212f107..97020d368d 100644 --- a/grunt/npm-shrinkwrap.json +++ b/grunt/npm-shrinkwrap.json @@ -42,11 +42,6 @@ "from": "ansi@>=0.3.1 <0.4.0", "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz" }, - "ansi-escapes": { - "version": "1.4.0", - "from": "ansi-escapes@>=1.1.0 <2.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz" - }, "ansi-regex": { "version": "2.0.0", "from": "ansi-regex@>=2.0.0 <3.0.0", @@ -431,11 +426,6 @@ } } }, - "cli-cursor": { - "version": "1.0.2", - "from": "cli-cursor@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz" - }, "cli-table": { "version": "0.3.1", "from": "cli-table@>=0.3.1 <0.4.0", @@ -458,11 +448,6 @@ "from": "cliui@>=2.1.0 <3.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz" }, - "code-point-at": { - "version": "1.0.0", - "from": "code-point-at@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz" - }, "coffee-script": { "version": "1.3.3", "from": "coffee-script@>=1.3.3 <1.4.0", @@ -824,9 +809,9 @@ "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz" }, "eslint": { - "version": "1.10.3", - "from": "eslint@>=1.5.1 <2.0.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.3.tgz", + "version": "1.7.3", + "from": "eslint@1.7.3", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.7.3.tgz", "dependencies": { "argparse": { "version": "1.0.7", @@ -838,15 +823,20 @@ "from": "espree@>=2.2.4 <3.0.0", "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz" }, + "get-stdin": { + "version": "3.0.2", + "from": "get-stdin@>=3.0.0 <4.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz" + }, "globals": { "version": "8.18.0", "from": "globals@>=8.11.0 <9.0.0", "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz" }, "js-yaml": { - "version": "3.4.5", - "from": "js-yaml@3.4.5", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.5.tgz", + "version": "3.6.1", + "from": "js-yaml@>=3.2.5 <4.0.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz", "dependencies": { "esprima": { "version": "2.7.2", @@ -855,20 +845,25 @@ } } }, - "minimatch": { - "version": "3.0.0", - "from": "minimatch@>=3.0.0 <4.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz" + "object-assign": { + "version": "2.1.1", + "from": "object-assign@>=2.0.0 <3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz" }, "shelljs": { - "version": "0.5.3", - "from": "shelljs@>=0.5.3 <0.6.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz" + "version": "0.3.0", + "from": "shelljs@>=0.3.0 <0.4.0", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz" }, - "user-home": { - "version": "2.0.0", - "from": "user-home@>=2.0.0 <3.0.0", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz" + "to-double-quotes": { + "version": "1.0.2", + "from": "to-double-quotes@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/to-double-quotes/-/to-double-quotes-1.0.2.tgz" + }, + "to-single-quotes": { + "version": "1.0.4", + "from": "to-single-quotes@>=1.0.3 <2.0.0", + "resolved": "https://registry.npmjs.org/to-single-quotes/-/to-single-quotes-1.0.4.tgz" } } }, @@ -924,11 +919,6 @@ "from": "exit@>=0.1.1 <0.2.0", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz" }, - "exit-hook": { - "version": "1.1.1", - "from": "exit-hook@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz" - }, "extend": { "version": "3.0.0", "from": "extend@>=3.0.0 <3.1.0", @@ -1686,9 +1676,9 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "inquirer": { - "version": "0.11.4", - "from": "inquirer@>=0.11.0 <0.12.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz" + "version": "0.9.0", + "from": "inquirer@>=0.9.0 <0.10.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.9.0.tgz" }, "invert-kv": { "version": "1.0.0", @@ -1715,11 +1705,6 @@ "from": "is-finite@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz" }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz" - }, "is-integer": { "version": "1.0.6", "from": "is-integer@>=1.0.4 <2.0.0", @@ -2461,9 +2446,9 @@ } }, "optionator": { - "version": "0.6.0", - "from": "optionator@>=0.6.0 <0.7.0", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.6.0.tgz" + "version": "0.5.0", + "from": "optionator@>=0.5.0 <0.6.0", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz" }, "os-homedir": { "version": "1.0.1", @@ -2707,9 +2692,26 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz" }, "readline2": { - "version": "1.0.1", - "from": "readline2@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz" + "version": "0.1.1", + "from": "readline2@>=0.1.1 <0.2.0", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz", + "dependencies": { + "ansi-regex": { + "version": "1.1.1", + "from": "ansi-regex@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" + }, + "mute-stream": { + "version": "0.0.4", + "from": "mute-stream@0.0.4", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz" + }, + "strip-ansi": { + "version": "2.0.1", + "from": "strip-ansi@>=2.0.1 <3.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz" + } + } }, "recast": { "version": "0.10.33", @@ -2934,11 +2936,6 @@ "from": "resolve-pkg@>=0.1.0 <0.2.0", "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-0.1.0.tgz" }, - "restore-cursor": { - "version": "1.0.1", - "from": "restore-cursor@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz" - }, "revalidator": { "version": "0.1.8", "from": "revalidator@>=0.1.0 <0.2.0", @@ -2960,9 +2957,9 @@ "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz" }, "rx-lite": { - "version": "3.1.2", - "from": "rx-lite@>=3.1.2 <4.0.0", - "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz" + "version": "2.5.2", + "from": "rx-lite@>=2.5.2 <3.0.0", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-2.5.2.tgz" }, "sass-graph": { "version": "2.1.1", @@ -3288,11 +3285,6 @@ "from": "string_decoder@>=0.10.0 <0.11.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" }, - "string-width": { - "version": "1.0.1", - "from": "string-width@>=1.0.1 <2.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz" - }, "stringmap": { "version": "0.2.2", "from": "stringmap@>=0.2.2 <0.3.0",