Merge remote-tracking branch 'upstream/master' into kbn-xxx-remove-le…

…gacy-kibana-plugin

.eslintignore

@@ -39,7 +39,7 @@ target
 /x-pack/legacy/plugins/maps/public/vendor/**
 
 # package overrides
-/packages/eslint-config-kibana
+/packages/elastic-eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
 /packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist

.eslintrc.js

@@ -94,12 +94,6 @@ module.exports = {
         'jsx-a11y/no-onchange': 'off',
       },
     },
-    {
-      files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
       rules: {
@@ -125,25 +119,12 @@ module.exports = {
         'jsx-a11y/click-events-have-key-events': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-        'react-hooks/rules-of-hooks': 'off',
-      },
-    },
     {
       files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
 
     /**
      * Files that require Apache 2.0 headers, settings

.github/CODEOWNERS

@@ -85,7 +85,6 @@
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
-/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 

docs/developer/getting-started/running-kibana-advanced.asciidoc

@@ -48,7 +48,7 @@ If you’re installing dependencies and seeing an error that looks
 something like
 
 ....
-Unsupported URL Type: link:packages/eslint-config-kibana
+Unsupported URL Type: link:packages/elastic-eslint-config-kibana
 ....
 
 you’re likely running `npm`. To install dependencies in {kib} you

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md

@@ -7,15 +7,8 @@
 <b>Signature:</b>
 
 ```typescript
-init(forceFieldRefresh?: boolean): Promise<this>;
+init(): Promise<this>;
 ```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  forceFieldRefresh | <code>boolean</code> |  |
-
 <b>Returns:</b>
 
 `Promise<this>`

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md

@@ -50,7 +50,7 @@ export declare class IndexPattern implements IIndexPattern
 |  [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) |  |  |
 |  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  |  |
 |  [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) |  |  |
-|  [init(forceFieldRefresh)](./kibana-plugin-plugins-data-public.indexpattern.init.md) |  |  |
+|  [init()](./kibana-plugin-plugins-data-public.indexpattern.init.md) |  |  |
 |  [initFromSpec(spec)](./kibana-plugin-plugins-data-public.indexpattern.initfromspec.md) |  |  |
 |  [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) |  |  |
 |  [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) |  |  |

package.json

@@ -117,15 +117,18 @@
       "**/@types/*/**",
       "**/grunt-*",
       "**/grunt-*/**",
-      "x-pack/typescript"
+      "x-pack/typescript",
+      "@elastic/eui/rehype-react",
+      "@elastic/eui/remark-rehype",
+      "@elastic/eui/remark-rehype/**"
     ]
   },
   "dependencies": {
     "@babel/core": "^7.11.1",
     "@babel/register": "^7.10.5",
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.0-rc.2",
-    "@elastic/eui": "27.4.1",
+    "@elastic/eui": "28.2.0",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",
@@ -227,7 +230,7 @@
     "@babel/parser": "^7.11.2",
     "@babel/types": "^7.11.0",
     "@elastic/apm-rum": "^5.5.0",
-    "@elastic/charts": "19.8.1",
+    "@elastic/charts": "21.0.1",
     "@elastic/ems-client": "7.9.3",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",

packages/eslint-config-kibana/README.md → packages/elastic-eslint-config-kibana/README.md

@@ -1,4 +1,4 @@
-# eslint-config-kibana
+# elastic-eslint-config-kibana
 
 The eslint config used by the kibana team
 

packages/eslint-config-kibana/package.json → packages/elastic-eslint-config-kibana/package.json

@@ -5,15 +5,15 @@
   "main": ".eslintrc.js",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/elastic/eslint-config-kibana.git"
+    "url": "git+https://github.com/elastic/kibana.git"
   },
   "keywords": [],
   "author": "Spencer Alger <email@spalger.com>",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/elastic/kibana/tree/master/packages/eslint-config-kibana"
+    "url": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana"
   },
-  "homepage": "https://github.com/elastic/kibana/tree/master/packages/eslint-config-kibana",
+  "homepage": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana",
   "peerDependencies": {
     "@typescript-eslint/eslint-plugin": "^3.10.0",
     "@typescript-eslint/parser": "^3.10.0",

packages/kbn-es/package.json

@@ -16,7 +16,7 @@
     "glob": "^7.1.2",
     "node-fetch": "^2.6.0",
     "simple-git": "^1.91.0",
-    "tar-fs": "^1.16.3",
+    "tar-fs": "^2.1.0",
     "tree-kill": "^1.2.2",
     "yauzl": "^2.10.0"
   }

packages/kbn-plugin-helpers/package.json

@@ -23,10 +23,10 @@
     "vinyl-fs": "^3.0.3"
   },
   "devDependencies": {
-    "@types/decompress": "^4.2.3",
+    "@types/extract-zip": "^1.6.2",
     "@types/gulp-zip": "^4.0.1",
     "@types/inquirer": "^6.5.0",
-    "decompress": "^4.2.1",
+    "extract-zip": "^2.0.1",
     "typescript": "4.0.2"
   }
 }

packages/kbn-plugin-helpers/src/integration_tests/build.test.ts

@@ -22,7 +22,7 @@ import Fs from 'fs';
 
 import execa from 'execa';
 import { createStripAnsiSerializer, REPO_ROOT, createReplaceSerializer } from '@kbn/dev-utils';
-import decompress from 'decompress';
+import extract from 'extract-zip';
 import del from 'del';
 import globby from 'globby';
 import loadJsonFile from 'load-json-file';
@@ -81,7 +81,7 @@ it('builds a generated plugin into a viable archive', async () => {
      info compressing plugin into [fooTestPlugin-7.5.0.zip]"
   `);
 
-  await decompress(PLUGIN_ARCHIVE, TMP_DIR);
+  await extract(PLUGIN_ARCHIVE, { dir: TMP_DIR });
 
   const files = await globby(['**/*'], { cwd: TMP_DIR });
   files.sort((a, b) => a.localeCompare(b));

packages/kbn-pm/README.md

@@ -19,7 +19,7 @@ From a plugin perspective there are two different types of Kibana dependencies:
 runtime and static dependencies. Runtime dependencies are things that are
 instantiated at runtime and that are injected into the plugin, for example
 config and elasticsearch clients. Static dependencies are those dependencies
-that we want to `import`. `eslint-config-kibana` is one example of this, and
+that we want to `import`. `elastic-eslint-config-kibana` is one example of this, and
 it's actually needed because eslint requires it to be a separate package. But we
 also have dependencies like `datemath`, `flot`, `eui` and others that we
 control, but where we want to `import` them in plugins instead of injecting them

packages/kbn-test/package.json

@@ -32,7 +32,7 @@
     "parse-link-header": "^1.0.1",
     "rxjs": "^6.5.5",
     "strip-ansi": "^5.2.0",
-    "tar-fs": "^1.16.3",
+    "tar-fs": "^2.1.0",
     "tmp": "^0.1.0",
     "xml2js": "^0.4.22",
     "zlib": "^1.0.5"

packages/kbn-ui-shared-deps/package.json

@@ -9,8 +9,8 @@
     "kbn:watch": "node scripts/build --dev --watch"
   },
   "dependencies": {
-    "@elastic/charts": "19.8.1",
-    "@elastic/eui": "27.4.1",
+    "@elastic/charts": "21.0.1",
+    "@elastic/eui": "28.2.0",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",

src/core/public/chrome/recently_accessed/persisted_log.test.ts

@@ -28,12 +28,6 @@ const createMockStorage = () => ({
   length: 0,
 });
 
-jest.mock('ui/chrome', () => {
-  return {
-    getBasePath: () => `/some/base/path`,
-  };
-});
-
 const historyName = 'testHistory';
 const historyLimit = 10;
 const payload = [

src/core/server/ui_settings/integration_tests/lib/servers.ts

@@ -73,9 +73,9 @@ export function getServices() {
     httpServerMock.createKibanaRequest()
   );
 
-  const uiSettings = kbnServer.server.uiSettingsServiceFactory({
-    savedObjectsClient,
-  });
+  const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(
+    savedObjectsClient
+  );
 
   services = {
     kbnServer,

src/dev/jest/config.js

@@ -59,7 +59,6 @@ export default {
     '@elastic/eui/lib/(.*)?': '<rootDir>/node_modules/@elastic/eui/test-env/$1',
     '^src/plugins/(.*)': '<rootDir>/src/plugins/$1',
     '^plugins/([^/.]*)(.*)': '<rootDir>/src/legacy/core_plugins/$1/public$2',
-    '^ui/(.*)': '<rootDir>/src/legacy/ui/public/$1',
     '^uiExports/(.*)': '<rootDir>/src/dev/jest/mocks/file_mock.js',
     '^test_utils/(.*)': '<rootDir>/src/test_utils/public/$1',
     '^fixtures/(.*)': '<rootDir>/src/fixtures/$1',

src/dev/jest/setup/mocks.js

@@ -34,10 +34,6 @@
  * The mocks that are enabled that way live inside the `__mocks__` folders beside their implementation files.
  */
 
-jest.mock('ui/metadata');
-jest.mock('ui/documentation_links/documentation_links');
-jest.mock('ui/chrome');
-
 jest.mock('moment-timezone', () => {
   // We always want to mock the timezone moment-timezone guesses, since otherwise
   // test results might be depending on which time zone you are running them.

src/fixtures/stubbed_logstash_index_pattern.js

@@ -21,7 +21,12 @@ import StubIndexPattern from 'test_utils/stub_index_pattern';
 import stubbedLogstashFields from 'fixtures/logstash_fields';
 
 import { getKbnFieldType } from '../plugins/data/common';
-import { npSetup } from '../legacy/ui/public/new_platform/new_platform.karma_mock';
+import { uiSettingsServiceMock } from '../core/public/ui_settings/ui_settings_service.mock';
+
+const uiSettingSetupMock = uiSettingsServiceMock.createSetupContract();
+uiSettingSetupMock.get.mockImplementation((item, defaultValue) => {
+  return defaultValue;
+});
 
 export default function stubbedLogstashIndexPatternService() {
   const mockLogstashFields = stubbedLogstashFields();
@@ -41,13 +46,9 @@ export default function stubbedLogstashIndexPatternService() {
     };
   });
 
-  const indexPattern = new StubIndexPattern(
-    'logstash-*',
-    (cfg) => cfg,
-    'time',
-    fields,
-    npSetup.core
-  );
+  const indexPattern = new StubIndexPattern('logstash-*', (cfg) => cfg, 'time', fields, {
+    uiSettings: uiSettingSetupMock,
+  });
 
   indexPattern.id = 'logstash-*';
   indexPattern.isTimeNanosBased = () => false;