diff --git a/.eslintrc.json b/.eslintrc.json
index 2554637b..2cf247b3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-    "extends": "eslint-config-edx",
+    "extends": "eslint-config-edx-es5",
     "globals": {
         "setFixtures": true  // added globally by jasmine-jquery (bad)
     }
diff --git a/gulp/tasks/doc.js b/gulp/tasks/doc.js
index 57beaf7a..3102e058 100644
--- a/gulp/tasks/doc.js
+++ b/gulp/tasks/doc.js
@@ -31,7 +31,7 @@ renameAsMarkdown = function(path) {
 generateDocFor = function(options) {
     var i, sources,
         sourceLength = options.sources.length;
-    for (i = 0; i < sourceLength; i++) {
+    for (i = 0; i < sourceLength; i += 1) {
         sources = options.sources[i];
         console.log('Generating documentation for ' + sources);
         gulp.src(sources, {buffer: false})
diff --git a/package.json b/package.json
index 89cc9def..3b205d4b 100644
--- a/package.json
+++ b/package.json
@@ -35,8 +35,9 @@
     "css-loader": "~0.23.1",
     "del": "~2.2.0",
     "edx-pattern-library": "~0.12.5",
-    "eslint": "~2.13.1",
-    "eslint-config-edx": "~1.2.1",
+    "eslint": "^3.16.0",
+    "eslint-config-edx": "^2.0.0",
+    "eslint-config-edx-es5": "^3.0.0",
     "extract-text-webpack-plugin": "^2.1.0",
     "gulp": "~3.9.1",
     "gulp-coveralls": "~0.1.4",
diff --git a/src/js/breadcrumbs/breadcrumbs-view.js b/src/js/breadcrumbs/breadcrumbs-view.js
index 57c159ba..0c5e72ed 100644
--- a/src/js/breadcrumbs/breadcrumbs-view.js
+++ b/src/js/breadcrumbs/breadcrumbs-view.js
@@ -21,6 +21,7 @@
  */
 (function(define) {
     'use strict';
+
     define(['backbone', 'edx-ui-toolkit/js/utils/html-utils', 'text!./breadcrumbs.underscore'],
         function(Backbone, HtmlUtils, breadcrumbsTemplate) {
             var BreadcrumbsView = Backbone.View.extend({
diff --git a/src/js/dropdown-menu/dropdown-menu-view.js b/src/js/dropdown-menu/dropdown-menu-view.js
index f5d053f6..69d0729f 100644
--- a/src/js/dropdown-menu/dropdown-menu-view.js
+++ b/src/js/dropdown-menu/dropdown-menu-view.js
@@ -35,6 +35,7 @@
  */
 (function(define) {
     'use strict';
+
     define([
         'backbone',
         'jquery',
@@ -172,7 +173,7 @@
                     if (_.contains(this.keyForward, key)) {
                         this.focusFirstItem();
                         // if up arrow or left arrow key pressed or shift+tab
-                    } else if (_.contains(this.keyBack, key) || key === constants.keyCodes.tab && event.shiftKey) {
+                    } else if (_.contains(this.keyBack, key) || (key === constants.keyCodes.tab && event.shiftKey)) {
                         event.preventDefault();
                         this.focusLastItem();
                     }
diff --git a/src/js/dropdown-menu/specs/dropdown-menu-view-spec.js b/src/js/dropdown-menu/specs/dropdown-menu-view-spec.js
index 34c033a9..44a736fd 100644
--- a/src/js/dropdown-menu/specs/dropdown-menu-view-spec.js
+++ b/src/js/dropdown-menu/specs/dropdown-menu-view-spec.js
@@ -36,7 +36,7 @@ define([
 
                     expect($(document.activeElement)).not.toHaveClass('js-dropdown-button');
 
-                    for (i = 0; i < listLength; i++) {
+                    for (i = 0; i < listLength; i += 1) {
                         singleKeyDown(key);
                     }
                 }, timeoutInt);
diff --git a/src/js/pagination/paging-collection.js b/src/js/pagination/paging-collection.js
index 280d54d4..3849f544 100644
--- a/src/js/pagination/paging-collection.js
+++ b/src/js/pagination/paging-collection.js
@@ -27,6 +27,7 @@
  */
 (function(define) {
     'use strict';
+
     define(['jquery', 'underscore', 'backbone.paginator'], function($, _, PageableCollection) {
         var PagingCollection = PageableCollection.extend({
             mode: 'server',
diff --git a/src/js/pagination/specs/paging-collection-spec.js b/src/js/pagination/specs/paging-collection-spec.js
index 0e726d05..542f85eb 100644
--- a/src/js/pagination/specs/paging-collection-spec.js
+++ b/src/js/pagination/specs/paging-collection-spec.js
@@ -1,11 +1,11 @@
 define(['jquery',
-        'backbone',
-        'underscore',
-        'URI',
-        '../paging-collection.js',
-        '../../utils/spec-helpers/ajax-helpers.js',
-        '../../utils/spec-helpers/spec-helpers.js'
-    ],
+    'backbone',
+    'underscore',
+    'URI',
+    '../paging-collection.js',
+    '../../utils/spec-helpers/ajax-helpers.js',
+    '../../utils/spec-helpers/spec-helpers.js'
+],
     function($, Backbone, _, URI, PagingCollection, AjaxHelpers, SpecHelpers) {
         'use strict';
 
diff --git a/src/js/utils/constants.js b/src/js/utils/constants.js
index 825b0181..d9928f76 100644
--- a/src/js/utils/constants.js
+++ b/src/js/utils/constants.js
@@ -3,6 +3,7 @@
  */
 (function(define) {
     'use strict';
+
     define([], function() {
         /**
          * Reusable constants.
diff --git a/src/js/utils/date-utils.js b/src/js/utils/date-utils.js
index abaa3ee5..18300fb2 100644
--- a/src/js/utils/date-utils.js
+++ b/src/js/utils/date-utils.js
@@ -27,6 +27,7 @@
 
 (function(define) {
     'use strict';
+
     define([
         'jquery',
         'moment',
diff --git a/src/js/utils/global-loader.js b/src/js/utils/global-loader.js
index 71cf0279..f8f0e9e4 100644
--- a/src/js/utils/global-loader.js
+++ b/src/js/utils/global-loader.js
@@ -53,7 +53,7 @@
                         requiredModule,
                         module,
                         i;
-                    for (i = 0; i < pathCount; i++) {
+                    for (i = 0; i < pathCount; i += 1) {
                         requiredModule = registeredModules[requiredPaths[i]];
                         requiredModules.push(requiredModule);
                     }
diff --git a/src/js/utils/html-utils.js b/src/js/utils/html-utils.js
index d8cb1ada..0493d3ca 100644
--- a/src/js/utils/html-utils.js
+++ b/src/js/utils/html-utils.js
@@ -12,6 +12,7 @@
  */
 (function(define) {
     'use strict';
+
     define(['underscore', 'jquery', 'edx-ui-toolkit/js/utils/string-utils'], function(_, $, StringUtils) {
         var HtmlUtils, ensureHtml, interpolateHtml, joinHtml, HTML, template, setHtml, append, prepend;
 
@@ -137,7 +138,7 @@
             var html = '',
                 argumentCount = arguments.length,
                 i;
-            for (i = 0; i < argumentCount; i++) {
+            for (i = 0; i < argumentCount; i += 1) {
                 html += ensureHtml(arguments[i]);
             }
             return HTML(html);
diff --git a/src/js/utils/spec-helpers/ajax-helpers.js b/src/js/utils/spec-helpers/ajax-helpers.js
index 1c1e5b62..fab4d543 100644
--- a/src/js/utils/spec-helpers/ajax-helpers.js
+++ b/src/js/utils/spec-helpers/ajax-helpers.js
@@ -65,7 +65,7 @@ define(['sinon', 'underscore', 'URI'], function(sinon, _, URI) {
 
         requests.currentIndex = 0;
         requests.restore = function() {
-            if (xhr && xhr.hasOwnProperty('restore')) {
+            if (xhr && 'restore' in xhr) {
                 xhr.restore();
             }
         };
@@ -208,7 +208,7 @@ define(['sinon', 'underscore', 'URI'], function(sinon, _, URI) {
         var request = currentRequest(requests);
         expect(request.readyState).toEqual(XHR_READY_STATES.UNSENT);
         // Our ESLint config bans mutating params, but fixing this would require breaking AjaxHelpers API
-        requests.currentIndex++;  // eslint-disable-line no-param-reassign
+        requests.currentIndex += 1;  // eslint-disable-line no-param-reassign
     };
 
     /**
@@ -230,7 +230,7 @@ define(['sinon', 'underscore', 'URI'], function(sinon, _, URI) {
             {'Content-Type': contentType},
             contentType === 'application/json' ? JSON.stringify(body || {}) : body
         );
-        requests.currentIndex++;  // eslint-disable-line no-param-reassign
+        requests.currentIndex += 1;  // eslint-disable-line no-param-reassign
     };
 
     /**
diff --git a/src/js/utils/specs/ajax-helpers-spec.js b/src/js/utils/specs/ajax-helpers-spec.js
index 090d3e52..89e588fb 100644
--- a/src/js/utils/specs/ajax-helpers-spec.js
+++ b/src/js/utils/specs/ajax-helpers-spec.js
@@ -34,7 +34,7 @@ define(
                     $.ajax(testUrl);
 
                     expect(requests instanceof Array).toBeTruthy();
-                    expect(requests.hasOwnProperty('currentIndex')).toBeTruthy();
+                    expect('currentIndex' in requests).toBeTruthy();
                     AjaxHelpers.expectRequest(requests, 'GET', testUrl);
                 });
             });
diff --git a/src/js/utils/string-utils.js b/src/js/utils/string-utils.js
index 6e23e536..a81b66f7 100644
--- a/src/js/utils/string-utils.js
+++ b/src/js/utils/string-utils.js
@@ -5,6 +5,7 @@
  */
 (function(define) {
     'use strict';
+
     define([], function() {
         var interpolate;
 
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 9b406a3a..301dd292 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -85,7 +85,8 @@ module.exports = function(config, overrideOptions) {
         reporters: options.reporters,
 
         coverageReporter: {
-            dir: 'build', subdir: 'coverage-js',
+            dir: 'build',
+            subdir: 'coverage-js',
             reporters: [
                 {type: 'html', subdir: 'coverage-js/html'},
                 {type: 'cobertura', file: 'coverage.xml'},
diff --git a/test/require-config.js b/test/require-config.js
index deb5dc2e..0b45f632 100644
--- a/test/require-config.js
+++ b/test/require-config.js
@@ -32,6 +32,7 @@ require.config({
             exports: 'Backbone',
             init: function(_, $) {
                 'use strict';
+
                 var Backbone;
                 Backbone.$ = $;
                 return Backbone;
diff --git a/yarn.lock b/yarn.lock
index 12ef8275..130912da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -290,6 +290,14 @@ aws4@^1.2.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
+babel-code-frame@^6.16.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
+  dependencies:
+    chalk "^1.1.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
 backbone.paginator@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/backbone.paginator/-/backbone.paginator-2.0.5.tgz#4fdfa8263203c7eee27aab696019d329cd7f006d"
@@ -806,7 +814,7 @@ chainsaw@~0.1.0:
   dependencies:
     traverse ">=0.3.0 <0.4"
 
-chalk@*, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@*, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1043,7 +1051,7 @@ concat-stream@1.5.0:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@^1.4.6:
+concat-stream@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
@@ -1362,18 +1370,12 @@ debug@2.3.3:
   dependencies:
     ms "0.7.2"
 
-debug@2.6.1:
+debug@2.6.1, debug@^2.1.1, debug@^2.2.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
   dependencies:
     ms "0.7.2"
 
-debug@^2.1.1, debug@^2.2.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
-  dependencies:
-    ms "0.7.2"
-
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -1477,16 +1479,16 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@1.3.x:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.3.0.tgz#13e75682b55518424276f7c173783456ef913d26"
+doctrine@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^1.2.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
@@ -1748,7 +1750,7 @@ es6-promise@~4.0.3:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42"
 
-es6-set@^0.1.4, es6-set@~0.1.5:
+es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
   dependencies:
@@ -1818,18 +1820,27 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-airbnb-base@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-3.0.1.tgz#b777e01f65e946933442b499fc8518aa251a6530"
+eslint-config-airbnb-base@^11.1.0:
+  version "11.1.3"
+  resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.1.3.tgz#0e8db71514fa36b977fbcf977c01edcf863e0cf0"
 
-eslint-config-edx@~1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-edx/-/eslint-config-edx-1.2.1.tgz#58dbe5e2b4d06491348d44b67978370af50da85c"
+eslint-config-edx-es5@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-edx-es5/-/eslint-config-edx-es5-3.0.0.tgz#6b6105148406c757089150ea29523a3011be0aba"
+  dependencies:
+    eslint "^3.16.0"
+    eslint-config-airbnb-base "^11.1.0"
+    eslint-plugin-dollar-sign "1.0.0"
+    eslint-plugin-import "^2.2.0"
+
+eslint-config-edx@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-edx/-/eslint-config-edx-2.0.1.tgz#50fdcd29ee43bd131574c3099d2489fd7d1fc726"
   dependencies:
-    eslint "^2.13.1"
-    eslint-config-airbnb-base "^3.0.1"
-    eslint-plugin-dollar-sign "0.0.5"
-    eslint-plugin-import "^1.9.2"
+    eslint "^3.16.0"
+    eslint-config-airbnb-base "^11.1.0"
+    eslint-plugin-dollar-sign "1.0.0"
+    eslint-plugin-import "^2.2.0"
 
 eslint-import-resolver-node@^0.2.0:
   version "0.2.3"
@@ -1839,48 +1850,50 @@ eslint-import-resolver-node@^0.2.0:
     object-assign "^4.0.1"
     resolve "^1.1.6"
 
-eslint-plugin-dollar-sign@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-dollar-sign/-/eslint-plugin-dollar-sign-0.0.5.tgz#efbc799bd6110484591332f501650c2ae03d4fee"
+eslint-module-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
+  dependencies:
+    debug "2.2.0"
+    pkg-dir "^1.0.0"
+
+eslint-plugin-dollar-sign@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-dollar-sign/-/eslint-plugin-dollar-sign-1.0.0.tgz#afba50459e9de97a5fcd7763279e4c3a9e25b5ac"
 
-eslint-plugin-import@^1.9.2:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-1.16.0.tgz#b2fa07ebcc53504d0f2a4477582ec8bff1871b9f"
+eslint-plugin-import@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.2.0.tgz#72ba306fad305d67c4816348a4699a4229ac8b4e"
   dependencies:
     builtin-modules "^1.1.1"
     contains-path "^0.1.0"
     debug "^2.2.0"
-    doctrine "1.3.x"
-    es6-map "^0.1.3"
-    es6-set "^0.1.4"
+    doctrine "1.5.0"
     eslint-import-resolver-node "^0.2.0"
+    eslint-module-utils "^2.0.0"
     has "^1.0.1"
     lodash.cond "^4.3.0"
-    lodash.endswith "^4.0.1"
-    lodash.find "^4.3.0"
-    lodash.findindex "^4.3.0"
     minimatch "^3.0.3"
-    object-assign "^4.0.1"
-    pkg-dir "^1.0.0"
     pkg-up "^1.0.0"
 
-eslint@^2.13.1, eslint@~2.13.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-2.13.1.tgz#e4cc8fa0f009fb829aaae23855a29360be1f6c11"
+eslint@^3.16.0:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
   dependencies:
+    babel-code-frame "^6.16.0"
     chalk "^1.1.3"
-    concat-stream "^1.4.6"
+    concat-stream "^1.5.2"
     debug "^2.1.1"
-    doctrine "^1.2.2"
-    es6-map "^0.1.3"
+    doctrine "^2.0.0"
     escope "^3.6.0"
-    espree "^3.1.6"
+    espree "^3.4.0"
+    esquery "^1.0.0"
     estraverse "^4.2.0"
     esutils "^2.0.2"
-    file-entry-cache "^1.1.1"
+    file-entry-cache "^2.0.0"
     glob "^7.0.3"
-    globals "^9.2.0"
-    ignore "^3.1.2"
+    globals "^9.14.0"
+    ignore "^3.2.0"
     imurmurhash "^0.1.4"
     inquirer "^0.12.0"
     is-my-json-valid "^2.10.0"
@@ -1890,19 +1903,20 @@ eslint@^2.13.1, eslint@~2.13.1:
     levn "^0.3.0"
     lodash "^4.0.0"
     mkdirp "^0.5.0"
-    optionator "^0.8.1"
-    path-is-absolute "^1.0.0"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
     path-is-inside "^1.0.1"
     pluralize "^1.2.1"
     progress "^1.1.8"
     require-uncached "^1.0.2"
-    shelljs "^0.6.0"
-    strip-json-comments "~1.0.1"
+    shelljs "^0.7.5"
+    strip-bom "^3.0.0"
+    strip-json-comments "~2.0.1"
     table "^3.7.8"
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-espree@^3.1.6:
+espree@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
   dependencies:
@@ -1920,14 +1934,16 @@ esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
 esprima@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
 
+esquery@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  dependencies:
+    estraverse "^4.0.0"
+
 esrecurse@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
@@ -1939,7 +1955,7 @@ estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
@@ -2092,9 +2108,9 @@ figures@^1.3.2, figures@^1.3.5:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
-file-entry-cache@^1.1.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz#44c61ea607ae4be9c1402f41f44270cbfe334ff8"
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
   dependencies:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
@@ -2491,7 +2507,7 @@ global-prefix@^0.1.4:
     is-windows "^0.2.0"
     which "^1.2.12"
 
-globals@^9.2.0:
+globals@^9.14.0:
   version "9.17.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
 
@@ -2848,9 +2864,9 @@ ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
-ignore@^3.1.2:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
+ignore@^3.2.0:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"
 
 immutable@^3.7.4, immutable@^3.7.6:
   version "3.8.1"
@@ -3241,6 +3257,10 @@ js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
+js-tokens@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+
 js-yaml@3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
@@ -3248,14 +3268,7 @@ js-yaml@3.6.1:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-js-yaml@3.x, js-yaml@^3.1.0, js-yaml@^3.5.1:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^3.1.1"
-
-js-yaml@~3.7.0:
+js-yaml@3.x, js-yaml@^3.1.0, js-yaml@^3.5.1, js-yaml@~3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
   dependencies:
@@ -3697,24 +3710,12 @@ lodash.deburr@^3.0.0:
   dependencies:
     lodash._root "^3.0.0"
 
-lodash.endswith@^4.0.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
-
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
   dependencies:
     lodash._root "^3.0.0"
 
-lodash.find@^4.3.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
-
-lodash.findindex@^4.3.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106"
-
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -4216,6 +4217,10 @@ natives@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
 
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
 negotiator@0.4.9:
   version "0.4.9"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.4.9.tgz#92e46b6db53c7e421ed64a2bc94f08be7630df3f"
@@ -4551,7 +4556,7 @@ optimist@~0.3, optimist@~0.3.4, optimist@~0.3.5:
   dependencies:
     wordwrap "~0.0.2"
 
-optionator@^0.8.1:
+optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
   dependencies:
@@ -5807,9 +5812,13 @@ shell-quote@~1.4.1:
     array-reduce "~0.0.0"
     jsonify "~0.0.0"
 
-shelljs@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8"
+shelljs@^0.7.5:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
 
 sigmund@~1.0.0:
   version "1.0.1"
@@ -6136,16 +6145,16 @@ strip-bom@^2.0.0:
   dependencies:
     is-utf8 "^0.2.0"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
   dependencies:
     get-stdin "^4.0.1"
 
-strip-json-comments@~1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"