diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index dd4c7e397cf7ae53bd1300b86817cfe56f0537cf..336a177364cd721b5d33221f0a2471c493abee10 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -17,6 +17,18 @@
"from": "acorn@>=1.0.3 <2.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
},
+ "acorn-jsx": {
+ "version": "3.0.1",
+ "from": "acorn-jsx@>=3.0.0 <4.0.0",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+ "dependencies": {
+ "acorn": {
+ "version": "3.1.0",
+ "from": "acorn@^3.0.4",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.1.0.tgz"
+ }
+ }
+ },
"acorn-to-esprima": {
"version": "1.0.7",
"from": "acorn-to-esprima@>=1.0.5 <2.0.0",
@@ -700,19 +712,14 @@
"resolved": "https://registry.npmjs.org/diff/-/diff-2.2.2.tgz"
},
"doctrine": {
- "version": "0.7.2",
- "from": "doctrine@>=0.7.1 <0.8.0",
- "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
+ "version": "1.2.2",
+ "from": "doctrine@>=1.1.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.2.2.tgz",
"dependencies": {
"esutils": {
"version": "1.1.6",
"from": "esutils@>=1.1.6 <2.0.0",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz"
- },
- "isarray": {
- "version": "0.0.1",
- "from": "isarray@0.0.1",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
}
}
},
@@ -824,19 +831,24 @@
"resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
},
"eslint": {
- "version": "1.10.3",
- "from": "eslint@1.10.3",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.3.tgz",
+ "version": "2.0.0",
+ "from": "eslint@2.0.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.0.0.tgz",
"dependencies": {
"argparse": {
"version": "1.0.7",
"from": "argparse@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz"
},
- "espree": {
- "version": "2.2.5",
- "from": "espree@>=2.2.4 <3.0.0",
- "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz"
+ "esprima": {
+ "version": "2.7.2",
+ "from": "esprima@>=2.6.0 <3.0.0",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz"
+ },
+ "glob": {
+ "version": "6.0.4",
+ "from": "glob@>=6.0.4 <7.0.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
},
"globals": {
"version": "8.18.0",
@@ -844,21 +856,14 @@
"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",
- "dependencies": {
- "esprima": {
- "version": "2.7.2",
- "from": "esprima@>=2.6.0 <3.0.0",
- "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz"
- }
- }
+ "version": "3.6.1",
+ "from": "js-yaml@>=3.5.1 <4.0.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"
},
- "minimatch": {
- "version": "3.0.0",
- "from": "minimatch@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
+ "lodash": {
+ "version": "4.13.1",
+ "from": "lodash@>=4.0.0 <5.0.0",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
},
"shelljs": {
"version": "0.5.3",
@@ -872,6 +877,18 @@
}
}
},
+ "espree": {
+ "version": "3.1.5",
+ "from": "espree@>=3.0.0 <4.0.0",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.5.tgz",
+ "dependencies": {
+ "acorn": {
+ "version": "3.1.0",
+ "from": "acorn@>=3.1.0 <4.0.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.1.0.tgz"
+ }
+ }
+ },
"esprima-fb": {
"version": "15001.1001.0-dev-harmony-fb",
"from": "esprima-fb@>=15001.1001.0-dev-harmony-fb <15001.1002.0",
@@ -977,9 +994,9 @@
"resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
},
"fast-levenshtein": {
- "version": "1.0.7",
- "from": "fast-levenshtein@>=1.0.6 <1.1.0",
- "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"
+ "version": "1.1.3",
+ "from": "fast-levenshtein@>=1.1.0 <2.0.0",
+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.3.tgz"
},
"faye-websocket": {
"version": "0.10.0",
@@ -1539,23 +1556,6 @@
"from": "gzip-size@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz"
},
- "handlebars": {
- "version": "4.0.5",
- "from": "handlebars@>=4.0.0 <5.0.0",
- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz",
- "dependencies": {
- "async": {
- "version": "1.5.2",
- "from": "async@>=1.4.0 <2.0.0",
- "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
- },
- "source-map": {
- "version": "0.4.4",
- "from": "source-map@>=0.4.4 <0.5.0",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
- }
- }
- },
"har-validator": {
"version": "2.0.6",
"from": "har-validator@>=2.0.2 <2.1.0",
@@ -1653,6 +1653,11 @@
"from": "iconv-lite@>=0.4.5 <0.5.0",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
},
+ "ignore": {
+ "version": "2.2.19",
+ "from": "ignore@>=2.2.19 <3.0.0",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-2.2.19.tgz"
+ },
"in-publish": {
"version": "2.0.0",
"from": "in-publish@>=2.0.0 <3.0.0",
@@ -1960,9 +1965,9 @@
"resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"
},
"levn": {
- "version": "0.2.5",
- "from": "levn@>=0.2.5 <0.3.0",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"
+ "version": "0.3.0",
+ "from": "levn@>=0.3.0 <0.4.0",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
},
"livereload-js": {
"version": "2.2.2",
@@ -1984,41 +1989,16 @@
"from": "lodash@>=3.10.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
},
- "lodash._arraycopy": {
- "version": "3.0.0",
- "from": "lodash._arraycopy@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz"
- },
- "lodash._arrayeach": {
- "version": "3.0.0",
- "from": "lodash._arrayeach@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz"
- },
- "lodash._arraymap": {
- "version": "3.0.0",
- "from": "lodash._arraymap@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz"
- },
"lodash._baseassign": {
"version": "3.2.0",
"from": "lodash._baseassign@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"
},
- "lodash._baseclone": {
- "version": "3.3.0",
- "from": "lodash._baseclone@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz"
- },
"lodash._basecopy": {
"version": "3.0.1",
"from": "lodash._basecopy@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
},
- "lodash._basedifference": {
- "version": "3.0.3",
- "from": "lodash._basedifference@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz"
- },
"lodash._baseflatten": {
"version": "3.1.4",
"from": "lodash._baseflatten@>=3.0.0 <4.0.0",
@@ -2029,11 +2009,6 @@
"from": "lodash._basefor@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz"
},
- "lodash._baseindexof": {
- "version": "3.1.0",
- "from": "lodash._baseindexof@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz"
- },
"lodash._baseslice": {
"version": "4.0.0",
"from": "lodash._baseslice@>=4.0.0 <4.1.0",
@@ -2049,21 +2024,11 @@
"from": "lodash._bindcallback@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"
},
- "lodash._cacheindexof": {
- "version": "3.0.2",
- "from": "lodash._cacheindexof@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz"
- },
"lodash._createassigner": {
"version": "3.1.1",
"from": "lodash._createassigner@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"
},
- "lodash._createcache": {
- "version": "3.1.2",
- "from": "lodash._createcache@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz"
- },
"lodash._getnative": {
"version": "3.9.1",
"from": "lodash._getnative@>=3.0.0 <4.0.0",
@@ -2089,11 +2054,6 @@
"from": "lodash.assign@>=3.2.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"
},
- "lodash.clonedeep": {
- "version": "3.0.2",
- "from": "lodash.clonedeep@>=3.0.1 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz"
- },
"lodash.isarguments": {
"version": "3.0.8",
"from": "lodash.isarguments@>=3.0.0 <4.0.0",
@@ -2104,16 +2064,6 @@
"from": "lodash.isarray@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
},
- "lodash.isplainobject": {
- "version": "3.2.0",
- "from": "lodash.isplainobject@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz"
- },
- "lodash.istypedarray": {
- "version": "3.0.6",
- "from": "lodash.istypedarray@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz"
- },
"lodash.keys": {
"version": "3.1.2",
"from": "lodash.keys@>=3.0.0 <4.0.0",
@@ -2124,16 +2074,6 @@
"from": "lodash.keysin@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz"
},
- "lodash.merge": {
- "version": "3.3.2",
- "from": "lodash.merge@>=3.3.2 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz"
- },
- "lodash.omit": {
- "version": "3.1.0",
- "from": "lodash.omit@>=3.1.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz"
- },
"lodash.pad": {
"version": "4.4.0",
"from": "lodash.pad@>=4.1.0 <5.0.0",
@@ -2159,11 +2099,6 @@
"from": "lodash.restparam@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
},
- "lodash.toplainobject": {
- "version": "3.0.0",
- "from": "lodash.toplainobject@>=3.0.0 <4.0.0",
- "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz"
- },
"lodash.tostring": {
"version": "4.1.3",
"from": "lodash.tostring@>=4.0.0 <5.0.0",
@@ -2448,23 +2383,18 @@
"from": "opn@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"
},
- "optimist": {
- "version": "0.6.1",
- "from": "optimist@>=0.6.1 <0.7.0",
- "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+ "optionator": {
+ "version": "0.8.1",
+ "from": "optionator@>=0.8.1 <0.9.0",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz",
"dependencies": {
- "minimist": {
- "version": "0.0.10",
- "from": "minimist@>=0.0.1 <0.1.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+ "wordwrap": {
+ "version": "1.0.0",
+ "from": "wordwrap@>=1.0.0 <1.1.0",
+ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
}
}
},
- "optionator": {
- "version": "0.6.0",
- "from": "optionator@>=0.6.0 <0.7.0",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.6.0.tgz"
- },
"os-homedir": {
"version": "1.0.1",
"from": "os-homedir@>=1.0.0 <2.0.0",
@@ -2592,6 +2522,11 @@
"from": "plur@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz"
},
+ "pluralize": {
+ "version": "1.2.1",
+ "from": "pluralize@>=1.2.1 <2.0.0",
+ "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"
+ },
"portscanner": {
"version": "1.0.0",
"from": "portscanner@>=1.0.0 <2.0.0",
@@ -3199,6 +3134,11 @@
"from": "slash@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
},
+ "slice-ansi": {
+ "version": "0.0.4",
+ "from": "slice-ansi@0.0.4",
+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"
+ },
"sntp": {
"version": "1.0.9",
"from": "sntp@>=1.0.0 <2.0.0",
@@ -3333,6 +3273,23 @@
"from": "supports-color@>=3.1.2 <4.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"
},
+ "table": {
+ "version": "3.7.8",
+ "from": "table@>=3.7.8 <4.0.0",
+ "resolved": "https://registry.npmjs.org/table/-/table-3.7.8.tgz",
+ "dependencies": {
+ "bluebird": {
+ "version": "3.4.0",
+ "from": "bluebird@>=3.1.1 <4.0.0",
+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.0.tgz"
+ },
+ "lodash": {
+ "version": "4.13.1",
+ "from": "lodash@^4.0.0",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
+ }
+ }
+ },
"tar": {
"version": "2.2.1",
"from": "tar@>=2.0.0 <3.0.0",
@@ -3440,6 +3397,11 @@
"from": "tunnel-agent@>=0.4.1 <0.5.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
},
+ "tv4": {
+ "version": "1.2.7",
+ "from": "tv4@>=1.2.7 <2.0.0",
+ "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz"
+ },
"tweetnacl": {
"version": "0.13.3",
"from": "tweetnacl@>=0.13.0 <0.14.0",
@@ -3623,16 +3585,16 @@
"from": "write@>=0.2.1 <0.3.0",
"resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz"
},
- "xml-escape": {
- "version": "1.0.0",
- "from": "xml-escape@>=1.0.0 <1.1.0",
- "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.0.0.tgz"
- },
"xmlbuilder": {
"version": "3.1.0",
"from": "xmlbuilder@>=3.1.0 <4.0.0",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz"
},
+ "xregexp": {
+ "version": "3.1.1",
+ "from": "xregexp@>=3.0.0 <4.0.0",
+ "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.1.1.tgz"
+ },
"xtend": {
"version": "4.0.1",
"from": "xtend@>=4.0.0 <5.0.0",
diff --git a/package.json b/package.json
index db64c2afe36496a135f204c4c80ec902fe890053..4676977c8ee484e8255e483c1d3b5f2b4e0cf238 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"devDependencies": {
"autoprefixer": "^6.0.3",
"babel-eslint": "^4.1.3",
- "eslint": "^1.10.3",
+ "eslint": "^2.0.0",
"grunt": "^0.4.5",
"grunt-babel": "^5.0.3",
"grunt-build-control": "^0.6.0",