Merge branch 'master' of github.com:elastic/kibana into 2019-12-03-em…

…beddable-example
elastic · Dec 16, 2019 · c153889 · c153889
2 parents 6117caf + 09faf19
commit c153889
Show file tree

Hide file tree

Showing 234 changed files with 6,627 additions and 2,422 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -685,8 +685,6 @@ module.exports = {
         'accessor-pairs': 'error',
         'array-callback-return': 'error',
         'no-array-constructor': 'error',
-        // This will be turned on after bug fixes are mostly completed
-        // 'arrow-body-style': ['warn', 'as-needed'],
         complexity: 'warn',
         // This will be turned on after bug fixes are mostly completed
         // 'consistent-return': 'warn',
@@ -716,7 +714,6 @@ module.exports = {
         'no-extra-bind': 'error',
         'no-extra-boolean-cast': 'error',
         'no-extra-label': 'error',
-        'no-floating-decimal': 'error',
         'no-func-assign': 'error',
         'no-implicit-globals': 'error',
         'no-implied-eval': 'error',
@@ -757,8 +754,6 @@ module.exports = {
         'prefer-spread': 'error',
         // This style will be turned on after most bugs are fixed
         // 'prefer-template': 'warn',
-        // This style will be turned on after most bugs are fixed
-        // quotes: ['warn', 'single', { avoidEscape: true }],
         'react/boolean-prop-naming': 'error',
         'react/button-has-type': 'error',
         'react/forbid-dom-props': 'error',
@@ -794,13 +789,10 @@ module.exports = {
         'react/jsx-sort-default-props': 'error',
         // might be introduced after the other warns are fixed
         // 'react/jsx-sort-props': 'error',
-        'react/jsx-tag-spacing': 'error',
         // might be introduced after the other warns are fixed
         'react-hooks/exhaustive-deps': 'off',
         'require-atomic-updates': 'error',
-        'rest-spread-spacing': ['error', 'never'],
         'symbol-description': 'error',
-        'template-curly-spacing': 'error',
         'vars-on-top': 'error',
       },
     },
@@ -835,8 +827,6 @@ module.exports = {
     {
       files: ['x-pack/legacy/plugins/monitoring/**/*.js'],
       rules: {
-        'block-spacing': ['error', 'always'],
-        curly: ['error', 'all'],
         'no-unused-vars': ['error', { args: 'all', argsIgnorePattern: '^_' }],
         'no-else-return': 'error',
       },
@@ -853,7 +843,6 @@ module.exports = {
       files: ['x-pack/legacy/plugins/canvas/**/*.js'],
       rules: {
         radix: 'error',
-        curly: ['error', 'all'],
 
         // module importing
         'import/order': [
@@ -871,7 +860,6 @@ module.exports = {
         'react/self-closing-comp': 'error',
         'react/sort-comp': 'error',
         'react/jsx-boolean-value': 'error',
-        'react/jsx-wrap-multilines': 'error',
         'react/no-unescaped-entities': ['error', { forbid: ['>', '}'] }],
         'react/forbid-elements': [
           'error',
@@ -948,5 +936,17 @@ module.exports = {
         'import/no-default-export': 'error',
       },
     },
+
+    /**
+     * Prettier disables all conflicting rules, listing as last override so it takes precedence
+     */
+    {
+      files: ['**/*'],
+      rules: {
+        ...require('eslint-config-prettier').rules,
+        ...require('eslint-config-prettier/react').rules,
+        ...require('eslint-config-prettier/@typescript-eslint').rules,
+      },
+    },
   ],
 };
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -4,7 +4,10 @@
     "console": "src/legacy/core_plugins/console",
     "core": "src/core",
     "dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
-    "data": ["src/legacy/core_plugins/data", "src/plugins/data"],
+    "data": [
+      "src/legacy/core_plugins/data",
+      "src/plugins/data"
+    ],
     "embeddableApi": "src/plugins/embeddable",
     "embeddableExamples": "examples/embeddable_examples",
     "share": "src/plugins/share",
@@ -22,7 +25,7 @@
     "kibana_react": "src/legacy/core_plugins/kibana_react",
     "kibana-react": "src/plugins/kibana_react",
     "kibana_utils": "src/plugins/kibana_utils",
-    "navigation": "src/legacy/core_plugins/navigation",
+    "navigation": "src/plugins/navigation",
     "newsfeed": "src/plugins/newsfeed",
     "regionMap": "src/legacy/core_plugins/region_map",
     "server": "src/legacy/server",
@@ -37,8 +40,13 @@
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
     "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
     "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
-    "visualizations": ["src/plugins/visualizations", "src/legacy/core_plugins/visualizations"]
+    "visualizations": [
+      "src/plugins/visualizations",
+      "src/legacy/core_plugins/visualizations"
+    ]
   },
-  "exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
+  "exclude": [
+    "src/legacy/ui/ui_render/ui_render_mixin.js"
+  ],
   "translations": []
-}
+}
diff --git a/docs/development/core/server/kibana-plugin-server.logger.md b/docs/development/core/server/kibana-plugin-server.logger.md
@@ -19,6 +19,7 @@ export interface Logger
 |  [debug(message, meta)](./kibana-plugin-server.logger.debug.md) | Log messages useful for debugging and interactive investigation |
 |  [error(errorOrMessage, meta)](./kibana-plugin-server.logger.error.md) | Logs abnormal or unexpected errors or messages that caused a failure in the application flow |
 |  [fatal(errorOrMessage, meta)](./kibana-plugin-server.logger.fatal.md) | Logs abnormal or unexpected errors or messages that caused an unrecoverable failure |
+|  [get(childContextPaths)](./kibana-plugin-server.logger.get.md) | Returns a new [Logger](./kibana-plugin-server.logger.md) instance extending the current logger context. |
 |  [info(message, meta)](./kibana-plugin-server.logger.info.md) | Logs messages related to general application flow |
 |  [trace(message, meta)](./kibana-plugin-server.logger.trace.md) | Log messages at the most detailed log level |
 |  [warn(errorOrMessage, meta)](./kibana-plugin-server.logger.warn.md) | Logs abnormal or unexpected errors or messages |

diff --git a/package.json b/package.json
@@ -110,8 +110,8 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/register": "^7.7.0",
+    "@babel/core": "^7.7.5",
+    "@babel/register": "^7.7.4",
     "@elastic/charts": "^14.0.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
@@ -156,7 +156,7 @@
     "color": "1.0.3",
     "commander": "3.0.2",
     "compare-versions": "3.5.1",
-    "core-js": "^3.2.1",
+    "core-js": "^3.5.0",
     "css-loader": "2.1.1",
     "custom-event-polyfill": "^0.3.0",
     "d3": "3.5.17",
@@ -172,7 +172,7 @@
     "fast-deep-equal": "^3.1.1",
     "file-loader": "4.2.0",
     "font-awesome": "4.7.0",
-    "getos": "^3.1.0",
+    "getos": "^3.1.1",
     "glob": "^7.1.2",
     "glob-all": "^3.1.0",
     "globby": "^8.0.1",
@@ -219,7 +219,7 @@
     "postcss-loader": "3.0.0",
     "prop-types": "15.6.0",
     "proxy-from-env": "1.0.0",
-    "pug": "^2.0.3",
+    "pug": "^2.0.4",
     "querystring-browser": "1.0.4",
     "raw-loader": "3.1.0",
     "react": "^16.12.0",
@@ -275,9 +275,9 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
-    "@babel/parser": "^7.5.5",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/types": "^7.5.5",
+    "@babel/parser": "^7.7.5",
+    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+    "@babel/types": "^7.7.4",
     "@elastic/elasticsearch": "^7.4.0",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
@@ -298,7 +298,7 @@
     "@testing-library/react-hooks": "^3.2.1",
     "@types/angular": "^1.6.56",
     "@types/angular-mocks": "^1.7.0",
-    "@types/babel__core": "^7.1.2",
+    "@types/babel__core": "^7.1.3",
     "@types/bluebird": "^3.1.1",
     "@types/boom": "^7.2.0",
     "@types/chance": "^1.0.0",
@@ -310,7 +310,7 @@
     "@types/delete-empty": "^2.0.0",
     "@types/elasticsearch": "^5.0.33",
     "@types/enzyme": "^3.9.0",
-    "@types/eslint": "^6.1.2",
+    "@types/eslint": "^6.1.3",
     "@types/fetch-mock": "^7.3.1",
     "@types/getopts": "^2.0.1",
     "@types/glob": "^7.1.1",
@@ -385,25 +385,25 @@
     "enzyme-adapter-react-16": "^1.15.1",
     "enzyme-adapter-utils": "^1.12.1",
     "enzyme-to-json": "^3.4.3",
-    "eslint": "^6.5.1",
-    "eslint-config-prettier": "^6.4.0",
+    "eslint": "^6.7.2",
+    "eslint-config-prettier": "^6.7.0",
     "eslint-plugin-babel": "^5.3.0",
     "eslint-plugin-ban": "^1.3.0",
-    "eslint-plugin-cypress": "^2.7.0",
-    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-cypress": "^2.8.0",
+    "eslint-plugin-import": "^2.19.1",
     "eslint-plugin-jest": "^22.19.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-mocha": "^6.2.0",
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-react": "^7.16.0",
     "eslint-plugin-react-hooks": "^2.1.2",
     "exit-hook": "^2.2.0",
     "faker": "1.1.0",
     "fetch-mock": "^7.3.9",
-    "geckodriver": "^1.19.0",
+    "geckodriver": "^1.19.1",
     "getopts": "^2.2.4",
     "grunt": "1.0.4",
     "grunt-available-tasks": "^0.6.3",
@@ -422,7 +422,7 @@
     "jest": "^24.9.0",
     "jest-cli": "^24.9.0",
     "jest-raw-loader": "^1.0.1",
-    "jimp": "0.8.4",
+    "jimp": "0.9.3",
     "json5": "^1.0.1",
     "karma": "3.1.4",
     "karma-chrome-launcher": "2.2.0",
@@ -453,7 +453,7 @@
     "regenerate": "^1.4.0",
     "sass-lint": "^1.12.1",
     "selenium-webdriver": "^4.0.0-alpha.5",
-    "simple-git": "1.116.0",
+    "simple-git": "1.129.0",
     "sinon": "^7.4.2",
     "strip-ansi": "^3.0.1",
     "supertest": "^3.1.0",

diff --git a/packages/elastic-datemath/package.json b/packages/elastic-datemath/package.json
@@ -11,8 +11,8 @@
     "kbn:watch": "yarn build --watch"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
+    "@babel/cli": "^7.7.5",
+    "@babel/preset-env": "^7.7.6",
     "babel-plugin-add-module-exports": "^1.0.2",
     "moment": "^2.24.0"
   },

diff --git a/packages/eslint-config-kibana/.eslintrc.js b/packages/eslint-config-kibana/.eslintrc.js
@@ -19,44 +19,40 @@ module.exports = {
     es6: true,
   },
 
-  rules: Object.assign(
-    {
-      'prettier/prettier': [
-        'error',
+  rules: {
+    'prettier/prettier': [
+      'error',
+      {
+        endOfLine: 'auto',
+      },
+    ],
+
+    '@kbn/eslint/module_migration': [
+      'error',
+      [
         {
-          endOfLine: 'auto',
+          from: 'expect.js',
+          to: '@kbn/expect',
+        },
+        {
+          from: 'mkdirp',
+          to: false,
+          disallowedMessage: `Don't use 'mkdirp', use the new { recursive: true } option of Fs.mkdir instead`
+        },
+        {
+          from: '@kbn/elastic-idx',
+          to: false,
+          disallowedMessage: `Don't use idx(), use optional chaining syntax instead https://ela.st/optchain`
+        },
+        {
+          from: 'x-pack',
+          toRelative: 'x-pack',
+        },
+        {
+          from: 'react-router',
+          to: 'react-router-dom',
         },
       ],
-
-      '@kbn/eslint/module_migration': [
-        'error',
-        [
-          {
-            from: 'expect.js',
-            to: '@kbn/expect',
-          },
-          {
-            from: 'mkdirp',
-            to: false,
-            disallowedMessage: `Don't use 'mkdirp', use the new { recursive: true } option of Fs.mkdir instead`
-          },
-          {
-            from: '@kbn/elastic-idx',
-            to: false,
-            disallowedMessage: `Don't use idx(), use optional chaining syntax instead https://ela.st/optchain`
-          },
-          {
-            from: 'x-pack',
-            toRelative: 'x-pack',
-          },
-          {
-            from: 'react-router',
-            to: 'react-router-dom',
-          },
-        ],
-      ],
-    },
-    require('eslint-config-prettier').rules,
-    require('eslint-config-prettier/react').rules
-  )
+    ],
+  },
 };
diff --git a/packages/eslint-config-kibana/javascript.js b/packages/eslint-config-kibana/javascript.js
@@ -42,8 +42,6 @@ module.exports = {
         'block-scoped-var': 'error',
         camelcase: [ 'error', { properties: 'never', allow: ['^UNSAFE_'] } ],
         'consistent-return': 'off',
-        curly: [ 'error', 'multi-line' ],
-        'dot-location': [ 'error', 'property' ],
         'dot-notation': [ 'error', { allowKeywords: true } ],
         eqeqeq: [ 'error', 'allow-null' ],
         'guard-for-in': 'error',
@@ -86,7 +84,6 @@ module.exports = {
         'prefer-const': 'error',
         strict: [ 'error', 'never' ],
         'valid-typeof': 'error',
-        'eol-last': ['error', 'always'],
         yoda: 'off',
 
         'mocha/handle-done-callback': 'error',

diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json
@@ -18,11 +18,11 @@
     "@typescript-eslint/eslint-plugin": "^2.10.0",
     "@typescript-eslint/parser": "^2.10.0",
     "babel-eslint": "^10.0.3",
-    "eslint": "^6.5.1",
+    "eslint": "^6.7.2",
     "eslint-plugin-babel": "^5.3.0",
     "eslint-plugin-ban": "^1.3.0",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-import": "^2.19.1",
     "eslint-plugin-jest": "^22.19.0",
     "eslint-plugin-mocha": "^6.2.0",
     "eslint-plugin-no-unsanitized": "^3.0.2",