From 8a524197fd1b9cb7f75f7ba005060f0037328d66 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Thu, 7 Feb 2019 12:02:47 -0500 Subject: [PATCH] Update paths to ui, server, deprecation, plugin_discovery in src/legacy This commit accompanies the four that precede it. Rather than squash them altogether, the four previous commits all do nothing except move files to help avoid conflicts. --- .eslintignore | 6 +- .github/CODEOWNERS | 2 +- .i18nrc.json | 8 +- README.md | 2 +- .../core/development-modules.asciidoc | 8 +- ...elopment-embedding-visualizations.asciidoc | 4 +- kibana.d.ts | 2 +- .../lib/get_webpack_config.js | 4 +- packages/kbn-i18n/README.md | 2 +- src/cli/cli.js | 2 +- src/cli/cluster/cluster_manager.js | 12 +- src/cli/cluster/worker.js | 2 +- .../reload_logging_config.test.js | 2 +- src/cli/serve/read_keystore.js | 4 +- src/cli/serve/read_keystore.test.js | 4 +- src/cli/serve/serve.js | 4 +- src/cli_keystore/add.js | 4 +- src/cli_keystore/add.test.js | 4 +- src/cli_keystore/cli_keystore.js | 6 +- src/cli_keystore/create.js | 2 +- src/cli_keystore/create.test.js | 4 +- src/cli_keystore/list.test.js | 2 +- src/cli_keystore/remove.test.js | 2 +- src/cli_plugin/cli.js | 2 +- src/cli_plugin/install/index.js | 4 +- src/cli_plugin/install/kibana.js | 2 +- src/cli_plugin/install/settings.test.js | 2 +- src/cli_plugin/list/index.js | 2 +- src/cli_plugin/list/settings.test.js | 2 +- src/cli_plugin/remove/index.js | 4 +- src/cli_plugin/remove/settings.test.js | 2 +- src/core/server/config/config_service.test.ts | 2 +- src/core/server/config/env.test.ts | 2 +- src/core/server/config/env.ts | 2 +- src/core/server/http/http_tools.ts | 2 +- .../legacy_compat/legacy_service.test.ts | 4 +- .../server/legacy_compat/legacy_service.ts | 2 +- .../logging/legacy_logging_server.test.ts | 4 +- .../logging/legacy_logging_server.ts | 4 +- .../discovery/plugin_discovery.test.ts | 2 +- .../server/plugins/plugins_service.test.ts | 2 +- src/dev/build/lib/exec.js | 2 +- src/dev/build/lib/fs.js | 2 +- src/dev/build/tasks/transpile_babel_task.js | 2 +- src/dev/build/tasks/transpile_scss_task.js | 6 +- src/dev/failed_tests/report.js | 2 +- src/dev/jest/config.js | 8 +- src/dev/precommit_hook/casing_check_config.js | 118 +++++++++--------- src/es_archiver/actions/edit.js | 2 +- src/es_archiver/actions/load.js | 2 +- src/es_archiver/actions/rebuild_all.js | 2 +- src/es_archiver/actions/save.js | 2 +- src/es_archiver/actions/unload.js | 2 +- .../lib/archives/__tests__/format.js | 2 +- .../lib/archives/__tests__/parse.js | 2 +- src/es_archiver/lib/archives/format.js | 2 +- src/es_archiver/lib/archives/parse.js | 2 +- .../__tests__/generate_doc_records_stream.js | 2 +- .../__tests__/index_doc_records_stream.js | 2 +- .../indices/__tests__/create_index_stream.js | 2 +- .../indices/__tests__/delete_index_stream.js | 2 +- .../generate_index_records_stream.js | 2 +- src/es_archiver/lib/indices/kibana_index.js | 6 +- .../__tests__/filter_records_stream.js | 2 +- src/fixtures/logstash_fields.js | 5 +- .../stubbed_logstash_index_pattern.js | 2 +- .../lib/config/transform_deprecations.js | 2 +- .../core_plugins/console/__tests__/index.js | 2 +- .../core_plugins/console/public/index.scss | 2 +- .../input_control_vis/public/index.scss | 2 +- .../inspector_views/public/index.scss | 2 +- .../field_formats/types/__tests__/boolean.js | 2 +- .../field_formats/types/__tests__/bytes.js | 2 +- .../field_formats/types/__tests__/color.js | 2 +- .../field_formats/types/__tests__/date.js | 2 +- .../field_formats/types/__tests__/duration.js | 2 +- .../field_formats/types/__tests__/ip.js | 2 +- .../field_formats/types/__tests__/number.js | 2 +- .../field_formats/types/__tests__/percent.js | 2 +- .../types/__tests__/relative_date.js | 2 +- .../field_formats/types/__tests__/string.js | 2 +- .../field_formats/types/__tests__/truncate.js | 2 +- .../field_formats/types/__tests__/url.js | 2 +- .../field_formats/__tests__/_conformance.js | 2 +- .../core_plugins/kibana/public/index.scss | 6 +- .../management/sections/objects/_view.js | 2 +- .../kibana/public/visualize/editor/editor.js | 4 +- .../export/collect_references_deep.test.ts | 2 +- .../lib/export/collect_references_deep.ts | 2 +- .../markdown_vis/public/index.scss | 2 +- .../core_plugins/metric_vis/public/index.scss | 2 +- .../components/lib/get_axis_label_string.js | 2 +- .../core_plugins/metrics/public/index.scss | 2 +- .../server/lib/get_index_pattern_service.js | 2 +- .../__tests__/region_map_visualization.js | 6 +- .../core_plugins/region_map/public/index.scss | 2 +- .../status_page/public/index.scss | 2 +- .../core_plugins/table_vis/public/index.scss | 2 +- .../core_plugins/tagcloud/public/index.scss | 2 +- .../tests_bundle/find_source_files.js | 2 +- src/legacy/core_plugins/tests_bundle/index.js | 8 +- .../coordinate_maps_visualization.js | 6 +- .../core_plugins/tile_map/public/index.scss | 2 +- .../core_plugins/timelion/public/index.scss | 2 +- .../core_plugins/vega/public/index.scss | 2 +- .../plugin_pack/package_json_at_path.js | 2 +- .../config/__tests__/deprecation_warnings.js | 2 +- .../fixtures/run_kbn_server_startup.js | 2 +- src/legacy/server/config/complete.js | 4 +- .../max_payload_size.test.js | 2 +- .../integration_tests/version_check.test.js | 4 +- .../http/integration_tests/xsrf.test.js | 4 +- src/legacy/server/i18n/index.js | 3 +- src/legacy/server/kbn_server.d.ts | 4 +- src/legacy/server/kbn_server.js | 2 +- .../sample_data/routes/lib/load_data.test.js | 6 +- .../server/sass/__fixtures__/index.scss | 2 +- src/legacy/server/sass/build.js | 5 +- .../saved_objects/routes/_mock_server.js | 2 +- .../collectors/get_ops_stats_collector.js | 2 +- .../status/lib/get_kibana_info_for_stats.js | 2 +- src/legacy/server/status/server_status.js | 2 +- .../ui_exports_replace_injected_vars.js | 2 +- .../field_formats/__tests__/field_format.js | 2 +- .../__tests__/field_formats_service.js | 2 +- src/legacy/ui/field_formats/content_types.js | 4 +- src/legacy/ui/public/_index.scss | 2 +- src/legacy/ui/public/assets/fonts/readme.md | 2 +- .../ui/public/chrome/api/__tests__/xsrf.js | 2 +- src/legacy/ui/public/chrome/api/base_path.ts | 2 +- .../ui/public/chrome/api/breadcrumbs.ts | 2 +- src/legacy/ui/public/chrome/api/controls.ts | 2 +- .../ui/public/chrome/api/help_extension.ts | 2 +- .../ui/public/chrome/api/injected_vars.ts | 2 +- src/legacy/ui/public/chrome/api/theme.ts | 2 +- .../header_global_nav/components/header.tsx | 2 +- .../components/header_breadcrumbs.test.tsx | 2 +- .../components/header_breadcrumbs.tsx | 2 +- src/legacy/ui/public/chrome/index.d.ts | 2 +- .../serialize_fetch_params.js | 2 +- .../courier/search_source/search_source.js | 2 +- .../public/doc_table/components/table_row.js | 2 +- .../editors/color/color.js | 2 +- .../editors/color/color.test.js | 2 +- .../field_format_editor/editors/url/url.js | 2 +- .../lib/__tests__/get_default_format.test.js | 2 +- src/legacy/ui/public/filters/short_dots.js | 2 +- src/legacy/ui/public/i18n/index.tsx | 2 +- src/legacy/ui/public/index_patterns/_field.js | 2 +- src/legacy/ui/public/management/index.js | 6 +- .../notify/app_redirect/app_redirect.js | 2 +- src/legacy/ui/public/notify/fatal_error.ts | 2 +- .../notify/toasts/toast_notifications.test.ts | 2 +- .../notify/toasts/toast_notifications.ts | 2 +- src/legacy/ui/public/notify/toasts/toasts.ts | 2 +- .../ui/public/routes/route_manager.d.ts | 2 +- .../saved_objects/saved_objects_client.ts | 8 +- .../ui/public/styles/_styling_constants.scss | 2 +- .../ui/public/test_harness/test_harness.js | 2 +- .../ui/public/time_buckets/time_buckets.js | 2 +- src/legacy/ui/public/url/index.js | 2 +- src/legacy/ui/public/url/kibana_parsed_url.ts | 2 +- src/legacy/ui/public/utils/case_conversion.ts | 2 +- .../ui/public/vis/__tests__/map/ems_client.js | 2 +- .../vis/__tests__/map/service_settings.js | 2 +- .../ui/public/vis/map/service_settings.js | 4 +- src/legacy/ui/tutorials_mixin.js | 2 +- .../ui/ui_exports/ui_export_defaults.js | 4 +- .../create_or_upgrade_integration.js | 2 +- .../routes/__tests__/lib/servers.js | 2 +- .../utils/__tests__/watch_stdio_for_line.js | 2 +- src/legacy/utils/package_json.ts | 6 +- src/optimize/base_optimizer.js | 6 +- .../dynamic_dll_plugin/dll_compiler.js | 2 +- .../dynamic_dll_plugin/dll_config_model.js | 2 +- .../dynamic_dll_plugin/dynamic_dll_plugin.js | 2 +- src/optimize/index.js | 2 +- src/optimize/public_path_placeholder.js | 2 +- src/optimize/watch/watch_optimizer.js | 2 +- src/optimize/watch/watch_server.js | 2 +- tasks/config/karma.js | 2 +- tasks/config/watch.js | 2 +- .../apis/index_patterns/es_errors/errors.js | 2 +- .../apis/saved_objects/migrations.js | 6 +- tsconfig.json | 2 +- x-pack/dev-tools/jest/create_jest_config.js | 2 +- x-pack/plugins/apm/public/index.scss | 2 +- .../__test__/apm_telemetry.test.ts | 2 +- .../server/lib/apm_telemetry/apm_telemetry.ts | 2 +- x-pack/plugins/beats_management/wallaby.js | 2 +- .../element_share_container.js | 2 +- x-pack/plugins/canvas/public/lib/notify.js | 2 +- x-pack/plugins/canvas/public/style/index.scss | 2 +- .../public/index.scss | 2 +- x-pack/plugins/graph/public/index.scss | 2 +- .../graph/public/templates/_graph.scss | 2 +- .../public/index.scss | 2 +- .../index_management/public/index.scss | 2 +- x-pack/plugins/infra/public/index.scss | 2 +- .../license_management/public/index.scss | 2 +- x-pack/plugins/maps/public/index.scss | 2 +- x-pack/plugins/ml/jsconfig.json | 2 +- x-pack/plugins/ml/public/index.scss | 2 +- x-pack/plugins/monitoring/public/index.scss | 2 +- .../server/kibana_monitoring/init.js | 2 +- .../lib/get_kibana_info_for_stats.js | 2 +- .../plugins/remote_clusters/public/index.scss | 2 +- .../csv/server/__tests__/execute_job.js | 4 +- .../server/lib/__tests__/field_format_map.js | 4 +- x-pack/plugins/rollup/public/index.scss | 2 +- .../plugins/searchprofiler/public/index.scss | 2 +- x-pack/plugins/security/public/index.scss | 2 +- x-pack/plugins/spaces/index.ts | 2 +- x-pack/plugins/spaces/public/index.scss | 2 +- .../saved_objects_client_wrapper_factory.ts | 2 +- .../spaces_saved_objects_client.ts | 2 +- .../lib/space_request_interceptors.test.ts | 2 +- .../plugins/upgrade_assistant/common/types.ts | 2 +- .../upgrade_assistant/public/index.scss | 2 +- .../server/lib/reindexing/reindex_actions.ts | 2 +- .../server/lib/reindexing/worker.ts | 4 +- .../server/lib/telemetry/usage_collector.ts | 2 +- .../server/routes/reindex_indices.ts | 2 +- x-pack/plugins/watcher/public/index.scss | 2 +- x-pack/tasks/helpers/get_plugins.js | 2 +- x-pack/tsconfig.json | 2 +- 226 files changed, 354 insertions(+), 357 deletions(-) diff --git a/.eslintignore b/.eslintignore index 12eea6545833c28..9a0d3d6a09752d3 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,12 +7,12 @@ bower_components /optimize /built_assets /src/fixtures/vislib/mock_data -/src/ui/public/angular-bootstrap -/src/ui/public/flot-charts +/src/legacy/ui/public/angular-bootstrap +/src/legacy/ui/public/flot-charts /test/fixtures/scenarios /src/legacy/core_plugins/console/public/webpackShims /src/legacy/core_plugins/console/public/tests/webpackShims -/src/ui/public/utils/decode_geo_hash.js +/src/legacy/ui/public/utils/decode_geo_hash.js /src/legacy/core_plugins/timelion/public/webpackShims/jquery.flot.* /src/core/lib/kbn_internal_native_observable /packages/*/target diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index df20069c792794f..eb886ad4388773e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -17,7 +17,7 @@ # Security /x-pack/plugins/security/ @elastic/kibana-security /x-pack/plugins/spaces/ @elastic/kibana-security -/src/server/csp/ @elastic/kibana-security +/src/legacy/server/csp/ @elastic/kibana-security # Design **/*.scss @elastic/kibana-design diff --git a/.i18nrc.json b/.i18nrc.json index fb3d83f561d7ba9..1b4faf34a7a3c02 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -1,7 +1,7 @@ { "paths": { - "common.ui": "src/ui", - "server": "src/server", + "common.ui": "src/legacy/ui", + "server": "src/legacy/server", "console": "src/legacy/core_plugins/console", "core": "src/core", "inputControl": "src/legacy/core_plugins/input_control_vis", @@ -47,8 +47,8 @@ }, "exclude": [ "src/core/public/fatal_errors/get_error_info.ts", - "src/ui/ui_render/bootstrap/app_bootstrap.js", - "src/ui/ui_render/ui_render_mixin.js", + "src/legacy/ui/ui_render/bootstrap/app_bootstrap.js", + "src/legacy/ui/ui_render/ui_render_mixin.js", "x-pack/plugins/infra/public/graphql/types.ts", "x-pack/plugins/infra/public/utils/loading_state/loading_result.ts", "x-pack/plugins/infra/server/graphql/types.ts", diff --git a/README.md b/README.md index e075818dfd97226..2d33cd218b3dace 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ out an open PR: - [CONTRIBUTING.md](CONTRIBUTING.md) will help you get Kibana up and running. - If you would like to contribute code, please follow our [STYLEGUIDE.md](STYLEGUIDE.md). -- Learn more about our UI code with [UI_SYSTEMS.md](src/ui/public/UI_SYSTEMS.md). +- Learn more about our UI code with [UI_SYSTEMS.md](src/legacy/ui/public/UI_SYSTEMS.md). - For all other questions, check out the [FAQ.md](FAQ.md) and [wiki](https://github.com/elastic/kibana/wiki). diff --git a/docs/development/core/development-modules.asciidoc b/docs/development/core/development-modules.asciidoc index eb08c698cf5e8ba..603c0f2952d0cb5 100644 --- a/docs/development/core/development-modules.asciidoc +++ b/docs/development/core/development-modules.asciidoc @@ -14,13 +14,13 @@ modules. The sole purpose of these modules is to extend the environment with certain components. Here is a breakdown of those modules: - *`import 'ui/autoload/styles'`* - Imports all styles at the root of `src/ui/public/styles` + Imports all styles at the root of `src/legacy/ui/public/styles` - *`import 'ui/autoload/directives'`* - Imports all directives in `src/ui/public/directives` + Imports all directives in `src/legacy/ui/public/directives` - *`import 'ui/autoload/filters'`* - Imports all filters in `src/ui/public/filters` + Imports all filters in `src/legacy/ui/public/filters` - *`import 'ui/autoload/modules'`* Imports angular and several ui services and "components" which Kibana @@ -38,7 +38,7 @@ Kibana uses Webpack to bundle Kibana's dependencies. Here is how import/require statements are resolved to a file: -. Check the beginning of the module path +. Check the beginning of the module path * if the path starts with a '.' ** append it the directory of the current file ** proceed to *3* diff --git a/docs/development/visualize/development-embedding-visualizations.asciidoc b/docs/development/visualize/development-embedding-visualizations.asciidoc index 4748f3b546b1315..1c275e7831f74be 100644 --- a/docs/development/visualize/development-embedding-visualizations.asciidoc +++ b/docs/development/visualize/development-embedding-visualizations.asciidoc @@ -35,7 +35,7 @@ For a more complex use-case you usually want to use that method. `params` is a parameter object specifying several parameters, that influence rendering. You will find a detailed description of all the parameters in the inline docs -in the {repo}blob/{branch}/src/ui/public/visualize/loader/types.ts[loader source code]. +in the {repo}blob/{branch}/src/legacy/ui/public/visualize/loader/types.ts[loader source code]. Both methods return an `EmbeddedVisualizeHandler`, that gives you some access to the visualization. The `embedVisualizationWithSavedObject` method will return @@ -55,4 +55,4 @@ The returned `EmbeddedVisualizeHandler` itself has the following methods and pro - `removeRenderCompleteListener(listener)`: removes an event listener from the handler again You can find the detailed `EmbeddedVisualizeHandler` documentation in its -{repo}blob/{branch}/src/ui/public/visualize/loader/embedded_visualize_handler.ts[source code]. \ No newline at end of file +{repo}blob/{branch}/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts[source code]. \ No newline at end of file diff --git a/kibana.d.ts b/kibana.d.ts index 2794ff705600d66..6364b5d75cc550e 100644 --- a/kibana.d.ts +++ b/kibana.d.ts @@ -25,7 +25,7 @@ export * from './target/types/type_exports'; * All exports from TS ambient definitions (where types are added for JS source in a .d.ts file). */ import * as LegacyElasticsearch from './src/legacy/core_plugins/elasticsearch'; -import * as LegacyKibanaServer from './src/server/kbn_server'; +import * as LegacyKibanaServer from './src/legacy/server/kbn_server'; /** * Re-export legacy types under a namespace. diff --git a/packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js b/packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js index d21fe0416e4564b..c51168ae2d91c3c 100755 --- a/packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js +++ b/packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js @@ -26,8 +26,8 @@ exports.getWebpackConfig = function(kibanaPath, projectRoot, config) { const fromKibana = (...path) => resolve(kibanaPath, ...path); const alias = { - // Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/ui/ui_bundler_env.js#L30-L36 - ui: fromKibana('src/ui/public'), + // Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/legacy/ui/ui_bundler_env.js#L30-L36 + ui: fromKibana('src/legacy/ui/public'), test_harness: fromKibana('src/test_harness/public'), querystring: 'querystring-browser', moment$: fromKibana('webpackShims/moment'), diff --git a/packages/kbn-i18n/README.md b/packages/kbn-i18n/README.md index a78e2ef39012306..27dc80120adc5b2 100644 --- a/packages/kbn-i18n/README.md +++ b/packages/kbn-i18n/README.md @@ -33,7 +33,7 @@ For example: src/legacy/core_plugins/kibana/translations/fr.json ``` -The engine scans `x-pack/plugins/*/translations`, `src/core_plugins/*/translations`, `plugins/*/translations` and `src/ui/translations` folders on initialization, so there is no need to register translation files. +The engine scans `x-pack/plugins/*/translations`, `src/core_plugins/*/translations`, `plugins/*/translations` and `src/legacy/ui/translations` folders on initialization, so there is no need to register translation files. The engine uses a `config/kibana.yml` file for locale resolution process. If locale is defined via `i18n.locale` option in `config/kibana.yml` then it will be used as a base diff --git a/src/cli/cli.js b/src/cli/cli.js index 68cf8017ce36907..6b6d45ed2eb3eda 100644 --- a/src/cli/cli.js +++ b/src/cli/cli.js @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { pkg } from '../utils'; +import { pkg } from '../legacy/utils'; import Command from './command'; import serveCommand from './serve/serve'; diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index 59b66c960ff3311..95b92eb90ed1ca0 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -27,8 +27,8 @@ import { first, mapTo, filter, map, take } from 'rxjs/operators'; import Log from '../log'; import Worker from './worker'; -import { Config } from '../../server/config/config'; -import { transformDeprecations } from '../../server/config/transform_deprecations'; +import { Config } from '../../legacy/server/config/config'; +import { transformDeprecations } from '../../legacy/server/config/transform_deprecations'; process.env.kbnWorkerType = 'managr'; @@ -160,13 +160,13 @@ export default class ClusterManager { setupWatching(extraPaths, extraIgnores) { const chokidar = require('chokidar'); - const { fromRoot } = require('../../utils'); + const { fromRoot } = require('../../legacy/utils'); const watchPaths = [ fromRoot('src/legacy/core_plugins'), - fromRoot('src/server'), - fromRoot('src/ui'), - fromRoot('src/utils'), + fromRoot('src/legacy/server'), + fromRoot('src/legacy/ui'), + fromRoot('src/legacy/utils'), fromRoot('x-pack/common'), fromRoot('x-pack/plugins'), fromRoot('x-pack/server'), diff --git a/src/cli/cluster/worker.js b/src/cli/cluster/worker.js index 375789428b156bd..8eca55a08af2ca8 100644 --- a/src/cli/cluster/worker.js +++ b/src/cli/cluster/worker.js @@ -21,7 +21,7 @@ import _ from 'lodash'; import cluster from 'cluster'; import { EventEmitter } from 'events'; -import { BinderFor, fromRoot } from '../../utils'; +import { BinderFor, fromRoot } from '../../legacy/utils'; const cliPath = fromRoot('src/cli'); const baseArgs = _.difference(process.argv.slice(2), ['--no-watch']); diff --git a/src/cli/serve/integration_tests/reload_logging_config.test.js b/src/cli/serve/integration_tests/reload_logging_config.test.js index d9ed72f91f7cfcd..f3922b30ab70914 100644 --- a/src/cli/serve/integration_tests/reload_logging_config.test.js +++ b/src/cli/serve/integration_tests/reload_logging_config.test.js @@ -25,7 +25,7 @@ import mkdirp from 'mkdirp'; import rimraf from 'rimraf'; import { safeDump } from 'js-yaml'; -import { createMapStream, createSplitStream, createPromiseFromStreams } from '../../../utils/streams'; +import { createMapStream, createSplitStream, createPromiseFromStreams } from '../../../legacy/utils/streams'; import { getConfigFromFiles } from '../../../core/server/config/read_config'; const testConfigFile = follow('__fixtures__/reload_logging_config/kibana.test.yml'); diff --git a/src/cli/serve/read_keystore.js b/src/cli/serve/read_keystore.js index feefce22ab2c2f1..b5b580cbc2d73ac 100644 --- a/src/cli/serve/read_keystore.js +++ b/src/cli/serve/read_keystore.js @@ -20,8 +20,8 @@ import path from 'path'; import { set } from 'lodash'; -import { Keystore } from '../../server/keystore'; -import { getData } from '../../server/path'; +import { Keystore } from '../../legacy/server/keystore'; +import { getData } from '../../legacy/server/path'; export function readKeystore(dataPath = getData()) { const keystore = new Keystore(path.join(dataPath, 'kibana.keystore')); diff --git a/src/cli/serve/read_keystore.test.js b/src/cli/serve/read_keystore.test.js index 0702df78132bf0b..d303108415462fb 100644 --- a/src/cli/serve/read_keystore.test.js +++ b/src/cli/serve/read_keystore.test.js @@ -20,8 +20,8 @@ import path from 'path'; import { readKeystore } from './read_keystore'; -jest.mock('../../server/keystore'); -import { Keystore } from '../../server/keystore'; +jest.mock('../../legacy/server/keystore'); +import { Keystore } from '../../legacy/server/keystore'; describe('cli/serve/read_keystore', () => { beforeEach(() => { diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js index 387252ce2dbd4fd..f23805863803249 100644 --- a/src/cli/serve/serve.js +++ b/src/cli/serve/serve.js @@ -21,8 +21,8 @@ import _ from 'lodash'; import { statSync, lstatSync, realpathSync } from 'fs'; import { resolve } from 'path'; -import { fromRoot } from '../../utils'; -import { getConfig } from '../../server/path'; +import { fromRoot } from '../../legacy/utils'; +import { getConfig } from '../../legacy/server/path'; import { bootstrap } from '../../core/server'; import { readKeystore } from './read_keystore'; diff --git a/src/cli_keystore/add.js b/src/cli_keystore/add.js index 84441ae718ff608..17bbc5708cb7f57 100644 --- a/src/cli_keystore/add.js +++ b/src/cli_keystore/add.js @@ -18,8 +18,8 @@ */ import Logger from '../cli_plugin/lib/logger'; -import { confirm, question } from '../server/utils'; -import { createPromiseFromStreams, createConcatStream } from '../utils'; +import { confirm, question } from '../legacy/server/utils'; +import { createPromiseFromStreams, createConcatStream } from '../legacy/utils'; /** * @param {Keystore} keystore diff --git a/src/cli_keystore/add.test.js b/src/cli_keystore/add.test.js index 71d8379b26438bb..b847f91b67f4179 100644 --- a/src/cli_keystore/add.test.js +++ b/src/cli_keystore/add.test.js @@ -38,10 +38,10 @@ jest.mock('fs', () => ({ import sinon from 'sinon'; import { PassThrough } from 'stream'; -import { Keystore } from '../server/keystore'; +import { Keystore } from '../legacy/server/keystore'; import { add } from './add'; import Logger from '../cli_plugin/lib/logger'; -import * as prompt from '../server/utils/prompt'; +import * as prompt from '../legacy/server/utils/prompt'; describe('Kibana keystore', () => { describe('add', () => { diff --git a/src/cli_keystore/cli_keystore.js b/src/cli_keystore/cli_keystore.js index af67bf2638c6708..823d7bd4f44ebdd 100644 --- a/src/cli_keystore/cli_keystore.js +++ b/src/cli_keystore/cli_keystore.js @@ -19,10 +19,10 @@ import { join } from 'path'; -import { pkg } from '../utils'; +import { pkg } from '../legacy/utils'; import Command from '../cli/command'; -import { getData } from '../server/path'; -import { Keystore } from '../server/keystore'; +import { getData } from '../legacy/server/path'; +import { Keystore } from '../legacy/server/keystore'; const path = join(getData(), 'kibana.keystore'); const keystore = new Keystore(path); diff --git a/src/cli_keystore/create.js b/src/cli_keystore/create.js index 89a1a6e6d0bd1b7..1af0959821f80d6 100644 --- a/src/cli_keystore/create.js +++ b/src/cli_keystore/create.js @@ -18,7 +18,7 @@ */ import Logger from '../cli_plugin/lib/logger'; -import { confirm } from '../server/utils'; +import { confirm } from '../legacy/server/utils'; export async function create(keystore, command, options) { const logger = new Logger(options); diff --git a/src/cli_keystore/create.test.js b/src/cli_keystore/create.test.js index d0650640d2435db..cd1d373fd410da1 100644 --- a/src/cli_keystore/create.test.js +++ b/src/cli_keystore/create.test.js @@ -37,10 +37,10 @@ jest.mock('fs', () => ({ import sinon from 'sinon'; -import { Keystore } from '../server/keystore'; +import { Keystore } from '../legacy/server/keystore'; import { create } from './create'; import Logger from '../cli_plugin/lib/logger'; -import * as prompt from '../server/utils/prompt'; +import * as prompt from '../legacy/server/utils/prompt'; describe('Kibana keystore', () => { describe('create', () => { diff --git a/src/cli_keystore/list.test.js b/src/cli_keystore/list.test.js index 46dd56e5149c8d7..668340639472213 100644 --- a/src/cli_keystore/list.test.js +++ b/src/cli_keystore/list.test.js @@ -35,7 +35,7 @@ jest.mock('fs', () => ({ })); import sinon from 'sinon'; -import { Keystore } from '../server/keystore'; +import { Keystore } from '../legacy/server/keystore'; import { list } from './list'; import Logger from '../cli_plugin/lib/logger'; diff --git a/src/cli_keystore/remove.test.js b/src/cli_keystore/remove.test.js index 03116b6e42796ba..8f024ff4f4a2aeb 100644 --- a/src/cli_keystore/remove.test.js +++ b/src/cli_keystore/remove.test.js @@ -29,7 +29,7 @@ jest.mock('fs', () => ({ import sinon from 'sinon'; -import { Keystore } from '../server/keystore'; +import { Keystore } from '../legacy/server/keystore'; import { remove } from './remove'; describe('Kibana keystore', () => { diff --git a/src/cli_plugin/cli.js b/src/cli_plugin/cli.js index 223f8e6e4764c95..e4e49a0e2996787 100644 --- a/src/cli_plugin/cli.js +++ b/src/cli_plugin/cli.js @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { pkg } from '../utils'; +import { pkg } from '../legacy/utils'; import Command from '../cli/command'; import listCommand from './list'; import installCommand from './install'; diff --git a/src/cli_plugin/install/index.js b/src/cli_plugin/install/index.js index 9d119b234b984e0..16927357082ea38 100644 --- a/src/cli_plugin/install/index.js +++ b/src/cli_plugin/install/index.js @@ -17,10 +17,10 @@ * under the License. */ -import { fromRoot, pkg } from '../../utils'; +import { fromRoot, pkg } from '../../legacy/utils'; import install from './install'; import Logger from '../lib/logger'; -import { getConfig } from '../../server/path'; +import { getConfig } from '../../legacy/server/path'; import { parse, parseMilliseconds } from './settings'; import logWarnings from '../lib/log_warnings'; import { warnIfUsingPluginDirOption } from '../lib/warn_if_plugin_dir_option'; diff --git a/src/cli_plugin/install/kibana.js b/src/cli_plugin/install/kibana.js index 18e5884583c12d3..86a018f1c50b292 100644 --- a/src/cli_plugin/install/kibana.js +++ b/src/cli_plugin/install/kibana.js @@ -18,7 +18,7 @@ */ import path from 'path'; -import { versionSatisfies, cleanVersion } from '../../utils/version'; +import { versionSatisfies, cleanVersion } from '../../legacy/utils/version'; import { statSync } from 'fs'; export function existingInstall(settings, logger) { diff --git a/src/cli_plugin/install/settings.test.js b/src/cli_plugin/install/settings.test.js index 083fd240ed4c7bc..9e3da9ee3a492c8 100644 --- a/src/cli_plugin/install/settings.test.js +++ b/src/cli_plugin/install/settings.test.js @@ -17,7 +17,7 @@ * under the License. */ -import { fromRoot } from '../../utils'; +import { fromRoot } from '../../legacy/utils'; import { resolve } from 'path'; import { parseMilliseconds, parse } from './settings'; diff --git a/src/cli_plugin/list/index.js b/src/cli_plugin/list/index.js index 70bf7053843f5db..60965b95ab2ea4e 100644 --- a/src/cli_plugin/list/index.js +++ b/src/cli_plugin/list/index.js @@ -17,7 +17,7 @@ * under the License. */ -import { fromRoot } from '../../utils'; +import { fromRoot } from '../../legacy/utils'; import list from './list'; import Logger from '../lib/logger'; import { parse } from './settings'; diff --git a/src/cli_plugin/list/settings.test.js b/src/cli_plugin/list/settings.test.js index 1b765064573affe..38ec96dff1770ab 100644 --- a/src/cli_plugin/list/settings.test.js +++ b/src/cli_plugin/list/settings.test.js @@ -17,7 +17,7 @@ * under the License. */ -import { fromRoot } from '../../utils'; +import { fromRoot } from '../../legacy/utils'; import { parse } from './settings'; describe('kibana cli', function () { diff --git a/src/cli_plugin/remove/index.js b/src/cli_plugin/remove/index.js index 52c46173d41a4a4..8937ade8d162ff9 100644 --- a/src/cli_plugin/remove/index.js +++ b/src/cli_plugin/remove/index.js @@ -17,11 +17,11 @@ * under the License. */ -import { fromRoot } from '../../utils'; +import { fromRoot } from '../../legacy/utils'; import remove from './remove'; import Logger from '../lib/logger'; import { parse } from './settings'; -import { getConfig } from '../../server/path'; +import { getConfig } from '../../legacy/server/path'; import logWarnings from '../lib/log_warnings'; import { warnIfUsingPluginDirOption } from '../lib/warn_if_plugin_dir_option'; diff --git a/src/cli_plugin/remove/settings.test.js b/src/cli_plugin/remove/settings.test.js index 984caaf3be3ec0b..8cf8ff1d72c5c42 100644 --- a/src/cli_plugin/remove/settings.test.js +++ b/src/cli_plugin/remove/settings.test.js @@ -17,7 +17,7 @@ * under the License. */ -import { fromRoot } from '../../utils'; +import { fromRoot } from '../../legacy/utils'; import { parse } from './settings'; describe('kibana cli', function () { diff --git a/src/core/server/config/config_service.test.ts b/src/core/server/config/config_service.test.ts index 086b465b8d42e69..f51989ef9808717 100644 --- a/src/core/server/config/config_service.test.ts +++ b/src/core/server/config/config_service.test.ts @@ -23,7 +23,7 @@ import { BehaviorSubject } from 'rxjs'; import { first } from 'rxjs/operators'; const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); -jest.mock('../../../utils/package_json', () => ({ pkg: mockPackage })); +jest.mock('../../../legacy/utils/package_json', () => ({ pkg: mockPackage })); import { schema, Type, TypeOf } from '@kbn/config-schema'; diff --git a/src/core/server/config/env.test.ts b/src/core/server/config/env.test.ts index 56ff576fd8f31de..34d37509db4560c 100644 --- a/src/core/server/config/env.test.ts +++ b/src/core/server/config/env.test.ts @@ -30,7 +30,7 @@ jest.mock('path', () => ({ })); const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); -jest.mock('../../../utils/package_json', () => ({ pkg: mockPackage })); +jest.mock('../../../legacy/utils/package_json', () => ({ pkg: mockPackage })); import { Env } from '.'; import { getEnvOptions } from './__mocks__/env'; diff --git a/src/core/server/config/env.ts b/src/core/server/config/env.ts index 9850aa7ce48bb35..48843e5bc50dd01 100644 --- a/src/core/server/config/env.ts +++ b/src/core/server/config/env.ts @@ -20,7 +20,7 @@ import { resolve } from 'path'; import process from 'process'; -import { pkg } from '../../../utils/package_json'; +import { pkg } from '../../../legacy/utils/package_json'; export interface PackageInfo { version: string; diff --git a/src/core/server/http/http_tools.ts b/src/core/server/http/http_tools.ts index 30b7631bde564cd..9cdaf64d7812272 100644 --- a/src/core/server/http/http_tools.ts +++ b/src/core/server/http/http_tools.ts @@ -29,7 +29,7 @@ import { HttpConfig } from './http_config'; */ export function getServerOptions(config: HttpConfig, { configureTLS = true } = {}) { // Note that all connection options configured here should be exactly the same - // as in the legacy platform server (see `src/server/http/index`). Any change + // as in the legacy platform server (see `src/legacy/server/http/index`). Any change // SHOULD BE applied in both places. The only exception is TLS-specific options, // that are configured only here. const options: ServerOptions = { diff --git a/src/core/server/legacy_compat/legacy_service.test.ts b/src/core/server/legacy_compat/legacy_service.test.ts index 990534ce9ea916b..56147694ac4e858 100644 --- a/src/core/server/legacy_compat/legacy_service.test.ts +++ b/src/core/server/legacy_compat/legacy_service.test.ts @@ -20,14 +20,14 @@ import { BehaviorSubject, Subject, throwError } from 'rxjs'; jest.mock('./legacy_platform_proxy'); -jest.mock('../../../server/kbn_server'); +jest.mock('../../../legacy/server/kbn_server'); jest.mock('../../../cli/cluster/cluster_manager'); import { first } from 'rxjs/operators'; import { LegacyService } from '.'; // @ts-ignore: implicit any for JS file import MockClusterManager from '../../../cli/cluster/cluster_manager'; -import KbnServer from '../../../server/kbn_server'; +import KbnServer from '../../../legacy/server/kbn_server'; import { Config, ConfigService, Env, ObjectToConfigAdapter } from '../config'; import { getEnvOptions } from '../config/__mocks__/env'; import { logger } from '../logging/__mocks__'; diff --git a/src/core/server/legacy_compat/legacy_service.ts b/src/core/server/legacy_compat/legacy_service.ts index f363a84c0823ab5..29da106b7beed83 100644 --- a/src/core/server/legacy_compat/legacy_service.ts +++ b/src/core/server/legacy_compat/legacy_service.ts @@ -117,7 +117,7 @@ export class LegacyService implements CoreService { } private async createKbnServer(config: Config, deps: Deps) { - const KbnServer = require('../../../server/kbn_server'); + const KbnServer = require('../../../legacy/server/kbn_server'); const kbnServer: LegacyKbnServer = new KbnServer(config.toRaw(), { // If core HTTP service is run we'll receive internal server reference and // options that were used to create that server so that we can properly diff --git a/src/core/server/legacy_compat/logging/legacy_logging_server.test.ts b/src/core/server/legacy_compat/logging/legacy_logging_server.test.ts index 21e5db99b4b30a0..6d455888c8119fc 100644 --- a/src/core/server/legacy_compat/logging/legacy_logging_server.test.ts +++ b/src/core/server/legacy_compat/logging/legacy_logging_server.test.ts @@ -17,8 +17,8 @@ * under the License. */ -jest.mock('../../../../server/config'); -jest.mock('../../../../server/logging'); +jest.mock('../../../../legacy/server/config'); +jest.mock('../../../../legacy/server/logging'); import { LogLevel } from '../../logging/log_level'; import { LegacyLoggingServer } from './legacy_logging_server'; diff --git a/src/core/server/legacy_compat/logging/legacy_logging_server.ts b/src/core/server/legacy_compat/logging/legacy_logging_server.ts index de12f5a63fb59a2..1efa2b393fb1578 100644 --- a/src/core/server/legacy_compat/logging/legacy_logging_server.ts +++ b/src/core/server/legacy_compat/logging/legacy_logging_server.ts @@ -20,9 +20,9 @@ import { ServerExtType } from 'hapi'; import Podium from 'podium'; // @ts-ignore: implicit any for JS file -import { Config, transformDeprecations } from '../../../../server/config'; +import { Config, transformDeprecations } from '../../../../legacy/server/config'; // @ts-ignore: implicit any for JS file -import { setupLogging } from '../../../../server/logging'; +import { setupLogging } from '../../../../legacy/server/logging'; import { LogLevel } from '../../logging/log_level'; import { LogRecord } from '../../logging/log_record'; diff --git a/src/core/server/plugins/discovery/plugin_discovery.test.ts b/src/core/server/plugins/discovery/plugin_discovery.test.ts index ccd5dd6ef5c702c..e7a54ccce7fee01 100644 --- a/src/core/server/plugins/discovery/plugin_discovery.test.ts +++ b/src/core/server/plugins/discovery/plugin_discovery.test.ts @@ -27,7 +27,7 @@ jest.mock('fs', () => ({ })); const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); -jest.mock('../../../../utils/package_json', () => ({ pkg: mockPackage })); +jest.mock('../../../../legacy/utils/package_json', () => ({ pkg: mockPackage })); import { resolve } from 'path'; import { BehaviorSubject } from 'rxjs'; diff --git a/src/core/server/plugins/plugins_service.test.ts b/src/core/server/plugins/plugins_service.test.ts index 37870ac98571008..9ab4c41bb9f308a 100644 --- a/src/core/server/plugins/plugins_service.test.ts +++ b/src/core/server/plugins/plugins_service.test.ts @@ -18,7 +18,7 @@ */ const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); -jest.mock('../../../utils/package_json', () => ({ pkg: mockPackage })); +jest.mock('../../../legacy/utils/package_json', () => ({ pkg: mockPackage })); const mockDiscover = jest.fn(); jest.mock('./discovery/plugins_discovery', () => ({ discover: mockDiscover })); diff --git a/src/dev/build/lib/exec.js b/src/dev/build/lib/exec.js index e74f949a803c0a6..57dced92ca6255a 100644 --- a/src/dev/build/lib/exec.js +++ b/src/dev/build/lib/exec.js @@ -20,7 +20,7 @@ import execa from 'execa'; import chalk from 'chalk'; -import { watchStdioForLine } from '../../../utils'; +import { watchStdioForLine } from '../../../legacy/utils'; export async function exec(log, cmd, args, options = {}) { const { diff --git a/src/dev/build/lib/fs.js b/src/dev/build/lib/fs.js index cbc87d09d80d351..cc0f5975a2de99c 100644 --- a/src/dev/build/lib/fs.js +++ b/src/dev/build/lib/fs.js @@ -28,7 +28,7 @@ import { promisify } from 'bluebird'; import mkdirpCb from 'mkdirp'; import del from 'del'; import deleteEmpty from 'delete-empty'; -import { createPromiseFromStreams, createMapStream } from '../../../utils'; +import { createPromiseFromStreams, createMapStream } from '../../../legacy/utils'; import { Extract } from 'tar'; diff --git a/src/dev/build/tasks/transpile_babel_task.js b/src/dev/build/tasks/transpile_babel_task.js index 59a65dc2785b665..1ea3d815839180a 100644 --- a/src/dev/build/tasks/transpile_babel_task.js +++ b/src/dev/build/tasks/transpile_babel_task.js @@ -20,7 +20,7 @@ import gulpBabel from 'gulp-babel'; import vfs from 'vinyl-fs'; -import { createPromiseFromStreams } from '../../../utils'; +import { createPromiseFromStreams } from '../../../legacy/utils'; export const TranspileBabelTask = { description: 'Transpiling sources with babel', diff --git a/src/dev/build/tasks/transpile_scss_task.js b/src/dev/build/tasks/transpile_scss_task.js index 92271b8bec24982..ccc7e29ecf1d09e 100644 --- a/src/dev/build/tasks/transpile_scss_task.js +++ b/src/dev/build/tasks/transpile_scss_task.js @@ -18,9 +18,9 @@ */ import { toArray } from 'rxjs/operators'; -import { buildAll } from '../../../server/sass/build_all'; -import { findPluginSpecs } from '../../../plugin_discovery/find_plugin_specs'; -import { collectUiExports } from '../../../ui/ui_exports/collect_ui_exports'; +import { buildAll } from '../../../legacy/server/sass/build_all'; +import { findPluginSpecs } from '../../../legacy/plugin_discovery/find_plugin_specs'; +import { collectUiExports } from '../../../legacy/ui/ui_exports/collect_ui_exports'; export const TranspileScssTask = { description: 'Transpiling SCSS to CSS', diff --git a/src/dev/failed_tests/report.js b/src/dev/failed_tests/report.js index 0aa6fb472ef7217..aca70659a9d09ed 100644 --- a/src/dev/failed_tests/report.js +++ b/src/dev/failed_tests/report.js @@ -19,7 +19,7 @@ import xml2js from 'xml2js'; import vfs from 'vinyl-fs'; -import { createMapStream } from '../../utils/streams'; +import { createMapStream } from '../../legacy/utils/streams'; import { getGithubClient, markdownMetadata, paginate } from '../github_utils'; import { find } from 'lodash'; import stripAnsi from 'strip-ansi'; diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js index 438035773125c9f..3093af827d70e9e 100644 --- a/src/dev/jest/config.js +++ b/src/dev/jest/config.js @@ -20,16 +20,16 @@ export default { rootDir: '../../..', roots: [ - '/src/ui', + '/src/legacy/ui', '/src/core', '/src/legacy/core_plugins', - '/src/server', + '/src/legacy/server', '/src/cli', '/src/cli_keystore', '/src/cli_plugin', '/src/functional_test_runner', '/src/dev', - '/src/utils', + '/src/legacy/utils', '/src/setup_node_env', '/packages', '/src/test_utils', @@ -43,7 +43,7 @@ export default { '!packages/kbn-ui-framework/src/services/**/*/index.js', ], moduleNameMapper: { - '^ui/(.*)': '/src/ui/public/$1', + '^ui/(.*)': '/src/legacy/ui/public/$1', '^test_utils/(.*)': '/src/test_utils/public/$1', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/src/dev/jest/mocks/file_mock.js', '\\.(css|less|scss)$': '/src/dev/jest/mocks/style_mock.js', diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js index 37aaf662ac38b10..25e9387b44bd5b1 100644 --- a/src/dev/precommit_hook/casing_check_config.js +++ b/src/dev/precommit_hook/casing_check_config.js @@ -42,7 +42,7 @@ export const IGNORE_FILE_GLOBS = [ '**/{webpackShims,__mocks__}/**/*', 'x-pack/docs/**/*', 'src/dev/tslint/rules/*', - 'src/ui/public/assets/fonts/**/*', + 'src/legacy/ui/public/assets/fonts/**/*', // filename must match language code which requires capital letters '**/translations/*.json', @@ -68,7 +68,7 @@ export const KEBAB_CASE_DIRECTORY_GLOBS = [ * When a file in one of these directories is checked, the directory * matched by these patterns is removed from the path before * the casing check so that the files casing is still checked. This - * allows folders like `src/ui/public/flot-charts` to exist, which + * allows folders like `src/legacy/ui/public/flot-charts` to exist, which * is named to match the npm package and follow the kebab-casing * convention there, but allows us to still verify that files within * that directory use snake_case @@ -81,9 +81,9 @@ export const IGNORE_DIRECTORY_GLOBS = [ 'src/babel-*', 'packages/*', 'packages/kbn-ui-framework/generator-kui', - 'src/ui/public/angular-bootstrap', - 'src/ui/public/flot-charts', - 'src/ui/public/utils/lodash-mixins', + 'src/legacy/ui/public/angular-bootstrap', + 'src/legacy/ui/public/flot-charts', + 'src/legacy/ui/public/utils/lodash-mixins', 'test/functional/fixtures/es_archiver/visualize_source-filters', 'packages/kbn-pm/src/utils/__fixtures__/*', 'x-pack/dev-tools', @@ -127,60 +127,60 @@ export const TEMPORARILY_IGNORED_PATHS = [ 'src/legacy/core_plugins/timelion/server/series_functions/__tests__/fixtures/tlConfig.js', 'src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json', 'src/fixtures/vislib/mock_data/terms/_seriesMultiple.js', - 'src/ui/public/angular-bootstrap/accordion/accordion-group.html', - 'src/ui/public/angular-bootstrap/bindHtml/bindHtml.js', - 'src/ui/public/angular-bootstrap/tooltip/tooltip-html-unsafe-popup.html', - 'src/ui/public/angular-bootstrap/tooltip/tooltip-popup.html', - 'src/ui/public/angular-bootstrap/typeahead/typeahead-match.html', - 'src/ui/public/angular-bootstrap/typeahead/typeahead-popup.html', - 'src/ui/public/assets/favicons/android-chrome-192x192.png', - 'src/ui/public/assets/favicons/android-chrome-256x256.png', - 'src/ui/public/assets/favicons/android-chrome-512x512.png', - 'src/ui/public/assets/favicons/apple-touch-icon.png', - 'src/ui/public/assets/favicons/favicon-16x16.png', - 'src/ui/public/assets/favicons/favicon-32x32.png', - 'src/ui/public/assets/favicons/mstile-70x70.png', - 'src/ui/public/assets/favicons/mstile-144x144.png', - 'src/ui/public/assets/favicons/mstile-150x150.png', - 'src/ui/public/assets/favicons/mstile-310x150.png', - 'src/ui/public/assets/favicons/mstile-310x310.png', - 'src/ui/public/assets/favicons/safari-pinned-tab.svg', - 'src/ui/public/directives/__tests__/confirm-click.js', - 'src/ui/public/field_format_editor/editors/url/icons/flag-icon.LICENSE', - 'src/ui/public/icons/beats-color.svg', - 'src/ui/public/icons/beats-gray.svg', - 'src/ui/public/icons/elasticsearch-color.svg', - 'src/ui/public/icons/elasticsearch-gray.svg', - 'src/ui/public/icons/kibana-color.svg', - 'src/ui/public/icons/kibana-gray.svg', - 'src/ui/public/icons/logstash-color.svg', - 'src/ui/public/icons/logstash-gray.svg', - 'src/ui/public/icons/security-gray.svg', - 'src/ui/public/query_bar/lib/queryLanguages.js', - 'src/ui/public/styles/bootstrap/component-animations.less', - 'src/ui/public/styles/bootstrap/input-groups.less', - 'src/ui/public/styles/bootstrap/list-group.less', - 'src/ui/public/styles/bootstrap/mixins/background-variant.less', - 'src/ui/public/styles/bootstrap/mixins/border-radius.less', - 'src/ui/public/styles/bootstrap/mixins/center-block.less', - 'src/ui/public/styles/bootstrap/mixins/grid-framework.less', - 'src/ui/public/styles/bootstrap/mixins/hide-text.less', - 'src/ui/public/styles/bootstrap/mixins/list-group.less', - 'src/ui/public/styles/bootstrap/mixins/nav-divider.less', - 'src/ui/public/styles/bootstrap/mixins/nav-vertical-align.less', - 'src/ui/public/styles/bootstrap/mixins/progress-bar.less', - 'src/ui/public/styles/bootstrap/mixins/reset-filter.less', - 'src/ui/public/styles/bootstrap/mixins/reset-text.less', - 'src/ui/public/styles/bootstrap/mixins/responsive-visibility.less', - 'src/ui/public/styles/bootstrap/mixins/tab-focus.less', - 'src/ui/public/styles/bootstrap/mixins/table-row.less', - 'src/ui/public/styles/bootstrap/mixins/text-emphasis.less', - 'src/ui/public/styles/bootstrap/mixins/text-overflow.less', - 'src/ui/public/styles/bootstrap/mixins/vendor-prefixes.less', - 'src/ui/public/styles/bootstrap/progress-bars.less', - 'src/ui/public/styles/bootstrap/responsive-utilities.less', - 'src/ui/public/typeahead/partials/typeahead-items.html', - 'src/ui/public/utils/migrate_legacy_query.js', + 'src/legacy/ui/public/angular-bootstrap/accordion/accordion-group.html', + 'src/legacy/ui/public/angular-bootstrap/bindHtml/bindHtml.js', + 'src/legacy/ui/public/angular-bootstrap/tooltip/tooltip-html-unsafe-popup.html', + 'src/legacy/ui/public/angular-bootstrap/tooltip/tooltip-popup.html', + 'src/legacy/ui/public/angular-bootstrap/typeahead/typeahead-match.html', + 'src/legacy/ui/public/angular-bootstrap/typeahead/typeahead-popup.html', + 'src/legacy/ui/public/assets/favicons/android-chrome-192x192.png', + 'src/legacy/ui/public/assets/favicons/android-chrome-256x256.png', + 'src/legacy/ui/public/assets/favicons/android-chrome-512x512.png', + 'src/legacy/ui/public/assets/favicons/apple-touch-icon.png', + 'src/legacy/ui/public/assets/favicons/favicon-16x16.png', + 'src/legacy/ui/public/assets/favicons/favicon-32x32.png', + 'src/legacy/ui/public/assets/favicons/mstile-70x70.png', + 'src/legacy/ui/public/assets/favicons/mstile-144x144.png', + 'src/legacy/ui/public/assets/favicons/mstile-150x150.png', + 'src/legacy/ui/public/assets/favicons/mstile-310x150.png', + 'src/legacy/ui/public/assets/favicons/mstile-310x310.png', + 'src/legacy/ui/public/assets/favicons/safari-pinned-tab.svg', + 'src/legacy/ui/public/directives/__tests__/confirm-click.js', + 'src/legacy/ui/public/field_format_editor/editors/url/icons/flag-icon.LICENSE', + 'src/legacy/ui/public/icons/beats-color.svg', + 'src/legacy/ui/public/icons/beats-gray.svg', + 'src/legacy/ui/public/icons/elasticsearch-color.svg', + 'src/legacy/ui/public/icons/elasticsearch-gray.svg', + 'src/legacy/ui/public/icons/kibana-color.svg', + 'src/legacy/ui/public/icons/kibana-gray.svg', + 'src/legacy/ui/public/icons/logstash-color.svg', + 'src/legacy/ui/public/icons/logstash-gray.svg', + 'src/legacy/ui/public/icons/security-gray.svg', + 'src/legacy/ui/public/query_bar/lib/queryLanguages.js', + 'src/legacy/ui/public/styles/bootstrap/component-animations.less', + 'src/legacy/ui/public/styles/bootstrap/input-groups.less', + 'src/legacy/ui/public/styles/bootstrap/list-group.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/background-variant.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/border-radius.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/center-block.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/grid-framework.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/hide-text.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/list-group.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/nav-divider.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/nav-vertical-align.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/progress-bar.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/reset-filter.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/reset-text.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/responsive-visibility.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/tab-focus.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/table-row.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/text-emphasis.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/text-overflow.less', + 'src/legacy/ui/public/styles/bootstrap/mixins/vendor-prefixes.less', + 'src/legacy/ui/public/styles/bootstrap/progress-bars.less', + 'src/legacy/ui/public/styles/bootstrap/responsive-utilities.less', + 'src/legacy/ui/public/typeahead/partials/typeahead-items.html', + 'src/legacy/ui/public/utils/migrate_legacy_query.js', 'test/functional/apps/management/exports/_import_objects-conflicts.json', 'packages/kbn-ui-framework/doc_site/src/images/elastic-logo.svg', 'packages/kbn-ui-framework/doc_site/src/images/hint-arrow.svg', diff --git a/src/es_archiver/actions/edit.js b/src/es_archiver/actions/edit.js index d1834915922c357..cef88b4f0312d5f 100644 --- a/src/es_archiver/actions/edit.js +++ b/src/es_archiver/actions/edit.js @@ -23,7 +23,7 @@ import { createGunzip, createGzip, Z_BEST_COMPRESSION } from 'zlib'; import { promisify } from 'util'; import globby from 'globby'; -import { createPromiseFromStreams } from '../../utils'; +import { createPromiseFromStreams } from '../../legacy/utils'; const unlinkAsync = promisify(Fs.unlink); diff --git a/src/es_archiver/actions/load.js b/src/es_archiver/actions/load.js index cc3cf8f789b043c..4bd43227e2a5823 100644 --- a/src/es_archiver/actions/load.js +++ b/src/es_archiver/actions/load.js @@ -23,7 +23,7 @@ import { createReadStream } from 'fs'; import { createPromiseFromStreams, concatStreamProviders, -} from '../../utils'; +} from '../../legacy/utils'; import { isGzip, diff --git a/src/es_archiver/actions/rebuild_all.js b/src/es_archiver/actions/rebuild_all.js index c2e593c2cbd9499..6cba4b8e4b66aa6 100644 --- a/src/es_archiver/actions/rebuild_all.js +++ b/src/es_archiver/actions/rebuild_all.js @@ -34,7 +34,7 @@ import { fromNode } from 'bluebird'; import { createPromiseFromStreams -} from '../../utils'; +} from '../../legacy/utils'; import { prioritizeMappings, diff --git a/src/es_archiver/actions/save.js b/src/es_archiver/actions/save.js index 5910190f17de36a..abf7256b78b3734 100644 --- a/src/es_archiver/actions/save.js +++ b/src/es_archiver/actions/save.js @@ -26,7 +26,7 @@ import mkdirp from 'mkdirp'; import { createListStream, createPromiseFromStreams, -} from '../../utils'; +} from '../../legacy/utils'; import { createStats, diff --git a/src/es_archiver/actions/unload.js b/src/es_archiver/actions/unload.js index b6f9285e640f952..2cd5dbeee0a6025 100644 --- a/src/es_archiver/actions/unload.js +++ b/src/es_archiver/actions/unload.js @@ -22,7 +22,7 @@ import { createReadStream } from 'fs'; import { createPromiseFromStreams -} from '../../utils'; +} from '../../legacy/utils'; import { isGzip, diff --git a/src/es_archiver/lib/archives/__tests__/format.js b/src/es_archiver/lib/archives/__tests__/format.js index 78bb28542f3f18f..53da1718c89268a 100644 --- a/src/es_archiver/lib/archives/__tests__/format.js +++ b/src/es_archiver/lib/archives/__tests__/format.js @@ -26,7 +26,7 @@ import { createListStream, createPromiseFromStreams, createConcatStream, -} from '../../../../utils'; +} from '../../../../legacy/utils'; import { createFormatArchiveStreams } from '../format'; diff --git a/src/es_archiver/lib/archives/__tests__/parse.js b/src/es_archiver/lib/archives/__tests__/parse.js index 506917cac92cdd7..6645df47fc60c68 100644 --- a/src/es_archiver/lib/archives/__tests__/parse.js +++ b/src/es_archiver/lib/archives/__tests__/parse.js @@ -26,7 +26,7 @@ import { createConcatStream, createListStream, createPromiseFromStreams, -} from '../../../../utils'; +} from '../../../../legacy/utils'; import { createParseArchiveStreams } from '../parse'; diff --git a/src/es_archiver/lib/archives/format.js b/src/es_archiver/lib/archives/format.js index d1d5ca68124ccfc..c284b599fc8909e 100644 --- a/src/es_archiver/lib/archives/format.js +++ b/src/es_archiver/lib/archives/format.js @@ -23,7 +23,7 @@ import { PassThrough } from 'stream'; import { createIntersperseStream, createJsonStringifyStream -} from '../../../utils'; +} from '../../../legacy/utils'; import { RECORD_SEPARATOR } from './constants'; diff --git a/src/es_archiver/lib/archives/parse.js b/src/es_archiver/lib/archives/parse.js index db0a2cdc3e28039..2852387a80c189c 100644 --- a/src/es_archiver/lib/archives/parse.js +++ b/src/es_archiver/lib/archives/parse.js @@ -24,7 +24,7 @@ import { createSplitStream, createReplaceStream, createJsonParseStream, -} from '../../../utils'; +} from '../../../legacy/utils'; import { RECORD_SEPARATOR } from './constants'; diff --git a/src/es_archiver/lib/docs/__tests__/generate_doc_records_stream.js b/src/es_archiver/lib/docs/__tests__/generate_doc_records_stream.js index d346d23ab7aa8ab..eae51cc820acdda 100644 --- a/src/es_archiver/lib/docs/__tests__/generate_doc_records_stream.js +++ b/src/es_archiver/lib/docs/__tests__/generate_doc_records_stream.js @@ -25,7 +25,7 @@ import { createListStream, createPromiseFromStreams, createConcatStream, -} from '../../../../utils'; +} from '../../../../legacy/utils'; import { createGenerateDocRecordsStream } from '../generate_doc_records_stream'; import { diff --git a/src/es_archiver/lib/docs/__tests__/index_doc_records_stream.js b/src/es_archiver/lib/docs/__tests__/index_doc_records_stream.js index a32c406f7485db0..a1ff7624d33e3da 100644 --- a/src/es_archiver/lib/docs/__tests__/index_doc_records_stream.js +++ b/src/es_archiver/lib/docs/__tests__/index_doc_records_stream.js @@ -23,7 +23,7 @@ import { delay } from 'bluebird'; import { createListStream, createPromiseFromStreams, -} from '../../../../utils'; +} from '../../../../legacy/utils'; import { createIndexDocRecordsStream } from '../index_doc_records_stream'; import { diff --git a/src/es_archiver/lib/indices/__tests__/create_index_stream.js b/src/es_archiver/lib/indices/__tests__/create_index_stream.js index 3bf1d74804895d0..e705b0065427cb9 100644 --- a/src/es_archiver/lib/indices/__tests__/create_index_stream.js +++ b/src/es_archiver/lib/indices/__tests__/create_index_stream.js @@ -25,7 +25,7 @@ import { createPromiseFromStreams, createConcatStream, createListStream -} from '../../../../utils'; +} from '../../../../legacy/utils'; import { createCreateIndexStream diff --git a/src/es_archiver/lib/indices/__tests__/delete_index_stream.js b/src/es_archiver/lib/indices/__tests__/delete_index_stream.js index 51cc0184e1215ad..8ed2338b67d484a 100644 --- a/src/es_archiver/lib/indices/__tests__/delete_index_stream.js +++ b/src/es_archiver/lib/indices/__tests__/delete_index_stream.js @@ -22,7 +22,7 @@ import sinon from 'sinon'; import { createListStream, createPromiseFromStreams, -} from '../../../../utils'; +} from '../../../../legacy/utils'; import { createDeleteIndexStream, diff --git a/src/es_archiver/lib/indices/__tests__/generate_index_records_stream.js b/src/es_archiver/lib/indices/__tests__/generate_index_records_stream.js index 85cfdfe6f083302..115e7a97f06473a 100644 --- a/src/es_archiver/lib/indices/__tests__/generate_index_records_stream.js +++ b/src/es_archiver/lib/indices/__tests__/generate_index_records_stream.js @@ -24,7 +24,7 @@ import { createListStream, createPromiseFromStreams, createConcatStream, -} from '../../../../utils'; +} from '../../../../legacy/utils'; import { createStubClient, diff --git a/src/es_archiver/lib/indices/kibana_index.js b/src/es_archiver/lib/indices/kibana_index.js index 1573848564af255..26051f6f190e59b 100644 --- a/src/es_archiver/lib/indices/kibana_index.js +++ b/src/es_archiver/lib/indices/kibana_index.js @@ -25,9 +25,9 @@ import { toArray } from 'rxjs/operators'; import wreck from 'wreck'; import { deleteIndex } from './delete_index'; -import { collectUiExports } from '../../../ui/ui_exports'; -import { KibanaMigrator } from '../../../server/saved_objects/migrations'; -import { findPluginSpecs } from '../../../plugin_discovery'; +import { collectUiExports } from '../../../legacy/ui/ui_exports'; +import { KibanaMigrator } from '../../../legacy/server/saved_objects/migrations'; +import { findPluginSpecs } from '../../../legacy/plugin_discovery'; /** * This is an expensive operation, so we'll ensure it only happens once diff --git a/src/es_archiver/lib/records/__tests__/filter_records_stream.js b/src/es_archiver/lib/records/__tests__/filter_records_stream.js index 92090f784b2aea0..90a89424cfa78c4 100644 --- a/src/es_archiver/lib/records/__tests__/filter_records_stream.js +++ b/src/es_archiver/lib/records/__tests__/filter_records_stream.js @@ -24,7 +24,7 @@ import { createListStream, createPromiseFromStreams, createConcatStream, -} from '../../../../utils'; +} from '../../../../legacy/utils'; import { createFilterRecordsStream, diff --git a/src/fixtures/logstash_fields.js b/src/fixtures/logstash_fields.js index c30b72d1cb81ce5..8ce44d2347507f2 100644 --- a/src/fixtures/logstash_fields.js +++ b/src/fixtures/logstash_fields.js @@ -17,8 +17,9 @@ * under the License. */ -import { castEsToKbnFieldTypeName } from '../utils'; -import { shouldReadFieldFromDocValues } from '../server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values'; +import { castEsToKbnFieldTypeName } from '../legacy/utils'; +// eslint-disable-next-line max-len +import { shouldReadFieldFromDocValues } from '../legacy/server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values'; function stubbedLogstashFields() { return [ diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js index b15e67e5ab6711b..b35a153faf1a776 100644 --- a/src/fixtures/stubbed_logstash_index_pattern.js +++ b/src/fixtures/stubbed_logstash_index_pattern.js @@ -19,7 +19,7 @@ import TestUtilsStubIndexPatternProvider from 'test_utils/stub_index_pattern'; import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields'; -import { getKbnFieldType } from '../utils'; +import { getKbnFieldType } from '../legacy/utils'; export default function stubbedLogstashIndexPatternService(Private) { const StubIndexPattern = Private(TestUtilsStubIndexPatternProvider); diff --git a/src/functional_test_runner/lib/config/transform_deprecations.js b/src/functional_test_runner/lib/config/transform_deprecations.js index 4f1f09aa0bed9ed..6bb3cf35ebe3011 100644 --- a/src/functional_test_runner/lib/config/transform_deprecations.js +++ b/src/functional_test_runner/lib/config/transform_deprecations.js @@ -17,7 +17,7 @@ * under the License. */ -import { createTransform, Deprecations } from '../../../deprecation'; +import { createTransform, Deprecations } from '../../../legacy/deprecation'; export const transformDeprecations = createTransform([ Deprecations.unused('servers.webdriver') diff --git a/src/legacy/core_plugins/console/__tests__/index.js b/src/legacy/core_plugins/console/__tests__/index.js index 398a252a747945b..aebb5e16bc6d22e 100644 --- a/src/legacy/core_plugins/console/__tests__/index.js +++ b/src/legacy/core_plugins/console/__tests__/index.js @@ -17,7 +17,7 @@ * under the License. */ -import { Deprecations } from '../../../../deprecation'; +import { Deprecations } from '../../../deprecation'; import expect from 'expect.js'; import index from '../index'; import { noop } from 'lodash'; diff --git a/src/legacy/core_plugins/console/public/index.scss b/src/legacy/core_plugins/console/public/index.scss index 6e3e8b0fcc9b834..625fdf6ada3ebb0 100644 --- a/src/legacy/core_plugins/console/public/index.scss +++ b/src/legacy/core_plugins/console/public/index.scss @@ -1,4 +1,4 @@ -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "con" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/input_control_vis/public/index.scss b/src/legacy/core_plugins/input_control_vis/public/index.scss index 126227098b42d30..ac4692494b92387 100644 --- a/src/legacy/core_plugins/input_control_vis/public/index.scss +++ b/src/legacy/core_plugins/input_control_vis/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "icv" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/inspector_views/public/index.scss b/src/legacy/core_plugins/inspector_views/public/index.scss index a8273138d8d24c8..2fe162d6c498896 100644 --- a/src/legacy/core_plugins/inspector_views/public/index.scss +++ b/src/legacy/core_plugins/inspector_views/public/index.scss @@ -1,4 +1,4 @@ -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "ins" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/boolean.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/boolean.js index 12366aed2637dee..a96409bbce44e4e 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/boolean.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/boolean.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createBoolFormat } from '../boolean'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const BoolFormat = createBoolFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/bytes.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/bytes.js index e4e3ffb39287d66..f0ece59128e045e 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/bytes.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/bytes.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createBytesFormat } from '../bytes'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const BytesFormat = createBytesFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/color.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/color.js index 394432618d47942..e00c4c9cb455c84 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/color.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/color.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createColorFormat } from '../color'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const ColorFormat = createColorFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/date.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/date.js index a4ef18151f81741..45748d0860456fd 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/date.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/date.js @@ -20,7 +20,7 @@ import expect from 'expect.js'; import moment from 'moment-timezone'; import { createDateFormat } from '../date'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const DateFormat = createDateFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/duration.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/duration.js index 79f6860c15dd11b..620668fa94161fa 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/duration.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/duration.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createDurationFormat } from '../duration'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const DurationFormat = createDurationFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/ip.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/ip.js index 0b513d756bf9698..ff3af3b2e301851 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/ip.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/ip.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createIpFormat } from '../ip'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const IpFormat = createIpFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/number.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/number.js index 63418899acc9f3c..100f035ac7d44ff 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/number.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/number.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createNumberFormat } from '../number'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const NumberFormat = createNumberFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/percent.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/percent.js index e7ef14625cddf7f..ad2ba502d605216 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/percent.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/percent.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createPercentFormat } from '../percent'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const PercentFormat = createPercentFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/relative_date.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/relative_date.js index 7134b963efbe031..551da872c77ff30 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/relative_date.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/relative_date.js @@ -20,7 +20,7 @@ import expect from 'expect.js'; import moment from 'moment-timezone'; import { createRelativeDateFormat } from '../relative_date'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const RelativeDateFormat = createRelativeDateFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/string.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/string.js index ed2d3d28462b666..74fb0e1f886b639 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/string.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/string.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createStringFormat } from '../string'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const StringFormat = createStringFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/truncate.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/truncate.js index 0533701df293a1d..ca52dfd01000cc8 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/truncate.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/truncate.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createTruncateFormat } from '../truncate'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const TruncateFormat = createTruncateFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/url.js b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/url.js index 393ffc4516c5776..45fc4ed3dae12bc 100644 --- a/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/url.js +++ b/src/legacy/core_plugins/kibana/common/field_formats/types/__tests__/url.js @@ -19,7 +19,7 @@ import expect from 'expect.js'; import { createUrlFormat } from '../url'; -import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; const UrlFormat = createUrlFormat(FieldFormat); diff --git a/src/legacy/core_plugins/kibana/public/field_formats/__tests__/_conformance.js b/src/legacy/core_plugins/kibana/public/field_formats/__tests__/_conformance.js index 9887dd4bbf764ec..9e1f6015bd35fcd 100644 --- a/src/legacy/core_plugins/kibana/public/field_formats/__tests__/_conformance.js +++ b/src/legacy/core_plugins/kibana/public/field_formats/__tests__/_conformance.js @@ -21,7 +21,7 @@ import _ from 'lodash'; import expect from 'expect.js'; import chrome from 'ui/chrome'; import { fieldFormats } from 'ui/registry/field_formats'; -import { FieldFormat } from '../../../../../../ui/field_formats/field_format'; +import { FieldFormat } from '../../../../../ui/field_formats/field_format'; const config = chrome.getUiSettingsClient(); diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss index b415106ede3bf64..d877183d42ac048 100644 --- a/src/legacy/core_plugins/kibana/public/index.scss +++ b/src/legacy/core_plugins/kibana/public/index.scss @@ -1,7 +1,7 @@ -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Public UI styles -@import 'ui/public/index'; +@import 'src/legacy/ui/public/index'; // Context styles @import './context/index'; @@ -19,7 +19,7 @@ @import './visualize/index'; // Has to come after visualize because of some // bad cascading in the Editor layout -@import 'ui/public/vis/index'; +@import 'src/legacy/ui/public/vis/index'; // Management styles @import './management/index'; diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js index 6f513b46f18ec6d..93b7db9ceed1946 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/_view.js @@ -26,7 +26,7 @@ import uiRoutes from 'ui/routes'; import { uiModules } from 'ui/modules'; import { fatalError, toastNotifications } from 'ui/notify'; import 'ui/accessibility/kbn_ui_ace_keyboard_mode'; -import { castEsToKbnFieldTypeName } from '../../../../../../../utils'; +import { castEsToKbnFieldTypeName } from '../../../../../../../legacy/utils'; import { SavedObjectsClientProvider } from 'ui/saved_objects'; import { isNumeric } from 'ui/utils/numeric'; diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js index 797361b2b7952d4..b7caf81901bdb81 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js +++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js @@ -44,7 +44,7 @@ import { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url'; import { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query'; import { recentlyAccessed } from 'ui/persisted_log'; import { timefilter } from 'ui/timefilter'; -import { getVisualizeLoader } from '../../../../../../ui/public/visualize/loader'; +import { getVisualizeLoader } from '../../../../../ui/public/visualize/loader'; import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share'; import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing'; import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal'; @@ -135,7 +135,7 @@ function VisEditor( // Retrieve the resolved SavedVis instance. const savedVis = $route.current.locals.savedVis; - // vis is instance of src/ui/public/vis/vis.js. + // vis is instance of src/legacy/ui/public/vis/vis.js. // SearchSource is a promise-based stream of search results that can inherit from other search sources. const { vis, searchSource } = savedVis; diff --git a/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.test.ts b/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.test.ts index f5b9b299fd766af..390f6a608725970 100644 --- a/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.test.ts +++ b/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { SavedObject } from '../../../../../../server/saved_objects/service/saved_objects_client'; +import { SavedObject } from '../../../../../server/saved_objects/service/saved_objects_client'; import { collectReferencesDeep } from './collect_references_deep'; const data = [ diff --git a/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.ts b/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.ts index f62fc3c474c0855..7fbcb02a516191f 100644 --- a/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.ts +++ b/src/legacy/core_plugins/kibana/server/lib/export/collect_references_deep.ts @@ -20,7 +20,7 @@ import { SavedObject, SavedObjectsClient, -} from '../../../../../../server/saved_objects/service/saved_objects_client'; +} from '../../../../../server/saved_objects/service/saved_objects_client'; const MAX_BULK_GET_SIZE = 10000; diff --git a/src/legacy/core_plugins/markdown_vis/public/index.scss b/src/legacy/core_plugins/markdown_vis/public/index.scss index d52d2a6caec232d..ebae2d1936a9e9a 100644 --- a/src/legacy/core_plugins/markdown_vis/public/index.scss +++ b/src/legacy/core_plugins/markdown_vis/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "mkd" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/metric_vis/public/index.scss b/src/legacy/core_plugins/metric_vis/public/index.scss index 0a497fa75bbf02b..e4116b69bf0f178 100644 --- a/src/legacy/core_plugins/metric_vis/public/index.scss +++ b/src/legacy/core_plugins/metric_vis/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "mtr" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/metrics/public/components/lib/get_axis_label_string.js b/src/legacy/core_plugins/metrics/public/components/lib/get_axis_label_string.js index 888ac5561409f6a..c19cfffdc4538a1 100644 --- a/src/legacy/core_plugins/metrics/public/components/lib/get_axis_label_string.js +++ b/src/legacy/core_plugins/metrics/public/components/lib/get_axis_label_string.js @@ -17,7 +17,7 @@ * under the License. */ -import { relativeOptions } from '../../../../../../ui/public/timepicker/relative_options'; +import { relativeOptions } from '../../../../../ui/public/timepicker/relative_options'; import _ from 'lodash'; import moment from 'moment'; import { i18n } from '@kbn/i18n'; diff --git a/src/legacy/core_plugins/metrics/public/index.scss b/src/legacy/core_plugins/metrics/public/index.scss index e989e059138131a..e63926748b8b09f 100644 --- a/src/legacy/core_plugins/metrics/public/index.scss +++ b/src/legacy/core_plugins/metrics/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "tvb" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/metrics/server/lib/get_index_pattern_service.js b/src/legacy/core_plugins/metrics/server/lib/get_index_pattern_service.js index 5c79ad5a89bbe4e..e0bf9cbb2d6160b 100644 --- a/src/legacy/core_plugins/metrics/server/lib/get_index_pattern_service.js +++ b/src/legacy/core_plugins/metrics/server/lib/get_index_pattern_service.js @@ -17,7 +17,7 @@ * under the License. */ -import { IndexPatternsService } from '../../../../../server/index_patterns/service'; +import { IndexPatternsService } from '../../../../server/index_patterns/service'; export const getIndexPatternService = { assign: 'indexPatternsService', method(req) { diff --git a/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js b/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js index 2e5b39412af7eb5..fbd2eef6b82676d 100644 --- a/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js +++ b/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js @@ -26,9 +26,9 @@ import LogstashIndexPatternStubProvider from 'fixtures/stubbed_logstash_index_pa import * as visModule from 'ui/vis'; import { ImageComparator } from 'test_utils/image_comparator'; import worldJson from './world.json'; -import EMS_CATALOGUE from '../../../../../ui/public/vis/__tests__/map/ems_mocks/sample_manifest.json'; -import EMS_FILES from '../../../../../ui/public/vis/__tests__/map/ems_mocks/sample_files.json'; -import EMS_TILES from '../../../../../ui/public/vis/__tests__/map/ems_mocks/sample_tiles.json'; +import EMS_CATALOGUE from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_manifest.json'; +import EMS_FILES from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_files.json'; +import EMS_TILES from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_tiles.json'; import initialPng from './initial.png'; import toiso3Png from './toiso3.png'; diff --git a/src/legacy/core_plugins/region_map/public/index.scss b/src/legacy/core_plugins/region_map/public/index.scss index d78c9330e2e7935..409d7c4a588eb6e 100644 --- a/src/legacy/core_plugins/region_map/public/index.scss +++ b/src/legacy/core_plugins/region_map/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "rgm" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/status_page/public/index.scss b/src/legacy/core_plugins/status_page/public/index.scss index f23b50992ac2176..6d2c2414fc76c16 100644 --- a/src/legacy/core_plugins/status_page/public/index.scss +++ b/src/legacy/core_plugins/status_page/public/index.scss @@ -1 +1 @@ -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; diff --git a/src/legacy/core_plugins/table_vis/public/index.scss b/src/legacy/core_plugins/table_vis/public/index.scss index 9f67ab1ea40e5c6..f46047322422be1 100644 --- a/src/legacy/core_plugins/table_vis/public/index.scss +++ b/src/legacy/core_plugins/table_vis/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "tbv" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/tagcloud/public/index.scss b/src/legacy/core_plugins/tagcloud/public/index.scss index 43a3c33aff5ec78..a4fcf8418ce1cd3 100644 --- a/src/legacy/core_plugins/tagcloud/public/index.scss +++ b/src/legacy/core_plugins/tagcloud/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "tgc" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/tests_bundle/find_source_files.js b/src/legacy/core_plugins/tests_bundle/find_source_files.js index 02e57aeb2b1b2f7..c867fb40b8193a6 100644 --- a/src/legacy/core_plugins/tests_bundle/find_source_files.js +++ b/src/legacy/core_plugins/tests_bundle/find_source_files.js @@ -18,7 +18,7 @@ */ -import { fromRoot } from '../../../utils'; +import { fromRoot } from '../../../legacy/utils'; import { chain } from 'lodash'; import { resolve } from 'path'; import { fromNode } from 'bluebird'; diff --git a/src/legacy/core_plugins/tests_bundle/index.js b/src/legacy/core_plugins/tests_bundle/index.js index 77d05226dbbebe1..58092e1abf77f1b 100644 --- a/src/legacy/core_plugins/tests_bundle/index.js +++ b/src/legacy/core_plugins/tests_bundle/index.js @@ -22,7 +22,7 @@ import { createReadStream } from 'fs'; import globby from 'globby'; import MultiStream from 'multistream'; -import { fromRoot } from '../../../utils'; +import { fromRoot } from '../../../legacy/utils'; import { replacePlaceholder } from '../../../optimize/public_path_placeholder'; import findSourceFiles from './find_source_files'; import { createTestEntryTemplate } from './tests_entry_template'; @@ -52,13 +52,13 @@ export default (kibana) => { } = kbnServer; const testGlobs = [ - 'src/ui/public/**/*.js', - '!src/ui/public/flot-charts/**/*', + 'src/legacy/ui/public/**/*.js', + '!src/legacy/ui/public/flot-charts/**/*', ]; const testingPluginIds = config.get('tests_bundle.pluginId'); if (testingPluginIds) { - testGlobs.push('!src/ui/public/**/__tests__/**/*'); + testGlobs.push('!src/legacy/ui/public/**/__tests__/**/*'); testingPluginIds.split(',').forEach((pluginId) => { const plugin = plugins .find(plugin => plugin.id === pluginId); diff --git a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js index 06f64c4efc8e9d4..0e8b6cb84694ac5 100644 --- a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js +++ b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js @@ -28,9 +28,9 @@ import initial from './initial.png'; import blues from './blues.png'; import shadedGeohashGrid from './shadedGeohashGrid.png'; import heatmapRaw from './heatmap_raw.png'; -import EMS_CATALOGUE from '../../../../../ui/public/vis/__tests__/map/ems_mocks/sample_manifest.json'; -import EMS_FILES from '../../../../../ui/public/vis/__tests__/map/ems_mocks/sample_files.json'; -import EMS_TILES from '../../../../../ui/public/vis/__tests__/map/ems_mocks/sample_tiles.json'; +import EMS_CATALOGUE from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_manifest.json'; +import EMS_FILES from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_files.json'; +import EMS_TILES from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_tiles.json'; function mockRawData() { const stack = [dummyESResponse]; diff --git a/src/legacy/core_plugins/tile_map/public/index.scss b/src/legacy/core_plugins/tile_map/public/index.scss index 81b89ac3a81496d..767a71225a7d867 100644 --- a/src/legacy/core_plugins/tile_map/public/index.scss +++ b/src/legacy/core_plugins/tile_map/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "tlm" to avoid conflicts. // Examples diff --git a/src/legacy/core_plugins/timelion/public/index.scss b/src/legacy/core_plugins/timelion/public/index.scss index f68383d01d0020d..28cee3fd5801edc 100644 --- a/src/legacy/core_plugins/timelion/public/index.scss +++ b/src/legacy/core_plugins/timelion/public/index.scss @@ -1,5 +1,5 @@ // Should import both the EUI constants and any Kibana ones that are considered global -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; /* Timelion plugin styles */ diff --git a/src/legacy/core_plugins/vega/public/index.scss b/src/legacy/core_plugins/vega/public/index.scss index 0578bb8402081fb..1ab2119d481a0db 100644 --- a/src/legacy/core_plugins/vega/public/index.scss +++ b/src/legacy/core_plugins/vega/public/index.scss @@ -1,4 +1,4 @@ -@import 'src/ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Prefix all styles with "vga" to avoid conflicts. // Examples diff --git a/src/legacy/plugin_discovery/plugin_pack/package_json_at_path.js b/src/legacy/plugin_discovery/plugin_pack/package_json_at_path.js index 1c034418c2946f9..1d669b3bcb6642e 100644 --- a/src/legacy/plugin_discovery/plugin_pack/package_json_at_path.js +++ b/src/legacy/plugin_discovery/plugin_pack/package_json_at_path.js @@ -22,7 +22,7 @@ import * as Rx from 'rxjs'; import { map, mergeMap, catchError } from 'rxjs/operators'; import { resolve } from 'path'; import { createInvalidPackError } from '../errors'; -import { isNewPlatformPlugin } from '../../core/server/plugins'; +import { isNewPlatformPlugin } from '../../../core/server/plugins'; import { isDirectory } from './lib'; diff --git a/src/legacy/server/config/__tests__/deprecation_warnings.js b/src/legacy/server/config/__tests__/deprecation_warnings.js index f910d9604fd97b4..6e4d5e2fd57d722 100644 --- a/src/legacy/server/config/__tests__/deprecation_warnings.js +++ b/src/legacy/server/config/__tests__/deprecation_warnings.js @@ -22,7 +22,7 @@ import { spawn } from 'child_process'; import expect from 'expect.js'; const RUN_KBN_SERVER_STARTUP = require.resolve('./fixtures/run_kbn_server_startup'); -const SETUP_NODE_ENV = require.resolve('../../../setup_node_env'); +const SETUP_NODE_ENV = require.resolve('../../../../setup_node_env'); const SECOND = 1000; describe('config/deprecation warnings mixin', function () { diff --git a/src/legacy/server/config/__tests__/fixtures/run_kbn_server_startup.js b/src/legacy/server/config/__tests__/fixtures/run_kbn_server_startup.js index d6622cf69ddb008..170a39b5655ebe2 100644 --- a/src/legacy/server/config/__tests__/fixtures/run_kbn_server_startup.js +++ b/src/legacy/server/config/__tests__/fixtures/run_kbn_server_startup.js @@ -17,7 +17,7 @@ * under the License. */ -import { createRoot } from '../../../../test_utils/kbn_server'; +import { createRoot } from '../../../../../test_utils/kbn_server'; (async function run() { const root = createRoot(JSON.parse(process.env.CREATE_SERVER_OPTS)); diff --git a/src/legacy/server/config/complete.js b/src/legacy/server/config/complete.js index bd6c78d3a2836b8..db9f1b888e25082 100644 --- a/src/legacy/server/config/complete.js +++ b/src/legacy/server/config/complete.js @@ -58,9 +58,9 @@ async function getUnusedConfigKeys( const appliedKeys = getFlattenedKeys(configValues); if (inputKeys.includes('env')) { - // env is a special case key, see https://github.com/elastic/kibana/blob/848bf17b/src/server/config/config.js#L74 + // env is a special case key, see https://github.com/elastic/kibana/blob/848bf17b/src/legacy/server/config/config.js#L74 // where it is deleted from the settings before being injected into the schema via context and - // then renamed to `env.name` https://github.com/elastic/kibana/blob/848bf17/src/server/config/schema.js#L17 + // then renamed to `env.name` https://github.com/elastic/kibana/blob/848bf17/src/legacy/server/config/schema.js#L17 inputKeys[inputKeys.indexOf('env')] = 'env.name'; } diff --git a/src/legacy/server/http/integration_tests/max_payload_size.test.js b/src/legacy/server/http/integration_tests/max_payload_size.test.js index 5349cda4bf4872a..2e4bd02f75bba58 100644 --- a/src/legacy/server/http/integration_tests/max_payload_size.test.js +++ b/src/legacy/server/http/integration_tests/max_payload_size.test.js @@ -17,7 +17,7 @@ * under the License. */ -import * as kbnTestServer from '../../../test_utils/kbn_server'; +import * as kbnTestServer from '../../../../test_utils/kbn_server'; let root; beforeAll(async () => { diff --git a/src/legacy/server/http/integration_tests/version_check.test.js b/src/legacy/server/http/integration_tests/version_check.test.js index ce34bb9bb61ccc2..37274bd41377b35 100644 --- a/src/legacy/server/http/integration_tests/version_check.test.js +++ b/src/legacy/server/http/integration_tests/version_check.test.js @@ -18,9 +18,9 @@ */ import { resolve } from 'path'; -import * as kbnTestServer from '../../../test_utils/kbn_server'; +import * as kbnTestServer from '../../../../test_utils/kbn_server'; -const src = resolve.bind(null, __dirname, '../../../../src'); +const src = resolve.bind(null, __dirname, '../../../../../src'); const versionHeader = 'kbn-version'; const version = require(src('../package.json')).version; // eslint-disable-line import/no-dynamic-require diff --git a/src/legacy/server/http/integration_tests/xsrf.test.js b/src/legacy/server/http/integration_tests/xsrf.test.js index 7a54f04a8b60060..a4c61ac775480b4 100644 --- a/src/legacy/server/http/integration_tests/xsrf.test.js +++ b/src/legacy/server/http/integration_tests/xsrf.test.js @@ -18,10 +18,10 @@ */ import { resolve } from 'path'; -import * as kbnTestServer from '../../../test_utils/kbn_server'; +import * as kbnTestServer from '../../../../test_utils/kbn_server'; const destructiveMethods = ['POST', 'PUT', 'DELETE']; -const src = resolve.bind(null, __dirname, '../../../../src'); +const src = resolve.bind(null, __dirname, '../../../../../src'); const xsrfHeader = 'kbn-xsrf'; const versionHeader = 'kbn-version'; diff --git a/src/legacy/server/i18n/index.js b/src/legacy/server/i18n/index.js index fff394f5bb21c85..6a31a7f83a44260 100644 --- a/src/legacy/server/i18n/index.js +++ b/src/legacy/server/i18n/index.js @@ -26,7 +26,8 @@ import { fromRoot } from '../../utils'; export async function i18nMixin(kbnServer, server, config) { const locale = config.get('i18n.locale'); - const translationsDirs = [fromRoot('src/ui/translations'), fromRoot('src/server/translations'), fromRoot('src/core/translations')]; + // eslint-disable-next-line max-len + const translationsDirs = [fromRoot('src/legacy/ui/translations'), fromRoot('src/legacy/server/translations'), fromRoot('src/core/translations')]; const groupedEntries = await Promise.all([ ...config.get('plugins.scanDirs').map(async path => { diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts index 5bf7657dcafd8ff..b06086b272ba804 100644 --- a/src/legacy/server/kbn_server.d.ts +++ b/src/legacy/server/kbn_server.d.ts @@ -19,8 +19,8 @@ import { Server } from 'hapi'; -import { ApmOssPlugin } from '../legacy/core_plugins/apm_oss'; -import { CallClusterWithRequest, ElasticsearchPlugin } from '../legacy/core_plugins/elasticsearch'; +import { ApmOssPlugin } from '../core_plugins/apm_oss'; +import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch'; import { IndexPatternsServiceFactory } from './index_patterns'; import { SavedObjectsClient, SavedObjectsService } from './saved_objects'; diff --git a/src/legacy/server/kbn_server.js b/src/legacy/server/kbn_server.js index 620da0496c354ab..4fee05e60ca6864 100644 --- a/src/legacy/server/kbn_server.js +++ b/src/legacy/server/kbn_server.js @@ -32,7 +32,7 @@ import pidMixin from './pid'; import { configDeprecationWarningsMixin } from './config/deprecation_warnings'; import { transformDeprecations } from './config/transform_deprecations'; import configCompleteMixin from './config/complete'; -import optimizeMixin from '../optimize'; +import optimizeMixin from '../../optimize'; import * as Plugins from './plugins'; import { indexPatternsMixin } from './index_patterns'; import { savedObjectsMixin } from './saved_objects'; diff --git a/src/legacy/server/sample_data/routes/lib/load_data.test.js b/src/legacy/server/sample_data/routes/lib/load_data.test.js index f01345258c09781..caf0c089a99900a 100644 --- a/src/legacy/server/sample_data/routes/lib/load_data.test.js +++ b/src/legacy/server/sample_data/routes/lib/load_data.test.js @@ -24,7 +24,7 @@ test('load flight data', async () => { const bulkInsertMock = (docs) => { myDocsCount += docs.length; }; - const count = await loadData('./src/server/sample_data/data_sets/flights/flights.json.gz', bulkInsertMock); + const count = await loadData('./src/legacy/server/sample_data/data_sets/flights/flights.json.gz', bulkInsertMock); expect(myDocsCount).toBe(13059); expect(count).toBe(13059); }); @@ -34,7 +34,7 @@ test('load log data', async () => { const bulkInsertMock = (docs) => { myDocsCount += docs.length; }; - const count = await loadData('./src/server/sample_data/data_sets/logs/logs.json.gz', bulkInsertMock); + const count = await loadData('./src/legacy/server/sample_data/data_sets/logs/logs.json.gz', bulkInsertMock); expect(myDocsCount).toBe(14005); expect(count).toBe(14005); }); @@ -44,7 +44,7 @@ test('load ecommerce data', async () => { const bulkInsertMock = (docs) => { myDocsCount += docs.length; }; - const count = await loadData('./src/server/sample_data/data_sets/ecommerce/ecommerce.json.gz', bulkInsertMock); + const count = await loadData('./src/legacy/server/sample_data/data_sets/ecommerce/ecommerce.json.gz', bulkInsertMock); expect(myDocsCount).toBe(4675); expect(count).toBe(4675); }); diff --git a/src/legacy/server/sass/__fixtures__/index.scss b/src/legacy/server/sass/__fixtures__/index.scss index cfb26ea9dd24b55..019941534cadd33 100644 --- a/src/legacy/server/sass/__fixtures__/index.scss +++ b/src/legacy/server/sass/__fixtures__/index.scss @@ -1,4 +1,4 @@ -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; foo { bar { diff --git a/src/legacy/server/sass/build.js b/src/legacy/server/sass/build.js index 04ff0070a015c7b..831ab2a195298bd 100644 --- a/src/legacy/server/sass/build.js +++ b/src/legacy/server/sass/build.js @@ -27,7 +27,7 @@ import postcssUrl from 'postcss-url'; import mkdirp from 'mkdirp'; import chalk from 'chalk'; import isPathInside from 'is-path-inside'; -import { PUBLIC_PATH_PLACEHOLDER } from '../../optimize/public_path_placeholder'; +import { PUBLIC_PATH_PLACEHOLDER } from '../../../optimize/public_path_placeholder'; const renderSass = promisify(sass.render); const writeFile = promisify(fs.writeFile); @@ -91,8 +91,7 @@ export class Build { sourceMap: true, sourceMapEmbed: true, includePaths: [ - resolve(__dirname, '../..'), - resolve(__dirname, '../../../node_modules'), + resolve(__dirname, '../../../../node_modules'), ], importer: this.theme === 'dark' ? DARK_THEME_IMPORTER : undefined }); diff --git a/src/legacy/server/saved_objects/routes/_mock_server.js b/src/legacy/server/saved_objects/routes/_mock_server.js index 1a3b94e38845476..86b85875651fb7f 100644 --- a/src/legacy/server/saved_objects/routes/_mock_server.js +++ b/src/legacy/server/saved_objects/routes/_mock_server.js @@ -18,7 +18,7 @@ */ import Hapi from 'hapi'; -import { defaultValidationErrorHandler } from '../../../core/server/http/http_tools'; +import { defaultValidationErrorHandler } from '../../../../core/server/http/http_tools'; const defaultConfig = { 'kibana.index': '.kibana' diff --git a/src/legacy/server/status/collectors/get_ops_stats_collector.js b/src/legacy/server/status/collectors/get_ops_stats_collector.js index d7e8e154b3bc267..0ebb6b3539c0e00 100644 --- a/src/legacy/server/status/collectors/get_ops_stats_collector.js +++ b/src/legacy/server/status/collectors/get_ops_stats_collector.js @@ -42,7 +42,7 @@ export function getOpsStatsCollector(server, kbnServer) { fetch: () => { return { kibana: getKibanaInfoForStats(server, kbnServer), - ...kbnServer.metrics // latest metrics captured from the ops event listener in src/server/status/index + ...kbnServer.metrics // latest metrics captured from the ops event listener in src/legacy/server/status/index }; }, ignoreForInternalUploader: true, // Ignore this one from internal uploader. A different stats collector is used there. diff --git a/src/legacy/server/status/lib/get_kibana_info_for_stats.js b/src/legacy/server/status/lib/get_kibana_info_for_stats.js index bac800c03b2b13b..a95ccb5fc8b55a5 100644 --- a/src/legacy/server/status/lib/get_kibana_info_for_stats.js +++ b/src/legacy/server/status/lib/get_kibana_info_for_stats.js @@ -24,7 +24,7 @@ const snapshotRegex = /-snapshot/i; /** * This provides a meta data attribute along with Kibana stats. * - * @param {Object} kbnServer manager of Kibana services - see `src/server/kbn_server` in Kibana core + * @param {Object} kbnServer manager of Kibana services - see `src/legacy/server/kbn_server` in Kibana core * @param {Object} config Server config * @param {String} host Kibana host * @return {Object} The object containing a "kibana" field and source instance details. diff --git a/src/legacy/server/status/server_status.js b/src/legacy/server/status/server_status.js index 0ead537cf0169a1..54a17464c8e65ea 100644 --- a/src/legacy/server/status/server_status.js +++ b/src/legacy/server/status/server_status.js @@ -21,7 +21,7 @@ import _ from 'lodash'; import * as states from './states'; import Status from './status'; -import { version } from '../../../package.json'; +import { version } from '../../utils/package_json'; export default class ServerStatus { constructor(server) { diff --git a/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js b/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js index bdb783b65a8f815..2c3a305dce59b6f 100644 --- a/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js +++ b/src/legacy/ui/__tests__/ui_exports_replace_injected_vars.js @@ -26,7 +26,7 @@ import cheerio from 'cheerio'; import { noop } from 'lodash'; import * as getUiSettingsServiceForRequestNS from '../ui_settings/ui_settings_service_for_request'; -import { createRoot, getKbnServer, request } from '../../test_utils/kbn_server'; +import { createRoot, getKbnServer, request } from '../../../test_utils/kbn_server'; const getInjectedVarsFromResponse = (resp) => { expect(resp.statusCode).to.be(200); diff --git a/src/legacy/ui/field_formats/__tests__/field_format.js b/src/legacy/ui/field_formats/__tests__/field_format.js index 79f5c205ccd05fe..7bd7e7e225db475 100644 --- a/src/legacy/ui/field_formats/__tests__/field_format.js +++ b/src/legacy/ui/field_formats/__tests__/field_format.js @@ -19,7 +19,7 @@ import _ from 'lodash'; import expect from 'expect.js'; -import { asPrettyString } from '../../../legacy/core_plugins/kibana/common/utils/as_pretty_string'; +import { asPrettyString } from '../../../core_plugins/kibana/common/utils/as_pretty_string'; import { FieldFormat } from '../field_format'; describe('FieldFormat class', function () { diff --git a/src/legacy/ui/field_formats/__tests__/field_formats_service.js b/src/legacy/ui/field_formats/__tests__/field_formats_service.js index d2fb1b93f6d2720..2110859f53551c5 100644 --- a/src/legacy/ui/field_formats/__tests__/field_formats_service.js +++ b/src/legacy/ui/field_formats/__tests__/field_formats_service.js @@ -20,7 +20,7 @@ import expect from 'expect.js'; import { FieldFormat } from '../field_format'; import { FieldFormatsService } from '../field_formats_service'; -import { createNumberFormat } from '../../../legacy/core_plugins/kibana/common/field_formats/types/number'; +import { createNumberFormat } from '../../../core_plugins/kibana/common/field_formats/types/number'; describe('FieldFormatsService', function () { diff --git a/src/legacy/ui/field_formats/content_types.js b/src/legacy/ui/field_formats/content_types.js index bf8feb2888d966b..39a5cac7b9027a4 100644 --- a/src/legacy/ui/field_formats/content_types.js +++ b/src/legacy/ui/field_formats/content_types.js @@ -18,8 +18,8 @@ */ import _ from 'lodash'; -import { asPrettyString } from '../../legacy/core_plugins/kibana/common/utils/as_pretty_string'; -import { getHighlightHtml } from '../../legacy/core_plugins/kibana/common/highlight/highlight_html'; +import { asPrettyString } from '../../core_plugins/kibana/common/utils/as_pretty_string'; +import { getHighlightHtml } from '../../core_plugins/kibana/common/highlight/highlight_html'; const types = { html: function (format, convert) { diff --git a/src/legacy/ui/public/_index.scss b/src/legacy/ui/public/_index.scss index 7acbc5d734028d3..f6f6314edcc01df 100644 --- a/src/legacy/ui/public/_index.scss +++ b/src/legacy/ui/public/_index.scss @@ -33,7 +33,7 @@ // The following are prefixed with "vis" -// Can't import vis folder here because of cascading issues, it's imported in legacy/core_plugins/kibana +// Can't import vis folder here because of cascading issues, it's imported in core_plugins/kibana // @import './vis/index'; @import './vislib/index'; @import './visualize/index'; diff --git a/src/legacy/ui/public/assets/fonts/readme.md b/src/legacy/ui/public/assets/fonts/readme.md index ed68c69f6ec340c..8bb92cc6aa0d9ff 100644 --- a/src/legacy/ui/public/assets/fonts/readme.md +++ b/src/legacy/ui/public/assets/fonts/readme.md @@ -10,4 +10,4 @@ Licenses for both can be found in the folders below this root. ## How fonts are loaded -Reference the `src/ui/ui_render/views/chrome.pug` which makes the font-face CSS declarations against the files contained here. References to those those faces are called directly in [EUI](https://github.com/elastic/eui) primarily through the [typography variables](https://github.com/elastic/eui/blob/master/src/global_styling/variables/_typography.scss). \ No newline at end of file +Reference the `src/legacy/ui/ui_render/views/chrome.pug` which makes the font-face CSS declarations against the files contained here. References to those those faces are called directly in [EUI](https://github.com/elastic/eui) primarily through the [typography variables](https://github.com/elastic/eui/blob/master/src/global_styling/variables/_typography.scss). \ No newline at end of file diff --git a/src/legacy/ui/public/chrome/api/__tests__/xsrf.js b/src/legacy/ui/public/chrome/api/__tests__/xsrf.js index 50414586d9213a4..27b8a400adf473d 100644 --- a/src/legacy/ui/public/chrome/api/__tests__/xsrf.js +++ b/src/legacy/ui/public/chrome/api/__tests__/xsrf.js @@ -23,7 +23,7 @@ import sinon from 'sinon'; import ngMock from 'ng_mock'; import { initChromeXsrfApi } from '../xsrf'; -import { version } from '../../../../../../package.json'; +import { version } from '../../../../../utils/package_json'; const xsrfHeader = 'kbn-version'; diff --git a/src/legacy/ui/public/chrome/api/base_path.ts b/src/legacy/ui/public/chrome/api/base_path.ts index c156b6bb686152f..66e9838d422749d 100644 --- a/src/legacy/ui/public/chrome/api/base_path.ts +++ b/src/legacy/ui/public/chrome/api/base_path.ts @@ -17,7 +17,7 @@ * under the License. */ -import { BasePathStartContract } from '../../../../core/public/base_path'; +import { BasePathStartContract } from '../../../../../core/public/base_path'; let newPlatformBasePath: BasePathStartContract; export function __newPlatformInit__(instance: BasePathStartContract) { diff --git a/src/legacy/ui/public/chrome/api/breadcrumbs.ts b/src/legacy/ui/public/chrome/api/breadcrumbs.ts index 387505f1736347f..918df258e694b5a 100644 --- a/src/legacy/ui/public/chrome/api/breadcrumbs.ts +++ b/src/legacy/ui/public/chrome/api/breadcrumbs.ts @@ -19,7 +19,7 @@ import { IRootScopeService } from 'angular'; import { fatalError } from 'ui/notify/fatal_error'; -import { Breadcrumb, ChromeStartContract } from '../../../../core/public/chrome'; +import { Breadcrumb, ChromeStartContract } from '../../../../../core/public/chrome'; export { Breadcrumb }; export type BreadcrumbsApi = ReturnType['breadcrumbs']; diff --git a/src/legacy/ui/public/chrome/api/controls.ts b/src/legacy/ui/public/chrome/api/controls.ts index 41447ffd57e3937..4787a623b234bab 100644 --- a/src/legacy/ui/public/chrome/api/controls.ts +++ b/src/legacy/ui/public/chrome/api/controls.ts @@ -18,7 +18,7 @@ */ import * as Rx from 'rxjs'; -import { ChromeStartContract } from '../../../../core/public/chrome'; +import { ChromeStartContract } from '../../../../../core/public/chrome'; let newPlatformChrome: ChromeStartContract; diff --git a/src/legacy/ui/public/chrome/api/help_extension.ts b/src/legacy/ui/public/chrome/api/help_extension.ts index 2408c3457ab1e97..93c05bbbcd9d330 100644 --- a/src/legacy/ui/public/chrome/api/help_extension.ts +++ b/src/legacy/ui/public/chrome/api/help_extension.ts @@ -19,7 +19,7 @@ import { IRootScopeService } from 'angular'; -import { ChromeStartContract, HelpExtension } from '../../../../core/public/chrome'; +import { ChromeStartContract, HelpExtension } from '../../../../../core/public/chrome'; let newPlatformChrome: ChromeStartContract; export function __newPlatformInit__(instance: ChromeStartContract) { diff --git a/src/legacy/ui/public/chrome/api/injected_vars.ts b/src/legacy/ui/public/chrome/api/injected_vars.ts index a8581c8ce2d7b5c..859fcdf3cc36638 100644 --- a/src/legacy/ui/public/chrome/api/injected_vars.ts +++ b/src/legacy/ui/public/chrome/api/injected_vars.ts @@ -18,7 +18,7 @@ */ import { cloneDeep } from 'lodash'; -import { InjectedMetadataStartContract } from '../../../../core/public/injected_metadata'; +import { InjectedMetadataStartContract } from '../../../../../core/public/injected_metadata'; let newPlatformInjectedVars: InjectedMetadataStartContract; diff --git a/src/legacy/ui/public/chrome/api/theme.ts b/src/legacy/ui/public/chrome/api/theme.ts index e00dbca03008dad..0381c3a96513281 100644 --- a/src/legacy/ui/public/chrome/api/theme.ts +++ b/src/legacy/ui/public/chrome/api/theme.ts @@ -19,7 +19,7 @@ import * as Rx from 'rxjs'; -import { Brand, ChromeStartContract } from '../../../../core/public/chrome'; +import { Brand, ChromeStartContract } from '../../../../../core/public/chrome'; let newPlatformChrome: ChromeStartContract; diff --git a/src/legacy/ui/public/chrome/directives/header_global_nav/components/header.tsx b/src/legacy/ui/public/chrome/directives/header_global_nav/components/header.tsx index d5497615bc3d90d..25d20814a477bf3 100644 --- a/src/legacy/ui/public/chrome/directives/header_global_nav/components/header.tsx +++ b/src/legacy/ui/public/chrome/directives/header_global_nav/components/header.tsx @@ -64,7 +64,7 @@ import { RecentlyAccessedHistoryItem } from 'ui/persisted_log'; import { ChromeHeaderNavControlsRegistry } from 'ui/registry/chrome_header_nav_controls'; import { relativeToAbsolute } from 'ui/url/relative_to_absolute'; import { NavControlSide } from '../'; -import { Breadcrumb } from '../../../../../../core/public/chrome'; +import { Breadcrumb } from '../../../../../../../core/public/chrome'; interface Props { appTitle?: string; diff --git a/src/legacy/ui/public/chrome/directives/header_global_nav/components/header_breadcrumbs.test.tsx b/src/legacy/ui/public/chrome/directives/header_global_nav/components/header_breadcrumbs.test.tsx index dabf36f91317e6c..dfedf1e0a9c842d 100644 --- a/src/legacy/ui/public/chrome/directives/header_global_nav/components/header_breadcrumbs.test.tsx +++ b/src/legacy/ui/public/chrome/directives/header_global_nav/components/header_breadcrumbs.test.tsx @@ -20,7 +20,7 @@ import { mount } from 'enzyme'; import React from 'react'; import * as Rx from 'rxjs'; -import { Breadcrumb } from '../../../../../../core/public/chrome'; +import { Breadcrumb } from '../../../../../../../core/public/chrome'; import { HeaderBreadcrumbs } from './header_breadcrumbs'; describe('HeaderBreadcrumbs', () => { diff --git a/src/legacy/ui/public/chrome/directives/header_global_nav/components/header_breadcrumbs.tsx b/src/legacy/ui/public/chrome/directives/header_global_nav/components/header_breadcrumbs.tsx index 8d9c37d6896429f..18d1b48fc3719f4 100644 --- a/src/legacy/ui/public/chrome/directives/header_global_nav/components/header_breadcrumbs.tsx +++ b/src/legacy/ui/public/chrome/directives/header_global_nav/components/header_breadcrumbs.tsx @@ -26,7 +26,7 @@ import { EuiHeaderBreadcrumbs, } from '@elastic/eui'; -import { Breadcrumb } from '../../../../../../core/public/chrome'; +import { Breadcrumb } from '../../../../../../../core/public/chrome'; interface Props { appTitle?: string; diff --git a/src/legacy/ui/public/chrome/index.d.ts b/src/legacy/ui/public/chrome/index.d.ts index c93e8a693ab7087..e088ac0a41755b5 100644 --- a/src/legacy/ui/public/chrome/index.d.ts +++ b/src/legacy/ui/public/chrome/index.d.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Brand } from '../../../core/public/chrome'; +import { Brand } from '../../../../core/public/chrome'; import { SavedObjectsClient } from '../saved_objects'; import { BreadcrumbsApi } from './api/breadcrumbs'; import { HelpExtensionApi } from './api/help_extension'; diff --git a/src/legacy/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.js b/src/legacy/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.js index c111e85888f3687..b4da7d5ae0cb176 100644 --- a/src/legacy/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.js +++ b/src/legacy/ui/public/courier/fetch/request/serialize_fetch_params/serialize_fetch_params.js @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { toJson } from '../../../../../../legacy/core_plugins/kibana/common/utils/aggressive_parse'; +import { toJson } from '../../../../../../core_plugins/kibana/common/utils/aggressive_parse'; function emptySearch() { return { diff --git a/src/legacy/ui/public/courier/search_source/search_source.js b/src/legacy/ui/public/courier/search_source/search_source.js index d4a487cd2c299ac..9696603e6a85523 100644 --- a/src/legacy/ui/public/courier/search_source/search_source.js +++ b/src/legacy/ui/public/courier/search_source/search_source.js @@ -81,7 +81,7 @@ import { SegmentedSearchRequestProvider } from '../fetch/request/segmented_searc import { searchRequestQueue } from '../search_request_queue'; import { FetchSoonProvider } from '../fetch'; import { FieldWildcardProvider } from '../../field_wildcard'; -import { getHighlightRequest } from '../../../../legacy/core_plugins/kibana/common/highlight'; +import { getHighlightRequest } from '../../../../core_plugins/kibana/common/highlight'; import { KbnError, OutdatedKuerySyntaxError } from '../../errors'; const FIELDS = [ diff --git a/src/legacy/ui/public/doc_table/components/table_row.js b/src/legacy/ui/public/doc_table/components/table_row.js index c6f05f9644a54d3..bbe9517f2daa19b 100644 --- a/src/legacy/ui/public/doc_table/components/table_row.js +++ b/src/legacy/ui/public/doc_table/components/table_row.js @@ -23,7 +23,7 @@ import rison from 'rison-node'; import '../../doc_viewer'; import '../../filters/trust_as_html'; import '../../filters/short_dots'; -import { noWhiteSpace } from '../../../../legacy/core_plugins/kibana/common/utils/no_white_space'; +import { noWhiteSpace } from '../../../../core_plugins/kibana/common/utils/no_white_space'; import openRowHtml from './table_row/open.html'; import detailsHtml from './table_row/details.html'; import { uiModules } from '../../modules'; diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/color.js b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/color.js index 81fc31836b8c4f0..b675810f9495ff7 100644 --- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/color.js +++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/color.js @@ -31,7 +31,7 @@ import { DefaultFormatEditor } from '../default'; -import { DEFAULT_COLOR } from '../../../../../../../legacy/core_plugins/kibana/common/field_formats/types/color_default'; +import { DEFAULT_COLOR } from '../../../../../../../core_plugins/kibana/common/field_formats/types/color_default'; import { injectI18n, FormattedMessage } from '@kbn/i18n/react'; diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/color.test.js b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/color.test.js index db45b33489e3acb..d403492d800ffdb 100644 --- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/color.test.js +++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/color/color.test.js @@ -21,7 +21,7 @@ import React from 'react'; import { shallowWithIntl } from 'test_utils/enzyme_helpers'; import { ColorFormatEditor, ColorFormatEditorComponent } from './color'; -import { DEFAULT_COLOR } from '../../../../../../../legacy/core_plugins/kibana/common/field_formats/types/color_default'; +import { DEFAULT_COLOR } from '../../../../../../../core_plugins/kibana/common/field_formats/types/color_default'; const fieldType = 'string'; const format = { diff --git a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/url.js b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/url.js index 000328e252b7706..4e5f9f39291fe8c 100644 --- a/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/url.js +++ b/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/url.js @@ -54,7 +54,7 @@ export class UrlFormatEditor extends DefaultFormatEditor { constructor(props) { super(props); const bp = chrome.getBasePath(); - this.iconPattern = `${bp}/bundles/src/ui/public/field_editor/components/field_format_editor/editors/url/icons/{{value}}.png`; + this.iconPattern = `${bp}/bundles/src/legacy/ui/public/field_editor/components/field_format_editor/editors/url/icons/{{value}}.png`; this.state = { ...this.state, sampleInputsByType: { diff --git a/src/legacy/ui/public/field_editor/lib/__tests__/get_default_format.test.js b/src/legacy/ui/public/field_editor/lib/__tests__/get_default_format.test.js index c8b49ae7518d101..a22eacd4a3daca6 100644 --- a/src/legacy/ui/public/field_editor/lib/__tests__/get_default_format.test.js +++ b/src/legacy/ui/public/field_editor/lib/__tests__/get_default_format.test.js @@ -19,7 +19,7 @@ import { getDefaultFormat } from '../get_default_format'; import { FieldFormat } from '../../../../field_formats'; -import { createNumberFormat } from '../../../../../legacy/core_plugins/kibana/common/field_formats/types/number'; +import { createNumberFormat } from '../../../../../core_plugins/kibana/common/field_formats/types/number'; const Format = createNumberFormat(FieldFormat); const getConfig = () => { diff --git a/src/legacy/ui/public/filters/short_dots.js b/src/legacy/ui/public/filters/short_dots.js index 61ebac2636ab542..02a7672165c79ce 100644 --- a/src/legacy/ui/public/filters/short_dots.js +++ b/src/legacy/ui/public/filters/short_dots.js @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { shortenDottedString } from '../../../legacy/core_plugins/kibana/common/utils/shorten_dotted_string'; +import { shortenDottedString } from '../../../core_plugins/kibana/common/utils/shorten_dotted_string'; import { uiModules } from '../modules'; // Shorts dot notated strings // e.g., foo.bar.baz becomes f.b.baz diff --git a/src/legacy/ui/public/i18n/index.tsx b/src/legacy/ui/public/i18n/index.tsx index adbc281913e57c9..1b79256b4651f29 100644 --- a/src/legacy/ui/public/i18n/index.tsx +++ b/src/legacy/ui/public/i18n/index.tsx @@ -22,7 +22,7 @@ import React from 'react'; import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular'; // @ts-ignore import { uiModules } from 'ui/modules'; -import { I18nStartContract } from '../../../core/public/i18n'; +import { I18nStartContract } from '../../../../core/public/i18n'; export let I18nContext: I18nStartContract['Context'] = null!; export function __newPlatformInit__(context: typeof I18nContext) { diff --git a/src/legacy/ui/public/index_patterns/_field.js b/src/legacy/ui/public/index_patterns/_field.js index f81e5f3b1479d53..939bab071c69279 100644 --- a/src/legacy/ui/public/index_patterns/_field.js +++ b/src/legacy/ui/public/index_patterns/_field.js @@ -21,7 +21,7 @@ import { ObjDefine } from '../utils/obj_define'; import { FieldFormat } from '../../field_formats/field_format'; import { fieldFormats } from '../registry/field_formats'; import { getKbnFieldType } from '../../../utils'; -import { shortenDottedString } from '../../../legacy/core_plugins/kibana/common/utils/shorten_dotted_string'; +import { shortenDottedString } from '../../../core_plugins/kibana/common/utils/shorten_dotted_string'; import { toastNotifications } from 'ui/notify'; import chrome from 'ui/chrome'; import { i18n } from '@kbn/i18n'; diff --git a/src/legacy/ui/public/management/index.js b/src/legacy/ui/public/management/index.js index 5d397a6cda5e453..3da03cd9d70b707 100644 --- a/src/legacy/ui/public/management/index.js +++ b/src/legacy/ui/public/management/index.js @@ -21,11 +21,11 @@ export { PAGE_TITLE_COMPONENT, PAGE_SUBTITLE_COMPONENT, PAGE_FOOTER_COMPONENT, -} from '../../../legacy/core_plugins/kibana/public/management/sections/settings/components/default_component_registry'; +} from '../../../core_plugins/kibana/public/management/sections/settings/components/default_component_registry'; export { registerSettingsComponent -} from '../../../legacy/core_plugins/kibana/public/management/sections/settings/components/component_registry'; -export { Field } from '../../../legacy/core_plugins/kibana/public/management/sections/settings/components/field/field'; +} from '../../../core_plugins/kibana/public/management/sections/settings/components/component_registry'; +export { Field } from '../../../core_plugins/kibana/public/management/sections/settings/components/field/field'; export { management } from './sections_register'; export { SidebarNav } from './components'; export { MANAGEMENT_BREADCRUMB } from './breadcrumbs'; diff --git a/src/legacy/ui/public/notify/app_redirect/app_redirect.js b/src/legacy/ui/public/notify/app_redirect/app_redirect.js index 9a283fcaad9c503..d3f66c1eb59acd4 100644 --- a/src/legacy/ui/public/notify/app_redirect/app_redirect.js +++ b/src/legacy/ui/public/notify/app_redirect/app_redirect.js @@ -17,7 +17,7 @@ * under the License. */ -import { modifyUrl } from '../../../../core/public/utils'; +import { modifyUrl } from '../../../../../core/public/utils'; import { toastNotifications } from '../toasts'; const APP_REDIRECT_MESSAGE_PARAM = 'app_redirect_message'; diff --git a/src/legacy/ui/public/notify/fatal_error.ts b/src/legacy/ui/public/notify/fatal_error.ts index 3956a7a41aa2c09..77539bf03341afe 100644 --- a/src/legacy/ui/public/notify/fatal_error.ts +++ b/src/legacy/ui/public/notify/fatal_error.ts @@ -17,7 +17,7 @@ * under the License. */ -import { FatalErrorsStartContract } from '../../../core/public/fatal_errors'; +import { FatalErrorsStartContract } from '../../../../core/public/fatal_errors'; import { AngularHttpError, formatAngularHttpError, diff --git a/src/legacy/ui/public/notify/toasts/toast_notifications.test.ts b/src/legacy/ui/public/notify/toasts/toast_notifications.test.ts index 910002b2ce19053..238ad32c12a525e 100644 --- a/src/legacy/ui/public/notify/toasts/toast_notifications.test.ts +++ b/src/legacy/ui/public/notify/toasts/toast_notifications.test.ts @@ -18,7 +18,7 @@ */ import sinon from 'sinon'; -import { ToastsStartContract } from '../../../../core/public/notifications'; +import { ToastsStartContract } from '../../../../../core/public/notifications'; import { ToastNotifications } from './toast_notifications'; diff --git a/src/legacy/ui/public/notify/toasts/toast_notifications.ts b/src/legacy/ui/public/notify/toasts/toast_notifications.ts index 7e4ea11edf3a7b8..2015366f8d92607 100644 --- a/src/legacy/ui/public/notify/toasts/toast_notifications.ts +++ b/src/legacy/ui/public/notify/toasts/toast_notifications.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Toast, ToastInput, ToastsStartContract } from '../../../../core/public/notifications'; +import { Toast, ToastInput, ToastsStartContract } from '../../../../../core/public/notifications'; export { Toast, ToastInput }; diff --git a/src/legacy/ui/public/notify/toasts/toasts.ts b/src/legacy/ui/public/notify/toasts/toasts.ts index cc3a8f18fc101ea..f95bd792a1f2e63 100644 --- a/src/legacy/ui/public/notify/toasts/toasts.ts +++ b/src/legacy/ui/public/notify/toasts/toasts.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ToastsStartContract } from '../../../../core/public/notifications'; +import { ToastsStartContract } from '../../../../../core/public/notifications'; import { ToastNotifications } from './toast_notifications'; export let toastNotifications: ToastNotifications; diff --git a/src/legacy/ui/public/routes/route_manager.d.ts b/src/legacy/ui/public/routes/route_manager.d.ts index 7732e3c1bff57d1..3b2e634226c7f27 100644 --- a/src/legacy/ui/public/routes/route_manager.d.ts +++ b/src/legacy/ui/public/routes/route_manager.d.ts @@ -21,7 +21,7 @@ * WARNING: these types are incomplete */ -import { Breadcrumb } from '../../../core/public/chrome'; +import { Breadcrumb } from '../../../../core/public/chrome'; interface RouteConfiguration { controller?: string | ((...args: any[]) => void); diff --git a/src/legacy/ui/public/saved_objects/saved_objects_client.ts b/src/legacy/ui/public/saved_objects/saved_objects_client.ts index a048efe7f42b719..117d76580230b3d 100644 --- a/src/legacy/ui/public/saved_objects/saved_objects_client.ts +++ b/src/legacy/ui/public/saved_objects/saved_objects_client.ts @@ -26,12 +26,8 @@ import { SavedObjectAttributes, SavedObjectReference, SavedObjectsClient as SavedObjectsApi, -} from '../../../../src/server/saved_objects'; -import { - CreateResponse, - FindOptions, - UpdateResponse, -} from '../../../../src/server/saved_objects/service'; +} from '../../../server/saved_objects'; +import { CreateResponse, FindOptions, UpdateResponse } from '../../../server/saved_objects/service'; import { isAutoCreateIndexError, showAutoCreateIndexErrorPage } from '../error_auto_create_index'; import { kfetch, KFetchQuery } from '../kfetch'; import { keysToCamelCaseShallow, keysToSnakeCaseShallow } from '../utils/case_conversion'; diff --git a/src/legacy/ui/public/styles/_styling_constants.scss b/src/legacy/ui/public/styles/_styling_constants.scss index 0ca60cb6116f44b..74fc54b41028568 100644 --- a/src/legacy/ui/public/styles/_styling_constants.scss +++ b/src/legacy/ui/public/styles/_styling_constants.scss @@ -2,7 +2,7 @@ @import '@elastic/eui/src/themes/eui/eui_colors_light'; -// Note that fonts are loaded directly by src/ui/ui_render/views/chrome.pug +// Note that fonts are loaded directly by src/legacy/ui/ui_render/views/chrome.pug @import '@elastic/eui/src/global_styling/functions/index'; @import '@elastic/eui/src/global_styling/variables/index'; diff --git a/src/legacy/ui/public/test_harness/test_harness.js b/src/legacy/ui/public/test_harness/test_harness.js index 597cc09beb32c9f..178971c582d66ed 100644 --- a/src/legacy/ui/public/test_harness/test_harness.js +++ b/src/legacy/ui/public/test_harness/test_harness.js @@ -24,7 +24,7 @@ import { parse as parseUrl } from 'url'; import sinon from 'sinon'; import { Notifier } from '../notify'; import { metadata } from '../metadata'; -import { UiSettingsClient } from '../../../core/public/ui_settings'; +import { UiSettingsClient } from '../../../../core/public/ui_settings'; import './test_harness.css'; import 'ng_mock'; diff --git a/src/legacy/ui/public/time_buckets/time_buckets.js b/src/legacy/ui/public/time_buckets/time_buckets.js index a828b856b1dbdbe..bcd5cd161edd3ae 100644 --- a/src/legacy/ui/public/time_buckets/time_buckets.js +++ b/src/legacy/ui/public/time_buckets/time_buckets.js @@ -147,7 +147,7 @@ TimeBuckets.prototype.getDuration = function () { * generated. * * Input can be one of the following: - * - Any object from src/ui/agg_types/buckets/_interval_options.js + * - Any object from src/legacy/ui/agg_types/buckets/_interval_options.js * - "auto" * - Pass a valid moment unit * - a moment.duration object. diff --git a/src/legacy/ui/public/url/index.js b/src/legacy/ui/public/url/index.js index b95c477d8916cdb..a8f7b5fed350cda 100644 --- a/src/legacy/ui/public/url/index.js +++ b/src/legacy/ui/public/url/index.js @@ -19,4 +19,4 @@ export { KbnUrlProvider } from './url'; export { RedirectWhenMissingProvider } from './redirect_when_missing'; -export { modifyUrl } from '../../../core/public/utils'; +export { modifyUrl } from '../../../../core/public/utils'; diff --git a/src/legacy/ui/public/url/kibana_parsed_url.ts b/src/legacy/ui/public/url/kibana_parsed_url.ts index d05768ceb2c376c..7f1653a9f8d8643 100644 --- a/src/legacy/ui/public/url/kibana_parsed_url.ts +++ b/src/legacy/ui/public/url/kibana_parsed_url.ts @@ -19,7 +19,7 @@ import { parse } from 'url'; -import { modifyUrl } from '../../../core/public/utils'; +import { modifyUrl } from '../../../../core/public/utils'; import { prependPath } from './prepend_path'; interface Options { diff --git a/src/legacy/ui/public/utils/case_conversion.ts b/src/legacy/ui/public/utils/case_conversion.ts index fe2cb8aa209e5cd..e0c4cad6b4e9403 100644 --- a/src/legacy/ui/public/utils/case_conversion.ts +++ b/src/legacy/ui/public/utils/case_conversion.ts @@ -17,7 +17,7 @@ * under the License. */ -// TODO: This file is copied from src/utils/case_conversion.ts +// TODO: This file is copied from src/legacy/utils/case_conversion.ts // because TS-imports from utils in ui are currently not possible. // When the build process is updated, this file can be removed diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_client.js b/src/legacy/ui/public/vis/__tests__/map/ems_client.js index f10023d0c12e690..022bb2417615d8b 100644 --- a/src/legacy/ui/public/vis/__tests__/map/ems_client.js +++ b/src/legacy/ui/public/vis/__tests__/map/ems_client.js @@ -23,7 +23,7 @@ import EMS_FILES from './ems_mocks/sample_files.json'; import EMS_TILES from './ems_mocks/sample_tiles.json'; -import { EMSClient } from '../../../../../legacy/core_plugins/tile_map/common/ems_client'; +import { EMSClient } from '../../../../../core_plugins/tile_map/common/ems_client'; describe('ems_client', () => { diff --git a/src/legacy/ui/public/vis/__tests__/map/service_settings.js b/src/legacy/ui/public/vis/__tests__/map/service_settings.js index 4aacf0ee12cb7d4..51ce93a37604461 100644 --- a/src/legacy/ui/public/vis/__tests__/map/service_settings.js +++ b/src/legacy/ui/public/vis/__tests__/map/service_settings.js @@ -24,7 +24,7 @@ import url from 'url'; import EMS_CATALOGUE from './ems_mocks/sample_manifest.json'; import EMS_FILES from './ems_mocks/sample_files.json'; import EMS_TILES from './ems_mocks/sample_tiles.json'; -import { ORIGIN } from '../../../../../legacy/core_plugins/tile_map/common/origin'; +import { ORIGIN } from '../../../../../core_plugins/tile_map/common/origin'; describe('service_settings (FKA tilemaptest)', function () { diff --git a/src/legacy/ui/public/vis/map/service_settings.js b/src/legacy/ui/public/vis/map/service_settings.js index 35ebc840385327f..8538d516aa108a8 100644 --- a/src/legacy/ui/public/vis/map/service_settings.js +++ b/src/legacy/ui/public/vis/map/service_settings.js @@ -20,8 +20,8 @@ import { uiModules } from '../../modules'; import _ from 'lodash'; import MarkdownIt from 'markdown-it'; -import { ORIGIN } from '../../../../legacy/core_plugins/tile_map/common/origin'; -import { EMSClient } from '../../../../legacy/core_plugins/tile_map/common/ems_client'; +import { ORIGIN } from '../../../../core_plugins/tile_map/common/origin'; +import { EMSClient } from '../../../../core_plugins/tile_map/common/ems_client'; import { i18n } from '@kbn/i18n'; const markdownIt = new MarkdownIt({ diff --git a/src/legacy/ui/tutorials_mixin.js b/src/legacy/ui/tutorials_mixin.js index 58c220782c3ce85..af3663a83b81217 100644 --- a/src/legacy/ui/tutorials_mixin.js +++ b/src/legacy/ui/tutorials_mixin.js @@ -18,7 +18,7 @@ */ import Joi from 'joi'; -import { tutorialSchema } from '../legacy/core_plugins/kibana/common/tutorials/tutorial_schema'; +import { tutorialSchema } from '../core_plugins/kibana/common/tutorials/tutorial_schema'; export function tutorialsMixin(kbnServer, server) { const tutorialProviders = []; diff --git a/src/legacy/ui/ui_exports/ui_export_defaults.js b/src/legacy/ui/ui_exports/ui_export_defaults.js index c582a6e13851690..3ebcd6a254c902f 100644 --- a/src/legacy/ui/ui_exports/ui_export_defaults.js +++ b/src/legacy/ui/ui_exports/ui_export_defaults.js @@ -18,7 +18,7 @@ */ import { dirname, resolve } from 'path'; -const ROOT = dirname(require.resolve('../../../package.json')); +const ROOT = dirname(require.resolve('../../../../package.json')); export const UI_EXPORT_DEFAULTS = { webpackNoParseRules: [ @@ -27,7 +27,7 @@ export const UI_EXPORT_DEFAULTS = { ], webpackAliases: { - ui: resolve(ROOT, 'src/ui/public'), + ui: resolve(ROOT, 'src/legacy/ui/public'), '__kibanaCore__$': resolve(ROOT, 'src/core/public'), test_harness: resolve(ROOT, 'src/test_harness/public'), querystring: 'querystring-browser', diff --git a/src/legacy/ui/ui_settings/create_or_upgrade_saved_config/__tests__/create_or_upgrade_integration.js b/src/legacy/ui/ui_settings/create_or_upgrade_saved_config/__tests__/create_or_upgrade_integration.js index b407f5b327c7bb2..4bbb7158628201c 100644 --- a/src/legacy/ui/ui_settings/create_or_upgrade_saved_config/__tests__/create_or_upgrade_integration.js +++ b/src/legacy/ui/ui_settings/create_or_upgrade_saved_config/__tests__/create_or_upgrade_integration.js @@ -20,7 +20,7 @@ import sinon from 'sinon'; import expect from 'expect.js'; -import { startTestServers } from '../../../../test_utils/kbn_server'; +import { startTestServers } from '../../../../../test_utils/kbn_server'; import { createOrUpgradeSavedConfig } from '../create_or_upgrade_saved_config'; describe('createOrUpgradeSavedConfig()', () => { diff --git a/src/legacy/ui/ui_settings/routes/__tests__/lib/servers.js b/src/legacy/ui/ui_settings/routes/__tests__/lib/servers.js index fcd857ec780b646..9faf722c04b8829 100644 --- a/src/legacy/ui/ui_settings/routes/__tests__/lib/servers.js +++ b/src/legacy/ui/ui_settings/routes/__tests__/lib/servers.js @@ -17,7 +17,7 @@ * under the License. */ -import { startTestServers } from '../../../../../test_utils/kbn_server'; +import { startTestServers } from '../../../../../../test_utils/kbn_server'; let kbnServer; let services; diff --git a/src/legacy/utils/__tests__/watch_stdio_for_line.js b/src/legacy/utils/__tests__/watch_stdio_for_line.js index 89d873792d9b6f9..9561a19d999f05a 100644 --- a/src/legacy/utils/__tests__/watch_stdio_for_line.js +++ b/src/legacy/utils/__tests__/watch_stdio_for_line.js @@ -23,7 +23,7 @@ import sinon from 'sinon'; import { watchStdioForLine } from '../watch_stdio_for_line'; -describe('src/utils/watch_stdio_for_line', function () { +describe('src/legacy/utils/watch_stdio_for_line', function () { const sandbox = sinon.sandbox.create(); afterEach(() => sandbox.reset()); diff --git a/src/legacy/utils/package_json.ts b/src/legacy/utils/package_json.ts index edacb04c6b1daf0..750dd7e2e1040b4 100644 --- a/src/legacy/utils/package_json.ts +++ b/src/legacy/utils/package_json.ts @@ -20,8 +20,8 @@ import { dirname } from 'path'; export const pkg = { - __filename: require.resolve('../../package.json'), - __dirname: dirname(require.resolve('../../package.json')), + __filename: require.resolve('../../../package.json'), + __dirname: dirname(require.resolve('../../../package.json')), // tslint:disable no-var-requires - ...require('../../package.json'), + ...require('../../../package.json'), }; diff --git a/src/optimize/base_optimizer.js b/src/optimize/base_optimizer.js index 6fd65bb23f945cb..c19db4e1a2a0602 100644 --- a/src/optimize/base_optimizer.js +++ b/src/optimize/base_optimizer.js @@ -30,7 +30,7 @@ import { DynamicDllPlugin } from './dynamic_dll_plugin'; import { defaults } from 'lodash'; -import { IS_KIBANA_DISTRIBUTABLE, fromRoot } from '../utils'; +import { IS_KIBANA_DISTRIBUTABLE, fromRoot } from '../legacy/utils'; import { PUBLIC_PATH_PLACEHOLDER } from './public_path_placeholder'; @@ -252,10 +252,10 @@ export default class BaseOptimizer { entry: { ...this.uiBundles.toWebpackEntries(), light_theme: [ - require.resolve('../ui/public/styles/bootstrap_light.less'), + require.resolve('../legacy/ui/public/styles/bootstrap_light.less'), ], dark_theme: [ - require.resolve('../ui/public/styles/bootstrap_dark.less'), + require.resolve('../legacy/ui/public/styles/bootstrap_dark.less'), ], }, diff --git a/src/optimize/dynamic_dll_plugin/dll_compiler.js b/src/optimize/dynamic_dll_plugin/dll_compiler.js index 5853dcf86dc811d..b403afe955365d3 100644 --- a/src/optimize/dynamic_dll_plugin/dll_compiler.js +++ b/src/optimize/dynamic_dll_plugin/dll_compiler.js @@ -18,7 +18,7 @@ */ import { configModel } from './dll_config_model'; -import { fromRoot } from '../../utils'; +import { fromRoot } from '../../legacy/utils'; import { PUBLIC_PATH_PLACEHOLDER } from '../public_path_placeholder'; import fs from 'fs'; import mkdirp from 'mkdirp'; diff --git a/src/optimize/dynamic_dll_plugin/dll_config_model.js b/src/optimize/dynamic_dll_plugin/dll_config_model.js index da17aeeeeeac9e8..1432241993d0604 100644 --- a/src/optimize/dynamic_dll_plugin/dll_config_model.js +++ b/src/optimize/dynamic_dll_plugin/dll_config_model.js @@ -17,7 +17,7 @@ * under the License. */ -import { fromRoot, IS_KIBANA_DISTRIBUTABLE } from '../../utils'; +import { fromRoot, IS_KIBANA_DISTRIBUTABLE } from '../../legacy/utils'; import webpack from 'webpack'; import webpackMerge from 'webpack-merge'; import MiniCssExtractPlugin from 'mini-css-extract-plugin'; diff --git a/src/optimize/dynamic_dll_plugin/dynamic_dll_plugin.js b/src/optimize/dynamic_dll_plugin/dynamic_dll_plugin.js index 480905fb234c06b..f7d1fbe0c6ec8b8 100644 --- a/src/optimize/dynamic_dll_plugin/dynamic_dll_plugin.js +++ b/src/optimize/dynamic_dll_plugin/dynamic_dll_plugin.js @@ -18,7 +18,7 @@ */ import { DllCompiler } from './dll_compiler'; -import { IS_KIBANA_DISTRIBUTABLE } from '../../utils'; +import { IS_KIBANA_DISTRIBUTABLE } from '../../legacy/utils'; import RawModule from 'webpack/lib/RawModule'; import webpack from 'webpack'; import path from 'path'; diff --git a/src/optimize/index.js b/src/optimize/index.js index 5607c2602d994be..9cc62a6e1626d51 100644 --- a/src/optimize/index.js +++ b/src/optimize/index.js @@ -20,7 +20,7 @@ import FsOptimizer from './fs_optimizer'; import { createBundlesRoute } from './bundles_route'; import { DllCompiler } from './dynamic_dll_plugin'; -import { fromRoot } from '../utils'; +import { fromRoot } from '../legacy/utils'; export default async (kbnServer, server, config) => { if (!config.get('optimize.enabled')) return; diff --git a/src/optimize/public_path_placeholder.js b/src/optimize/public_path_placeholder.js index 3cbe7e13b284f5e..76485305d793a8f 100644 --- a/src/optimize/public_path_placeholder.js +++ b/src/optimize/public_path_placeholder.js @@ -17,7 +17,7 @@ * under the License. */ -import { createReplaceStream } from '../utils'; +import { createReplaceStream } from '../legacy/utils'; import * as Rx from 'rxjs'; import { take, takeUntil } from 'rxjs/operators'; diff --git a/src/optimize/watch/watch_optimizer.js b/src/optimize/watch/watch_optimizer.js index 5c4b5e11e3c1534..159ba68a6aaba8f 100644 --- a/src/optimize/watch/watch_optimizer.js +++ b/src/optimize/watch/watch_optimizer.js @@ -20,7 +20,7 @@ import BaseOptimizer from '../base_optimizer'; import { createBundlesRoute } from '../bundles_route'; import { DllCompiler } from '../dynamic_dll_plugin'; -import { fromRoot } from '../../utils'; +import { fromRoot } from '../../legacy/utils'; import * as Rx from 'rxjs'; import { mergeMap, take } from 'rxjs/operators'; diff --git a/src/optimize/watch/watch_server.js b/src/optimize/watch/watch_server.js index b45a8c8782e9dd5..3c3a177fdfd283a 100644 --- a/src/optimize/watch/watch_server.js +++ b/src/optimize/watch/watch_server.js @@ -19,7 +19,7 @@ import { Server } from 'hapi'; -import { registerHapiPlugins } from '../../server/http/register_hapi_plugins'; +import { registerHapiPlugins } from '../../legacy/server/http/register_hapi_plugins'; export default class WatchServer { constructor(host, port, basePath, optimizer) { diff --git a/tasks/config/karma.js b/tasks/config/karma.js index 6e80d664eb2deba..a59692f1f405101 100644 --- a/tasks/config/karma.js +++ b/tasks/config/karma.js @@ -171,7 +171,7 @@ module.exports = function (grunt) { * a test is running in by searching for the "ready to load tests for shard X" * log message. * - * [1]: src/ui/public/test_harness/test_sharding/setup_test_sharding.js + * [1]: src/legacy/ui/public/test_harness/test_sharding/setup_test_sharding.js */ times(TOTAL_CI_SHARDS, i => { const n = i + 1; diff --git a/tasks/config/watch.js b/tasks/config/watch.js index 87853ec307b02b2..728b179e8a1f937 100644 --- a/tasks/config/watch.js +++ b/tasks/config/watch.js @@ -19,7 +19,7 @@ module.exports = { peg: { - files: ['src/utils/kuery/ast/*.peg'], + files: ['src/legacy/utils/kuery/ast/*.peg'], tasks: ['peg'] } }; diff --git a/test/api_integration/apis/index_patterns/es_errors/errors.js b/test/api_integration/apis/index_patterns/es_errors/errors.js index 9a0871576e2677e..94ac82a6118ddb7 100644 --- a/test/api_integration/apis/index_patterns/es_errors/errors.js +++ b/test/api_integration/apis/index_patterns/es_errors/errors.js @@ -26,7 +26,7 @@ import { createNoMatchingIndicesError, isNoMatchingIndicesError, convertEsError -} from '../../../../../src/server/index_patterns/service/lib/errors'; +} from '../../../../../src/legacy/server/index_patterns/service/lib/errors'; import { getIndexNotFoundError, diff --git a/test/api_integration/apis/saved_objects/migrations.js b/test/api_integration/apis/saved_objects/migrations.js index 827c9224545a553..976b4a22d5bd98c 100644 --- a/test/api_integration/apis/saved_objects/migrations.js +++ b/test/api_integration/apis/saved_objects/migrations.js @@ -26,9 +26,9 @@ import { assert } from 'chai'; import { DocumentMigrator, IndexMigrator, -} from '../../../../src/server/saved_objects/migrations/core'; -import { SavedObjectsSerializer } from '../../../../src/server/saved_objects/serialization'; -import { SavedObjectsSchema } from '../../../../src/server/saved_objects/schema'; +} from '../../../../src/legacy/server/saved_objects/migrations/core'; +import { SavedObjectsSerializer } from '../../../../src/legacy/server/saved_objects/serialization'; +import { SavedObjectsSchema } from '../../../../src/legacy/server/saved_objects/schema'; export default ({ getService }) => { const es = getService('es'); diff --git a/tsconfig.json b/tsconfig.json index 5062e0093a483f5..f9968e144664f80 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ // Allows for importing from `kibana` package for the exported types. "kibana": ["./kibana"], "ui/*": [ - "src/ui/public/*" + "src/legacy/ui/public/*" ], "test_utils/*": [ "src/test_utils/public/*" diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js index 3a0c09ba98d447b..f661ed5ad10bb42 100644 --- a/x-pack/dev-tools/jest/create_jest_config.js +++ b/x-pack/dev-tools/jest/create_jest_config.js @@ -21,7 +21,7 @@ export function createJestConfig({ "tsx", ], moduleNameMapper: { - "^ui/(.*)": `${kibanaDirectory}/src/ui/public/$1`, + "^ui/(.*)": `${kibanaDirectory}/src/legacy/ui/public/$1`, "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": `${kibanaDirectory}/src/dev/jest/mocks/file_mock.js`, "\\.(css|less|scss)$": `${kibanaDirectory}/src/dev/jest/mocks/style_mock.js`, diff --git a/x-pack/plugins/apm/public/index.scss b/x-pack/plugins/apm/public/index.scss index f4b4d0d3a27dc27..58587758121e5b3 100644 --- a/x-pack/plugins/apm/public/index.scss +++ b/x-pack/plugins/apm/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; /* APM plugin styles */ diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/apm_telemetry.test.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/apm_telemetry.test.ts index ea393907862d7e9..cced1b162d5ba12 100644 --- a/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/apm_telemetry.test.ts +++ b/x-pack/plugins/apm/server/lib/apm_telemetry/__test__/apm_telemetry.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { SavedObjectAttributes } from 'src/server/saved_objects/service/saved_objects_client'; +import { SavedObjectAttributes } from 'src/legacy/server/saved_objects/service/saved_objects_client'; import { AgentName, APM_TELEMETRY_DOC_ID, diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/apm_telemetry.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/apm_telemetry.ts index a8980093719887a..4e1e27df856dac9 100644 --- a/x-pack/plugins/apm/server/lib/apm_telemetry/apm_telemetry.ts +++ b/x-pack/plugins/apm/server/lib/apm_telemetry/apm_telemetry.ts @@ -6,7 +6,7 @@ import { Server } from 'hapi'; import { countBy } from 'lodash'; -import { SavedObjectAttributes } from 'src/server/saved_objects/service/saved_objects_client'; +import { SavedObjectAttributes } from 'src/legacy/server/saved_objects/service/saved_objects_client'; // Support telemetry for additional agent types by appending definitions in // mappings.json and the AgentName enum. diff --git a/x-pack/plugins/beats_management/wallaby.js b/x-pack/plugins/beats_management/wallaby.js index eb5652f15477449..40562b2c8e42a7e 100644 --- a/x-pack/plugins/beats_management/wallaby.js +++ b/x-pack/plugins/beats_management/wallaby.js @@ -44,7 +44,7 @@ module.exports = function (wallaby) { wallaby.testFramework.configure({ rootDir: wallaby.localProjectDir, moduleNameMapper: { - '^ui/(.*)': `${kibanaDirectory}/src/ui/public/$1`, + '^ui/(.*)': `${kibanaDirectory}/src/legacy/ui/public/$1`, // eslint-disable-next-line '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': `${kibanaDirectory}/src/dev/jest/mocks/file_mock.js`, '\\.(css|less|scss)$': `${kibanaDirectory}/src/dev/jest/mocks/style_mock.js`, diff --git a/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js b/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js index 7f61a6a37ed31c2..8280a4ecb7e54f2 100644 --- a/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js +++ b/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js @@ -48,7 +48,7 @@ export class ElementShareContainer extends React.PureComponent { // issue, track the completed state locally and set the // [data-render-complete] value accordingly. // this is similar to renderComplete directive in Kibana, - // see: src/ui/public/render_complete/directive.js + // see: src/legacy/ui/public/render_complete/directive.js this.setState({ renderComplete: true }); }); } diff --git a/x-pack/plugins/canvas/public/lib/notify.js b/x-pack/plugins/canvas/public/lib/notify.js index 426cf687d54e45b..c8cbac191caf57f 100644 --- a/x-pack/plugins/canvas/public/lib/notify.js +++ b/x-pack/plugins/canvas/public/lib/notify.js @@ -28,7 +28,7 @@ const getToast = (err, opts = {}) => { export const notify = { /* * @param {(string | Object)} err: message or Error object - * @param {Object} opts: option to override toast title or icon, see https://github.com/elastic/kibana/blob/master/src/ui/public/notify/toasts/TOAST_NOTIFICATIONS.md + * @param {Object} opts: option to override toast title or icon, see https://github.com/elastic/kibana/blob/master/src/legacy/ui/public/notify/toasts/TOAST_NOTIFICATIONS.md */ error(err, opts) { toastNotifications.addDanger(getToast(err, opts)); diff --git a/x-pack/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss index 4a18622736a224e..8f67fbbe1d0800c 100644 --- a/x-pack/plugins/canvas/public/style/index.scss +++ b/x-pack/plugins/canvas/public/style/index.scss @@ -1,4 +1,4 @@ -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Canvas core @import 'hackery'; diff --git a/x-pack/plugins/cross_cluster_replication/public/index.scss b/x-pack/plugins/cross_cluster_replication/public/index.scss index 9fe78613845dd0f..fc1b118a5f77fdc 100644 --- a/x-pack/plugins/cross_cluster_replication/public/index.scss +++ b/x-pack/plugins/cross_cluster_replication/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; // Cross Cluster Replication plugin styles diff --git a/x-pack/plugins/graph/public/index.scss b/x-pack/plugins/graph/public/index.scss index 808ef23afdd7f89..eb166638ca2484e 100644 --- a/x-pack/plugins/graph/public/index.scss +++ b/x-pack/plugins/graph/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; /* Graph plugin styles */ diff --git a/x-pack/plugins/graph/public/templates/_graph.scss b/x-pack/plugins/graph/public/templates/_graph.scss index 556988ee99d822e..5768ddb96b6b56a 100644 --- a/x-pack/plugins/graph/public/templates/_graph.scss +++ b/x-pack/plugins/graph/public/templates/_graph.scss @@ -1,4 +1,4 @@ -@import 'ui/public/chrome/variables'; +@import 'src/legacy/ui/public/chrome/variables'; @mixin gphSvgText() { font-family: $euiFontFamily; diff --git a/x-pack/plugins/index_lifecycle_management/public/index.scss b/x-pack/plugins/index_lifecycle_management/public/index.scss index f97f8a43731cb16..53e90e2aae35ba3 100644 --- a/x-pack/plugins/index_lifecycle_management/public/index.scss +++ b/x-pack/plugins/index_lifecycle_management/public/index.scss @@ -1,3 +1,3 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; @import 'index_lifecycle_management'; \ No newline at end of file diff --git a/x-pack/plugins/index_management/public/index.scss b/x-pack/plugins/index_management/public/index.scss index e5fcf114bcc08a8..939c9fd84042179 100644 --- a/x-pack/plugins/index_management/public/index.scss +++ b/x-pack/plugins/index_management/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; // Index management plugin styles diff --git a/x-pack/plugins/infra/public/index.scss b/x-pack/plugins/infra/public/index.scss index 51529d16f6126f0..44e16ef8f79e919 100644 --- a/x-pack/plugins/infra/public/index.scss +++ b/x-pack/plugins/infra/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; /* Infra plugin styles */ diff --git a/x-pack/plugins/license_management/public/index.scss b/x-pack/plugins/license_management/public/index.scss index 268372a9498d42c..1887a9b48f3659d 100644 --- a/x-pack/plugins/license_management/public/index.scss +++ b/x-pack/plugins/license_management/public/index.scss @@ -1,5 +1,5 @@ // EUI globals -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // License amnagement plugin styles diff --git a/x-pack/plugins/maps/public/index.scss b/x-pack/plugins/maps/public/index.scss index 664c837a4bb73ff..7549877b468614a 100644 --- a/x-pack/plugins/maps/public/index.scss +++ b/x-pack/plugins/maps/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; /* GIS plugin styles */ diff --git a/x-pack/plugins/ml/jsconfig.json b/x-pack/plugins/ml/jsconfig.json index 4ab033a2f8dcac6..484e750334291f3 100644 --- a/x-pack/plugins/ml/jsconfig.json +++ b/x-pack/plugins/ml/jsconfig.json @@ -5,7 +5,7 @@ "baseUrl": "../../../.", "paths": { "ui/*": [ - "src/ui/public/*" + "src/legacy/ui/public/*" ], "plugins/ml/*": [ "x-pack/plugins/ml/public/*" diff --git a/x-pack/plugins/ml/public/index.scss b/x-pack/plugins/ml/public/index.scss index bc0bb8e385cb653..c31c1c2804c9692 100644 --- a/x-pack/plugins/ml/public/index.scss +++ b/x-pack/plugins/ml/public/index.scss @@ -1,5 +1,5 @@ // Should import both the EUI constants and any Kibana ones that are considered global -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // ML needs EUI card styling till it fully adopts React components @import '@elastic/eui/src/components/panel/variables'; diff --git a/x-pack/plugins/monitoring/public/index.scss b/x-pack/plugins/monitoring/public/index.scss index 24a577aa0901d8a..674718ff534a166 100644 --- a/x-pack/plugins/monitoring/public/index.scss +++ b/x-pack/plugins/monitoring/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; // Temporary hacks @import 'hacks'; diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/init.js b/x-pack/plugins/monitoring/server/kibana_monitoring/init.js index 90d9a6b5de7d18b..64242d1fe4f34fa 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/init.js +++ b/x-pack/plugins/monitoring/server/kibana_monitoring/init.js @@ -12,7 +12,7 @@ import { BulkUploader } from './bulk_uploader'; * - Ops Events - essentially Kibana's /api/status * - Usage Stats - essentially Kibana's /api/stats * - Kibana Settings - select uiSettings - * @param {Object} kbnServer manager of Kibana services - see `src/server/kbn_server` in Kibana core + * @param {Object} kbnServer manager of Kibana services - see `src/legacy/server/kbn_server` in Kibana core * @param {Object} server HapiJS server instance */ export function initBulkUploader(kbnServer, server) { diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/lib/get_kibana_info_for_stats.js b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/get_kibana_info_for_stats.js index 7c9cb7dc530c9e3..3928caeaf3ab916 100644 --- a/x-pack/plugins/monitoring/server/kibana_monitoring/lib/get_kibana_info_for_stats.js +++ b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/get_kibana_info_for_stats.js @@ -12,7 +12,7 @@ const snapshotRegex = /-snapshot/i; * This provides a common structure to apply to all Kibana monitoring documents so that they can be commonly * searched, field-collapsed, and aggregated against. * - * @param {Object} kbnServer manager of Kibana services - see `src/server/kbn_server` in Kibana core + * @param {Object} kbnServer manager of Kibana services - see `src/legacy/server/kbn_server` in Kibana core * @param {Object} config Server config * @param {String} host Kibana host * @return {Object} The object containing a "kibana" field and source instance details. diff --git a/x-pack/plugins/remote_clusters/public/index.scss b/x-pack/plugins/remote_clusters/public/index.scss index 2d1a6374352e9a5..e415fa361c687c7 100644 --- a/x-pack/plugins/remote_clusters/public/index.scss +++ b/x-pack/plugins/remote_clusters/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; @import './sections/remote_cluster_list/components/connection_status/index'; // Index management plugin styles diff --git a/x-pack/plugins/reporting/export_types/csv/server/__tests__/execute_job.js b/x-pack/plugins/reporting/export_types/csv/server/__tests__/execute_job.js index 40209f7e5a89053..1d90952bac2fb54 100644 --- a/x-pack/plugins/reporting/export_types/csv/server/__tests__/execute_job.js +++ b/x-pack/plugins/reporting/export_types/csv/server/__tests__/execute_job.js @@ -10,8 +10,8 @@ import sinon from 'sinon'; import nodeCrypto from '@elastic/node-crypto'; import { CancellationToken } from '../../../../server/lib/esqueue/helpers/cancellation_token'; -import { FieldFormat } from '../../../../../../../src/ui/field_formats/field_format.js'; -import { FieldFormatsService } from '../../../../../../../src/ui/field_formats/field_formats_service.js'; +import { FieldFormat } from '../../../../../../../src/legacy/ui/field_formats/field_format.js'; +import { FieldFormatsService } from '../../../../../../../src/legacy/ui/field_formats/field_formats_service.js'; import { createStringFormat } from '../../../../../../../src/legacy/core_plugins/kibana/common/field_formats/types/string.js'; import { executeJobFactory } from '../execute_job'; diff --git a/x-pack/plugins/reporting/export_types/csv/server/lib/__tests__/field_format_map.js b/x-pack/plugins/reporting/export_types/csv/server/lib/__tests__/field_format_map.js index 8035776166e9a70..4bae340bc5a46ca 100644 --- a/x-pack/plugins/reporting/export_types/csv/server/lib/__tests__/field_format_map.js +++ b/x-pack/plugins/reporting/export_types/csv/server/lib/__tests__/field_format_map.js @@ -6,8 +6,8 @@ import expect from 'expect.js'; -import { FieldFormat } from '../../../../../../../../src/ui/field_formats/field_format.js'; -import { FieldFormatsService } from '../../../../../../../../src/ui/field_formats/field_formats_service.js'; +import { FieldFormat } from '../../../../../../../../src/legacy/ui/field_formats/field_format.js'; +import { FieldFormatsService } from '../../../../../../../../src/legacy/ui/field_formats/field_formats_service.js'; import { createBytesFormat } from '../../../../../../../../src/legacy/core_plugins/kibana/common/field_formats/types/bytes.js'; import { createNumberFormat } from '../../../../../../../../src/legacy/core_plugins/kibana/common/field_formats/types/number.js'; diff --git a/x-pack/plugins/rollup/public/index.scss b/x-pack/plugins/rollup/public/index.scss index a42e24eac21a063..0ad0eac50f7b93b 100644 --- a/x-pack/plugins/rollup/public/index.scss +++ b/x-pack/plugins/rollup/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; // Index management plugin styles diff --git a/x-pack/plugins/searchprofiler/public/index.scss b/x-pack/plugins/searchprofiler/public/index.scss index 2d76791305ab0e0..2db81310a8db485 100644 --- a/x-pack/plugins/searchprofiler/public/index.scss +++ b/x-pack/plugins/searchprofiler/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; // Search profiler plugin styles diff --git a/x-pack/plugins/security/public/index.scss b/x-pack/plugins/security/public/index.scss index 97e6b9fed728ccf..e87a2f5c95287a8 100644 --- a/x-pack/plugins/security/public/index.scss +++ b/x-pack/plugins/security/public/index.scss @@ -1,4 +1,4 @@ -@import 'ui/public/styles/styling_constants'; +@import 'src/legacy/ui/public/styles/styling_constants'; // Logged out styles @import './views/logged_out/index'; diff --git a/x-pack/plugins/spaces/index.ts b/x-pack/plugins/spaces/index.ts index 22abf56a1896b05..bc2b08cd040c6ad 100644 --- a/x-pack/plugins/spaces/index.ts +++ b/x-pack/plugins/spaces/index.ts @@ -6,7 +6,7 @@ import { resolve } from 'path'; -import { SavedObjectsService } from 'src/server/saved_objects'; +import { SavedObjectsService } from 'src/legacy/server/saved_objects'; // @ts-ignore import { AuditLogger } from '../../server/lib/audit_logger'; // @ts-ignore diff --git a/x-pack/plugins/spaces/public/index.scss b/x-pack/plugins/spaces/public/index.scss index 5c2b370a51764b8..7a40872b760cb7f 100644 --- a/x-pack/plugins/spaces/public/index.scss +++ b/x-pack/plugins/spaces/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; /* Spaces plugin styles */ diff --git a/x-pack/plugins/spaces/server/lib/saved_objects_client/saved_objects_client_wrapper_factory.ts b/x-pack/plugins/spaces/server/lib/saved_objects_client/saved_objects_client_wrapper_factory.ts index 05f17300b3fd69c..a10b98625225c47 100644 --- a/x-pack/plugins/spaces/server/lib/saved_objects_client/saved_objects_client_wrapper_factory.ts +++ b/x-pack/plugins/spaces/server/lib/saved_objects_client/saved_objects_client_wrapper_factory.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { SavedObjectsClientWrapperFactory } from 'src/server/saved_objects'; +import { SavedObjectsClientWrapperFactory } from 'src/legacy/server/saved_objects'; import { SpacesService } from '../create_spaces_service'; import { SpacesSavedObjectsClient } from './spaces_saved_objects_client'; diff --git a/x-pack/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.ts b/x-pack/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.ts index d205c21c880e961..b7326e1f344a4cd 100644 --- a/x-pack/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.ts +++ b/x-pack/plugins/spaces/server/lib/saved_objects_client/spaces_saved_objects_client.ts @@ -13,7 +13,7 @@ import { SavedObjectAttributes, SavedObjectsClient, UpdateOptions, -} from 'src/server/saved_objects/service/saved_objects_client'; +} from 'src/legacy/server/saved_objects/service/saved_objects_client'; import { DEFAULT_SPACE_ID } from '../../../common/constants'; import { SpacesService } from '../create_spaces_service'; diff --git a/x-pack/plugins/spaces/server/lib/space_request_interceptors.test.ts b/x-pack/plugins/spaces/server/lib/space_request_interceptors.test.ts index 7604cbc06f71267..cef8fa788319155 100644 --- a/x-pack/plugins/spaces/server/lib/space_request_interceptors.test.ts +++ b/x-pack/plugins/spaces/server/lib/space_request_interceptors.test.ts @@ -7,7 +7,7 @@ import { Server } from 'hapi'; import sinon from 'sinon'; -import { SavedObject } from 'src/server/saved_objects'; +import { SavedObject } from 'src/legacy/server/saved_objects'; import { initSpacesRequestInterceptors } from './space_request_interceptors'; describe('interceptors', () => { diff --git a/x-pack/plugins/upgrade_assistant/common/types.ts b/x-pack/plugins/upgrade_assistant/common/types.ts index 6b628181bdf298a..5549fdde9f2a061 100644 --- a/x-pack/plugins/upgrade_assistant/common/types.ts +++ b/x-pack/plugins/upgrade_assistant/common/types.ts @@ -8,7 +8,7 @@ import { Legacy } from 'kibana'; import { SavedObject, SavedObjectAttributes, -} from 'src/server/saved_objects/service/saved_objects_client'; +} from 'src/legacy/server/saved_objects/service/saved_objects_client'; export enum ReindexStep { // Enum values are spaced out by 10 to give us room to insert steps in between. diff --git a/x-pack/plugins/upgrade_assistant/public/index.scss b/x-pack/plugins/upgrade_assistant/public/index.scss index 7fc22c8d8f1f11d..999cca93fcd7a03 100644 --- a/x-pack/plugins/upgrade_assistant/public/index.scss +++ b/x-pack/plugins/upgrade_assistant/public/index.scss @@ -1,3 +1,3 @@ -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; @import './components/index'; diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts index 99dc052f9ff3d21..f574dd51b0b6765 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts @@ -10,7 +10,7 @@ import { CallCluster } from 'src/legacy/core_plugins/elasticsearch'; import { FindResponse, SavedObjectsClient, -} from 'src/server/saved_objects/service/saved_objects_client'; +} from 'src/legacy/server/saved_objects/service/saved_objects_client'; import { IndexGroup, REINDEX_OP_TYPE, diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts index d2b001a77ed0d53..966c0ffb1bc046c 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/worker.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ import { CallCluster, CallClusterWithRequest } from 'src/legacy/core_plugins/elasticsearch'; -import { Request, Server } from 'src/server/kbn_server'; -import { SavedObjectsClient } from 'src/server/saved_objects'; +import { Request, Server } from 'src/legacy/server/kbn_server'; +import { SavedObjectsClient } from 'src/legacy/server/saved_objects'; import moment = require('moment'); import { XPackInfo } from 'x-pack/plugins/xpack_main/server/lib/xpack_info'; diff --git a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts index c1f5be4938a00f6..333d1cb2190bc35 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/telemetry/usage_collector.ts @@ -5,7 +5,7 @@ */ import { set } from 'lodash'; -import { SavedObjectsRepository } from 'src/server/saved_objects/service/lib/repository'; +import { SavedObjectsRepository } from 'src/legacy/server/saved_objects/service/lib/repository'; import { UPGRADE_ASSISTANT_DOC_ID, UPGRADE_ASSISTANT_TYPE, diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices.ts index a4d53aa59f09639..7ec9b3a19c80c1c 100644 --- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices.ts +++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices.ts @@ -8,7 +8,7 @@ import Boom from 'boom'; import { Server } from 'hapi'; import { CallCluster } from 'src/legacy/core_plugins/elasticsearch'; -import { SavedObjectsClient } from 'src/server/saved_objects'; +import { SavedObjectsClient } from 'src/legacy/server/saved_objects'; import { ReindexStatus } from '../../common/types'; import { reindexServiceFactory, ReindexWorker } from '../lib/reindexing'; import { CredentialStore } from '../lib/reindexing/credential_store'; diff --git a/x-pack/plugins/watcher/public/index.scss b/x-pack/plugins/watcher/public/index.scss index 5d177cdd37ec15e..3f4682db647b77b 100644 --- a/x-pack/plugins/watcher/public/index.scss +++ b/x-pack/plugins/watcher/public/index.scss @@ -1,5 +1,5 @@ // Import the EUI global scope so we can use EUI constants -@import 'ui/public/styles/_styling_constants'; +@import 'src/legacy/ui/public/styles/_styling_constants'; // Temporary hacks @import 'hacks'; diff --git a/x-pack/tasks/helpers/get_plugins.js b/x-pack/tasks/helpers/get_plugins.js index 91f371f7fce2f60..46d01dd9d7b3537 100644 --- a/x-pack/tasks/helpers/get_plugins.js +++ b/x-pack/tasks/helpers/get_plugins.js @@ -8,7 +8,7 @@ import { resolve } from 'path'; import yargs from 'yargs'; import glob from 'glob'; import { toArray } from 'rxjs/operators'; -import { findPluginSpecs } from '../../../src/plugin_discovery'; +import { findPluginSpecs } from '../../../src/legacy/plugin_discovery'; /* Usage: diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json index 769851f1317464b..a724e008f3c29d8 100644 --- a/x-pack/tsconfig.json +++ b/x-pack/tsconfig.json @@ -14,7 +14,7 @@ "compilerOptions": { "paths": { "ui/*": [ - "src/ui/public/*" + "src/legacy/ui/public/*" ], "plugins/xpack_main/*": [ "x-pack/plugins/xpack_main/public/*"