elastic · pavel06081991 · Sep 25, 2018 · Sep 18, 2018 · Sep 18, 2018 · Sep 21, 2018
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -398,7 +398,7 @@ module.exports = {
         'import/no-extraneous-dependencies': [
           'error',
           {
-            packageDir: resolve(__dirname, 'x-pack/package.json'),
+            packageDir: './x-pack/',
           },
         ],
       },
@@ -417,7 +417,7 @@ module.exports = {
           {
             devDependencies: true,
             peerDependencies: true,
-            packageDir: resolve(__dirname, 'x-pack/package.json'),
+            packageDir: './x-pack/',
           },
         ],
       },
@@ -429,7 +429,7 @@ module.exports = {
         'import/no-extraneous-dependencies': [
           'error',
           {
-            packageDir: resolve(__dirname, 'x-pack/package.json'),
+            packageDir: './x-pack/',
           },
         ],
         'import/no-unresolved': [

diff --git a/package.json b/package.json
@@ -201,8 +201,8 @@
     "yauzl": "2.7.0"
   },
   "devDependencies": {
-    "@babel/parser": "7.0.0-beta.52",
-    "@babel/types": "7.0.0-beta.31",
+    "@babel/parser": "^7.1.0",
+    "@babel/types": "^7.0.0",
     "@elastic/eslint-config-kibana": "link:packages/eslint-config-kibana",
     "@elastic/eslint-plugin-kibana-custom": "link:packages/eslint-plugin-kibana-custom",
     "@kbn/es": "link:packages/kbn-es",
@@ -249,7 +249,7 @@
     "@types/type-detect": "^4.0.1",
     "@types/uuid": "^3.4.4",
     "angular-mocks": "1.4.7",
-    "babel-eslint": "8.1.2",
+    "babel-eslint": "^9.0.0",
     "babel-jest": "^23.4.2",
     "backport": "4.4.1",
     "chai": "3.5.0",
@@ -262,7 +262,7 @@
     "enzyme": "3.2.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-to-json": "3.3.1",
-    "eslint": "4.14.0",
+    "eslint": "^5.6.0",
     "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-babel": "4.1.2",
     "eslint-plugin-import": "2.8.0",

diff --git a/packages/eslint-config-kibana/jest.js b/packages/eslint-config-kibana/jest.js
@@ -7,7 +7,7 @@ module.exports = {
       ],
 
       env: {
-        'jest/globals': true,
+        'jest': true,
       },
 
       rules: {

diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json
@@ -15,8 +15,8 @@
   },
   "homepage": "https://github.com/elastic/eslint-config-kibana#readme",
   "peerDependencies": {
-    "babel-eslint": "^8.0.0",
-    "eslint": "^4.1.0",
+    "babel-eslint": "^9.0.0",
+    "eslint": "^5.6.0",
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-jest": "^21.22.0",

diff --git a/packages/kbn-eslint-plugin-license-header/package.json b/packages/kbn-eslint-plugin-license-header/package.json
@@ -4,8 +4,8 @@
   "private": true,
   "license": "Apache-2.0",
   "peerDependencies": {
-    "eslint": ">=4.0.0",
-    "babel-eslint": "^8.2.1"
+    "eslint": "^5.6.0",
+    "babel-eslint": "^9.0.0"
   },
   "dependencies": {
     "dedent": "^0.7.0"

diff --git a/packages/kbn-plugin-generator/sao_template/template/package.json b/packages/kbn-plugin-generator/sao_template/template/package.json
@@ -20,8 +20,8 @@
     "@elastic/eslint-config-kibana": "link:../../kibana/packages/eslint-config-kibana",
     "@elastic/eslint-import-resolver-kibana": "link:../../kibana/packages/kbn-eslint-import-resolver-kibana",
     "@kbn/plugin-helpers": "link:../../kibana/packages/kbn-plugin-helpers",
-    "babel-eslint": "^8.0.2",
-    "eslint": "^4.11.0",
+    "babel-eslint": "^9.0.0",
+    "eslint": "^5.6.0",
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-import": "^2.3.0",
     "eslint-plugin-jest": "^21.22.0",

diff --git a/src/core_plugins/console/public/src/sense_editor/mode/input_highlight_rules.js b/src/core_plugins/console/public/src/sense_editor/mode/input_highlight_rules.js
@@ -47,7 +47,7 @@ export function InputHighlightRules() {
       { token: 'paren.lparen', regex: '{', next: 'json', push: true }
     ],
     addEOL(['method'], /([a-zA-Z]+)/, 'start', 'method_sep')
-      ,
+    ,
     [
       {
         token: 'whitespace',

diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js
@@ -460,45 +460,45 @@ function discoverController(
           'rows',
           'fetchStatus'
         ], (function updateResultState() {
-            let prev = {};
-            const status = {
-              LOADING: 'loading', // initial data load
-              READY: 'ready', // results came back
-              NO_RESULTS: 'none' // no results came back
-            };
-
-            function pick(rows, oldRows, fetchStatus) {
-              // initial state, pretend we are loading
-              if (rows == null && oldRows == null) return status.LOADING;
-
-              const rowsEmpty = _.isEmpty(rows);
-              // An undefined fetchStatus means the requests are still being
-              // prepared to be sent. When all requests are completed,
-              // fetchStatus is set to null, so it's important that we
-              // specifically check for undefined to determine a loading status.
-              const preparingForFetch = _.isUndefined(fetchStatus);
-              if (preparingForFetch) return status.LOADING;
-              else if (rowsEmpty && fetchStatus) return status.LOADING;
-              else if (!rowsEmpty) return status.READY;
-              else return status.NO_RESULTS;
-            }
+          let prev = {};
+          const status = {
+            LOADING: 'loading', // initial data load
+            READY: 'ready', // results came back
+            NO_RESULTS: 'none' // no results came back
+          };
+
+          function pick(rows, oldRows, fetchStatus) {
+            // initial state, pretend we are loading
+            if (rows == null && oldRows == null) return status.LOADING;
+
+            const rowsEmpty = _.isEmpty(rows);
+            // An undefined fetchStatus means the requests are still being
+            // prepared to be sent. When all requests are completed,
+            // fetchStatus is set to null, so it's important that we
+            // specifically check for undefined to determine a loading status.
+            const preparingForFetch = _.isUndefined(fetchStatus);
+            if (preparingForFetch) return status.LOADING;
+            else if (rowsEmpty && fetchStatus) return status.LOADING;
+            else if (!rowsEmpty) return status.READY;
+            else return status.NO_RESULTS;
+          }
 
-            return function () {
-              const current = {
-                rows: $scope.rows,
-                fetchStatus: $scope.fetchStatus
-              };
+          return function () {
+            const current = {
+              rows: $scope.rows,
+              fetchStatus: $scope.fetchStatus
+            };
 
-              $scope.resultState = pick(
-                current.rows,
-                prev.rows,
-                current.fetchStatus,
-                prev.fetchStatus
-              );
+            $scope.resultState = pick(
+              current.rows,
+              prev.rows,
+              current.fetchStatus,
+              prev.fetchStatus
+            );
 
-              prev = current;
-            };
-          }()));
+            prev = current;
+          };
+        }()));
 
         if ($scope.opts.timefield) {
           setupVisualization();

diff --git a/src/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js b/src/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
@@ -36,6 +36,7 @@ function mockRawData() {
   do {
     node = stack.pop();
     if (typeof node === 'object') {
+      // eslint-disable-next-line guard-for-in
       for (const key in node) {
         if (node.hasOwnProperty(key)) {
           if (key === 'aggConfig') {

diff --git a/src/fixtures/require_from.js b/src/fixtures/require_from.js
diff --git a/src/ui/__tests__/fixtures/test_app/public/index.js b/src/ui/__tests__/fixtures/test_app/public/index.js
diff --git a/src/ui/public/private/private.js b/src/ui/public/private/private.js
@@ -138,7 +138,7 @@ uiModules.get('kibana/private')
 
     provider.$get = ['$injector', function PrivateFactory($injector) {
 
-    // prevent circular deps by tracking where we came from
+      // prevent circular deps by tracking where we came from
       const privPath = [];
       const pathToString = function () {
         return privPath.map(name).join(' -> ');

diff --git a/src/ui/public/vislib/lib/layout/types/map_layout.js b/src/ui/public/vislib/lib/layout/types/map_layout.js
diff --git a/test/functional/page_objects/visualize_page.js b/test/functional/page_objects/visualize_page.js
@@ -869,8 +869,9 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
       log.debug(`maxYLabel = ${maxYLabel}, maxYLabelYPosition = ${maxYLabelYPosition}`);
 
       // 2). get the minimum chart Y-Axis marker value and Y position
-      const minYAxisChartMarker = await
-        find.byCssSelector('div.y-axis-col.axis-wrapper-left  > div > div > svg:nth-child(2) > g > g:nth-child(1).tick');
+      const minYAxisChartMarker = await find.byCssSelector(
+        'div.y-axis-col.axis-wrapper-left  > div > div > svg:nth-child(2) > g > g:nth-child(1).tick'
+      );
       const minYLabel = (await minYAxisChartMarker.getVisibleText()).replace(',', '');
       const minYLabelYPosition = (await minYAxisChartMarker.getPosition()).y;
       return ((maxYLabel - minYLabel) / (minYLabelYPosition - maxYLabelYPosition));

diff --git a/x-pack/plugins/canvas/tasks/plugins.js b/x-pack/plugins/canvas/tasks/plugins.js
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 import webpack from 'webpack';
 import webpackConfig from './helpers/webpack.plugins';
 

diff --git a/x-pack/plugins/index_management/__jest__/components/index_table.test.js b/x-pack/plugins/index_management/__jest__/components/index_table.test.js
@@ -17,6 +17,7 @@ import axios from 'axios';
 import { setHttpClient } from '../../public/services/api';
 import sinon from 'sinon';
 import { findTestSubject } from '@elastic/eui/lib/test';
+
 jest.mock('react-ace', () => {
   const { PureComponent } = require('react');
   return class extends PureComponent {
@@ -33,6 +34,7 @@ jest.mock('react-ace', () => {
   };
 });
 jest.mock('brace/theme/textmate', () => 'brace/theme/textmate');
+jest.mock('brace/ext/language_tools', () => 'brace/ext/language_tools');
 
 setHttpClient(axios.create());
 let server = null;

diff --git a/x-pack/plugins/index_management/__mocks__/brace/ext/language_tools.js b/x-pack/plugins/index_management/__mocks__/brace/ext/language_tools.js
diff --git a/x-pack/plugins/index_management/public/store/reducers/row_status.js b/x-pack/plugins/index_management/public/store/reducers/row_status.js
@@ -121,6 +121,7 @@ export const rowStatus = handleActions({
     }, {});
 
     const newState = { ...state };
+    // eslint-disable-next-line guard-for-in
     for (const indexName in state) {
       if (state[indexName] === INDEX_CLOSING && indicesByName[indexName].status === INDEX_CLOSED) {
         delete newState[indexName];

diff --git a/x-pack/plugins/ml/public/jobs/jobs_list_old/jobs_list_controller.js b/x-pack/plugins/ml/public/jobs/jobs_list_old/jobs_list_controller.js
@@ -293,7 +293,7 @@ module.controller('MlJobsList',
           job.job_id.match(filterRegexp) ||
           jobDescription.match(filterRegexp)) {
 
-        // long string moved to separate variable to allow it to be broken in two
+          // long string moved to separate variable to allow it to be broken in two
           let iconTxt = '<i ng-show="tab.jobWarningClass !== \'\'" ';
           iconTxt += 'tooltip="{{jobAudit.jobWarningText}}" class="{{jobAudit.jobWarningClass}}"></i>';
 
@@ -594,7 +594,7 @@ module.controller('MlJobsList',
     // apply the text entered in the filter field and reload the jobs list
     $scope.applyFilter = function () {
 
-    // clear the previous filter timeout
+      // clear the previous filter timeout
       $timeout.cancel(jobFilterTimeout);
 
       // create a timeout to redraw the jobs list based on the filter

diff --git a/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js b/x-pack/plugins/ml/public/jobs/new_job/advanced/new_job_controller.js
@@ -758,8 +758,8 @@ module.controller('MlNewJob',
     function setFieldDelimiterControlsFromText() {
       if ($scope.job.data_description && $scope.job.data_description.field_delimiter) {
 
-      // if the data format has not been set and fieldDelimiter exists,
-      // assume the format is delimited
+        // if the data format has not been set and fieldDelimiter exists,
+        // assume the format is delimited
         if ($scope.job.data_description.format === undefined) {
           $scope.job.data_description.format = 'delimited';
         }

diff --git a/x-pack/plugins/reporting/server/browsers/safe_child_process.js b/x-pack/plugins/reporting/server/browsers/safe_child_process.js
@@ -35,7 +35,7 @@ export function safeChildProcess(childProcess, observer) {
     ),
   );
 
-    // send termination signals
+  // send termination signals
   const terminate$ = Rx.merge(
     signalForChildProcess$.pipe(
       tap(signal => childProcess.kill(signal))

diff --git a/x-pack/plugins/searchprofiler/public/filters/ns_to_pretty.js b/x-pack/plugins/searchprofiler/public/filters/ns_to_pretty.js
@@ -11,11 +11,12 @@ export function nsToPretty(ns, precision) {
     precision = 1;
   }
   const units = ['ns', 'µs'];
-  for (const i in units) {
+
+  for (const unit of units) {
     if (ns < 1000) {
-      return ns.toFixed(precision) + units[i];
+      return ns.toFixed(precision) + unit;
     }
     ns /= 1000;
   }
   return msToPretty(ns, precision);
-}
+}
diff --git a/x-pack/plugins/security/public/views/management/roles.js b/x-pack/plugins/security/public/views/management/roles.js
@@ -50,7 +50,7 @@ routes.when(ROLES_PATH, {
       };
       confirmModal(`
         Are you sure you want to delete the selected role(s)? This action is irreversible!`,
-        confirmModalOptions
+      confirmModalOptions
       );
     };
 

diff --git a/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.js b/x-pack/plugins/watcher/server/routes/api/settings/register_load_route.js
@@ -32,7 +32,7 @@ export function registerLoadRoute(server) {
         })
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             return reply(wrapEsError(err));
           }

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.js b/x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.js
@@ -36,7 +36,7 @@ export function registerAcknowledgeRoute(server) {
         })
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             const statusCodeToMessageMap = {
               404: `Watch with id = ${watchId} not found`

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.js b/x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.js
@@ -43,7 +43,7 @@ export function registerActivateRoute(server) {
         })
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             const statusCodeToMessageMap = {
               404: `Watch with id = ${watchId} not found`

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.js b/x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.js
@@ -43,7 +43,7 @@ export function registerDeactivateRoute(server) {
         })
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             const statusCodeToMessageMap = {
               404: `Watch with id = ${watchId} not found`

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.js b/x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.js
@@ -32,7 +32,7 @@ export function registerDeleteRoute(server) {
         .then(() => reply().code(204))
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             const statusCodeToMessageMap = {
               404: `Watch with id = ${watchId} not found`

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.js b/x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.js
@@ -51,7 +51,7 @@ export function registerExecuteRoute(server) {
         })
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             return reply(wrapEsError(err));
           }

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.js b/x-pack/plugins/watcher/server/routes/api/watch/register_load_route.js
@@ -44,7 +44,7 @@ export function registerLoadRoute(server) {
         })
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             const statusCodeToMessageMap = {
               404: `Watch with id = ${id} not found`

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.js b/x-pack/plugins/watcher/server/routes/api/watch/register_save_route.js
@@ -34,7 +34,7 @@ export function registerSaveRoute(server) {
         .then(reply)
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             return reply(wrapEsError(err));
           }

diff --git a/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.js b/x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.js
@@ -44,7 +44,7 @@ export function registerVisualizeRoute(server) {
         })
         .catch(err => {
 
-        // Case: Error from Elasticsearch JS client
+          // Case: Error from Elasticsearch JS client
           if (isEsError(err)) {
             return reply(wrapEsError(err));
           }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ module.exports = { @@
           ],
           env: {
-            'jest/globals': true,
+            'jest': true,
           },
           rules: {
@@ Expand Down @@