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.
This commit is contained in:
Court Ewing 2019-02-07 12:02:47 -05:00
parent 049814d53c
commit 2ce51a5be5
226 changed files with 354 additions and 357 deletions

View file

@ -7,12 +7,12 @@ bower_components
/optimize /optimize
/built_assets /built_assets
/src/fixtures/vislib/mock_data /src/fixtures/vislib/mock_data
/src/ui/public/angular-bootstrap /src/legacy/ui/public/angular-bootstrap
/src/ui/public/flot-charts /src/legacy/ui/public/flot-charts
/test/fixtures/scenarios /test/fixtures/scenarios
/src/legacy/core_plugins/console/public/webpackShims /src/legacy/core_plugins/console/public/webpackShims
/src/legacy/core_plugins/console/public/tests/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/legacy/core_plugins/timelion/public/webpackShims/jquery.flot.*
/src/core/lib/kbn_internal_native_observable /src/core/lib/kbn_internal_native_observable
/packages/*/target /packages/*/target

2
.github/CODEOWNERS vendored
View file

@ -17,7 +17,7 @@
# Security # Security
/x-pack/plugins/security/ @elastic/kibana-security /x-pack/plugins/security/ @elastic/kibana-security
/x-pack/plugins/spaces/ @elastic/kibana-security /x-pack/plugins/spaces/ @elastic/kibana-security
/src/server/csp/ @elastic/kibana-security /src/legacy/server/csp/ @elastic/kibana-security
# Design # Design
**/*.scss @elastic/kibana-design **/*.scss @elastic/kibana-design

View file

@ -1,7 +1,7 @@
{ {
"paths": { "paths": {
"common.ui": "src/ui", "common.ui": "src/legacy/ui",
"server": "src/server", "server": "src/legacy/server",
"console": "src/legacy/core_plugins/console", "console": "src/legacy/core_plugins/console",
"core": "src/core", "core": "src/core",
"inputControl": "src/legacy/core_plugins/input_control_vis", "inputControl": "src/legacy/core_plugins/input_control_vis",
@ -47,8 +47,8 @@
}, },
"exclude": [ "exclude": [
"src/core/public/fatal_errors/get_error_info.ts", "src/core/public/fatal_errors/get_error_info.ts",
"src/ui/ui_render/bootstrap/app_bootstrap.js", "src/legacy/ui/ui_render/bootstrap/app_bootstrap.js",
"src/ui/ui_render/ui_render_mixin.js", "src/legacy/ui/ui_render/ui_render_mixin.js",
"x-pack/plugins/infra/public/graphql/types.ts", "x-pack/plugins/infra/public/graphql/types.ts",
"x-pack/plugins/infra/public/utils/loading_state/loading_result.ts", "x-pack/plugins/infra/public/utils/loading_state/loading_result.ts",
"x-pack/plugins/infra/server/graphql/types.ts", "x-pack/plugins/infra/server/graphql/types.ts",

View file

@ -32,7 +32,7 @@ out an open PR:
- [CONTRIBUTING.md](CONTRIBUTING.md) will help you get Kibana up and running. - [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). - 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 - For all other questions, check out the [FAQ.md](FAQ.md) and
[wiki](https://github.com/elastic/kibana/wiki). [wiki](https://github.com/elastic/kibana/wiki).

View file

@ -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: certain components. Here is a breakdown of those modules:
- *`import 'ui/autoload/styles'`* - *`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'`* - *`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'`* - *`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'`* - *`import 'ui/autoload/modules'`*
Imports angular and several ui services and "components" which Kibana 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: 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 '.' * if the path starts with a '.'
** append it the directory of the current file ** append it the directory of the current file
** proceed to *3* ** proceed to *3*

View file

@ -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. `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 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 Both methods return an `EmbeddedVisualizeHandler`, that gives you some access
to the visualization. The `embedVisualizationWithSavedObject` method will return 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 - `removeRenderCompleteListener(listener)`: removes an event listener from the handler again
You can find the detailed `EmbeddedVisualizeHandler` documentation in its You can find the detailed `EmbeddedVisualizeHandler` documentation in its
{repo}blob/{branch}/src/ui/public/visualize/loader/embedded_visualize_handler.ts[source code]. {repo}blob/{branch}/src/legacy/ui/public/visualize/loader/embedded_visualize_handler.ts[source code].

2
kibana.d.ts vendored
View file

@ -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). * 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 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. * Re-export legacy types under a namespace.

View file

@ -26,8 +26,8 @@ exports.getWebpackConfig = function(kibanaPath, projectRoot, config) {
const fromKibana = (...path) => resolve(kibanaPath, ...path); const fromKibana = (...path) => resolve(kibanaPath, ...path);
const alias = { const alias = {
// Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/ui/ui_bundler_env.js#L30-L36 // Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/legacy/ui/ui_bundler_env.js#L30-L36
ui: fromKibana('src/ui/public'), ui: fromKibana('src/legacy/ui/public'),
test_harness: fromKibana('src/test_harness/public'), test_harness: fromKibana('src/test_harness/public'),
querystring: 'querystring-browser', querystring: 'querystring-browser',
moment$: fromKibana('webpackShims/moment'), moment$: fromKibana('webpackShims/moment'),

View file

@ -33,7 +33,7 @@ For example:
src/legacy/core_plugins/kibana/translations/fr.json 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 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 defined via `i18n.locale` option in `config/kibana.yml` then it will be used as a base

View file

@ -18,7 +18,7 @@
*/ */
import _ from 'lodash'; import _ from 'lodash';
import { pkg } from '../utils'; import { pkg } from '../legacy/utils';
import Command from './command'; import Command from './command';
import serveCommand from './serve/serve'; import serveCommand from './serve/serve';

View file

@ -27,8 +27,8 @@ import { first, mapTo, filter, map, take } from 'rxjs/operators';
import Log from '../log'; import Log from '../log';
import Worker from './worker'; import Worker from './worker';
import { Config } from '../../server/config/config'; import { Config } from '../../legacy/server/config/config';
import { transformDeprecations } from '../../server/config/transform_deprecations'; import { transformDeprecations } from '../../legacy/server/config/transform_deprecations';
process.env.kbnWorkerType = 'managr'; process.env.kbnWorkerType = 'managr';
@ -160,13 +160,13 @@ export default class ClusterManager {
setupWatching(extraPaths, extraIgnores) { setupWatching(extraPaths, extraIgnores) {
const chokidar = require('chokidar'); const chokidar = require('chokidar');
const { fromRoot } = require('../../utils'); const { fromRoot } = require('../../legacy/utils');
const watchPaths = [ const watchPaths = [
fromRoot('src/legacy/core_plugins'), fromRoot('src/legacy/core_plugins'),
fromRoot('src/server'), fromRoot('src/legacy/server'),
fromRoot('src/ui'), fromRoot('src/legacy/ui'),
fromRoot('src/utils'), fromRoot('src/legacy/utils'),
fromRoot('x-pack/common'), fromRoot('x-pack/common'),
fromRoot('x-pack/plugins'), fromRoot('x-pack/plugins'),
fromRoot('x-pack/server'), fromRoot('x-pack/server'),

View file

@ -21,7 +21,7 @@ import _ from 'lodash';
import cluster from 'cluster'; import cluster from 'cluster';
import { EventEmitter } from 'events'; import { EventEmitter } from 'events';
import { BinderFor, fromRoot } from '../../utils'; import { BinderFor, fromRoot } from '../../legacy/utils';
const cliPath = fromRoot('src/cli'); const cliPath = fromRoot('src/cli');
const baseArgs = _.difference(process.argv.slice(2), ['--no-watch']); const baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);

View file

@ -25,7 +25,7 @@ import mkdirp from 'mkdirp';
import rimraf from 'rimraf'; import rimraf from 'rimraf';
import { safeDump } from 'js-yaml'; 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'; import { getConfigFromFiles } from '../../../core/server/config/read_config';
const testConfigFile = follow('__fixtures__/reload_logging_config/kibana.test.yml'); const testConfigFile = follow('__fixtures__/reload_logging_config/kibana.test.yml');

View file

@ -20,8 +20,8 @@
import path from 'path'; import path from 'path';
import { set } from 'lodash'; import { set } from 'lodash';
import { Keystore } from '../../server/keystore'; import { Keystore } from '../../legacy/server/keystore';
import { getData } from '../../server/path'; import { getData } from '../../legacy/server/path';
export function readKeystore(dataPath = getData()) { export function readKeystore(dataPath = getData()) {
const keystore = new Keystore(path.join(dataPath, 'kibana.keystore')); const keystore = new Keystore(path.join(dataPath, 'kibana.keystore'));

View file

@ -20,8 +20,8 @@
import path from 'path'; import path from 'path';
import { readKeystore } from './read_keystore'; import { readKeystore } from './read_keystore';
jest.mock('../../server/keystore'); jest.mock('../../legacy/server/keystore');
import { Keystore } from '../../server/keystore'; import { Keystore } from '../../legacy/server/keystore';
describe('cli/serve/read_keystore', () => { describe('cli/serve/read_keystore', () => {
beforeEach(() => { beforeEach(() => {

View file

@ -21,8 +21,8 @@ import _ from 'lodash';
import { statSync, lstatSync, realpathSync } from 'fs'; import { statSync, lstatSync, realpathSync } from 'fs';
import { resolve } from 'path'; import { resolve } from 'path';
import { fromRoot } from '../../utils'; import { fromRoot } from '../../legacy/utils';
import { getConfig } from '../../server/path'; import { getConfig } from '../../legacy/server/path';
import { bootstrap } from '../../core/server'; import { bootstrap } from '../../core/server';
import { readKeystore } from './read_keystore'; import { readKeystore } from './read_keystore';

View file

@ -18,8 +18,8 @@
*/ */
import Logger from '../cli_plugin/lib/logger'; import Logger from '../cli_plugin/lib/logger';
import { confirm, question } from '../server/utils'; import { confirm, question } from '../legacy/server/utils';
import { createPromiseFromStreams, createConcatStream } from '../utils'; import { createPromiseFromStreams, createConcatStream } from '../legacy/utils';
/** /**
* @param {Keystore} keystore * @param {Keystore} keystore

View file

@ -38,10 +38,10 @@ jest.mock('fs', () => ({
import sinon from 'sinon'; import sinon from 'sinon';
import { PassThrough } from 'stream'; import { PassThrough } from 'stream';
import { Keystore } from '../server/keystore'; import { Keystore } from '../legacy/server/keystore';
import { add } from './add'; import { add } from './add';
import Logger from '../cli_plugin/lib/logger'; 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('Kibana keystore', () => {
describe('add', () => { describe('add', () => {

View file

@ -19,10 +19,10 @@
import { join } from 'path'; import { join } from 'path';
import { pkg } from '../utils'; import { pkg } from '../legacy/utils';
import Command from '../cli/command'; import Command from '../cli/command';
import { getData } from '../server/path'; import { getData } from '../legacy/server/path';
import { Keystore } from '../server/keystore'; import { Keystore } from '../legacy/server/keystore';
const path = join(getData(), 'kibana.keystore'); const path = join(getData(), 'kibana.keystore');
const keystore = new Keystore(path); const keystore = new Keystore(path);

View file

@ -18,7 +18,7 @@
*/ */
import Logger from '../cli_plugin/lib/logger'; 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) { export async function create(keystore, command, options) {
const logger = new Logger(options); const logger = new Logger(options);

View file

@ -37,10 +37,10 @@ jest.mock('fs', () => ({
import sinon from 'sinon'; import sinon from 'sinon';
import { Keystore } from '../server/keystore'; import { Keystore } from '../legacy/server/keystore';
import { create } from './create'; import { create } from './create';
import Logger from '../cli_plugin/lib/logger'; 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('Kibana keystore', () => {
describe('create', () => { describe('create', () => {

View file

@ -35,7 +35,7 @@ jest.mock('fs', () => ({
})); }));
import sinon from 'sinon'; import sinon from 'sinon';
import { Keystore } from '../server/keystore'; import { Keystore } from '../legacy/server/keystore';
import { list } from './list'; import { list } from './list';
import Logger from '../cli_plugin/lib/logger'; import Logger from '../cli_plugin/lib/logger';

View file

@ -29,7 +29,7 @@ jest.mock('fs', () => ({
import sinon from 'sinon'; import sinon from 'sinon';
import { Keystore } from '../server/keystore'; import { Keystore } from '../legacy/server/keystore';
import { remove } from './remove'; import { remove } from './remove';
describe('Kibana keystore', () => { describe('Kibana keystore', () => {

View file

@ -18,7 +18,7 @@
*/ */
import _ from 'lodash'; import _ from 'lodash';
import { pkg } from '../utils'; import { pkg } from '../legacy/utils';
import Command from '../cli/command'; import Command from '../cli/command';
import listCommand from './list'; import listCommand from './list';
import installCommand from './install'; import installCommand from './install';

View file

@ -17,10 +17,10 @@
* under the License. * under the License.
*/ */
import { fromRoot, pkg } from '../../utils'; import { fromRoot, pkg } from '../../legacy/utils';
import install from './install'; import install from './install';
import Logger from '../lib/logger'; import Logger from '../lib/logger';
import { getConfig } from '../../server/path'; import { getConfig } from '../../legacy/server/path';
import { parse, parseMilliseconds } from './settings'; import { parse, parseMilliseconds } from './settings';
import logWarnings from '../lib/log_warnings'; import logWarnings from '../lib/log_warnings';
import { warnIfUsingPluginDirOption } from '../lib/warn_if_plugin_dir_option'; import { warnIfUsingPluginDirOption } from '../lib/warn_if_plugin_dir_option';

View file

@ -18,7 +18,7 @@
*/ */
import path from 'path'; import path from 'path';
import { versionSatisfies, cleanVersion } from '../../utils/version'; import { versionSatisfies, cleanVersion } from '../../legacy/utils/version';
import { statSync } from 'fs'; import { statSync } from 'fs';
export function existingInstall(settings, logger) { export function existingInstall(settings, logger) {

View file

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
import { fromRoot } from '../../utils'; import { fromRoot } from '../../legacy/utils';
import { resolve } from 'path'; import { resolve } from 'path';
import { parseMilliseconds, parse } from './settings'; import { parseMilliseconds, parse } from './settings';

View file

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
import { fromRoot } from '../../utils'; import { fromRoot } from '../../legacy/utils';
import list from './list'; import list from './list';
import Logger from '../lib/logger'; import Logger from '../lib/logger';
import { parse } from './settings'; import { parse } from './settings';

View file

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
import { fromRoot } from '../../utils'; import { fromRoot } from '../../legacy/utils';
import { parse } from './settings'; import { parse } from './settings';
describe('kibana cli', function () { describe('kibana cli', function () {

View file

@ -17,11 +17,11 @@
* under the License. * under the License.
*/ */
import { fromRoot } from '../../utils'; import { fromRoot } from '../../legacy/utils';
import remove from './remove'; import remove from './remove';
import Logger from '../lib/logger'; import Logger from '../lib/logger';
import { parse } from './settings'; import { parse } from './settings';
import { getConfig } from '../../server/path'; import { getConfig } from '../../legacy/server/path';
import logWarnings from '../lib/log_warnings'; import logWarnings from '../lib/log_warnings';
import { warnIfUsingPluginDirOption } from '../lib/warn_if_plugin_dir_option'; import { warnIfUsingPluginDirOption } from '../lib/warn_if_plugin_dir_option';

View file

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
import { fromRoot } from '../../utils'; import { fromRoot } from '../../legacy/utils';
import { parse } from './settings'; import { parse } from './settings';
describe('kibana cli', function () { describe('kibana cli', function () {

View file

@ -23,7 +23,7 @@ import { BehaviorSubject } from 'rxjs';
import { first } from 'rxjs/operators'; import { first } from 'rxjs/operators';
const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); 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'; import { schema, Type, TypeOf } from '@kbn/config-schema';

View file

@ -30,7 +30,7 @@ jest.mock('path', () => ({
})); }));
const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); 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 { Env } from '.';
import { getEnvOptions } from './__mocks__/env'; import { getEnvOptions } from './__mocks__/env';

View file

@ -20,7 +20,7 @@
import { resolve } from 'path'; import { resolve } from 'path';
import process from 'process'; import process from 'process';
import { pkg } from '../../../utils/package_json'; import { pkg } from '../../../legacy/utils/package_json';
export interface PackageInfo { export interface PackageInfo {
version: string; version: string;

View file

@ -29,7 +29,7 @@ import { HttpConfig } from './http_config';
*/ */
export function getServerOptions(config: HttpConfig, { configureTLS = true } = {}) { export function getServerOptions(config: HttpConfig, { configureTLS = true } = {}) {
// Note that all connection options configured here should be exactly the same // 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, // SHOULD BE applied in both places. The only exception is TLS-specific options,
// that are configured only here. // that are configured only here.
const options: ServerOptions = { const options: ServerOptions = {

View file

@ -20,14 +20,14 @@
import { BehaviorSubject, Subject, throwError } from 'rxjs'; import { BehaviorSubject, Subject, throwError } from 'rxjs';
jest.mock('./legacy_platform_proxy'); jest.mock('./legacy_platform_proxy');
jest.mock('../../../server/kbn_server'); jest.mock('../../../legacy/server/kbn_server');
jest.mock('../../../cli/cluster/cluster_manager'); jest.mock('../../../cli/cluster/cluster_manager');
import { first } from 'rxjs/operators'; import { first } from 'rxjs/operators';
import { LegacyService } from '.'; import { LegacyService } from '.';
// @ts-ignore: implicit any for JS file // @ts-ignore: implicit any for JS file
import MockClusterManager from '../../../cli/cluster/cluster_manager'; 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 { Config, ConfigService, Env, ObjectToConfigAdapter } from '../config';
import { getEnvOptions } from '../config/__mocks__/env'; import { getEnvOptions } from '../config/__mocks__/env';
import { logger } from '../logging/__mocks__'; import { logger } from '../logging/__mocks__';

View file

@ -117,7 +117,7 @@ export class LegacyService implements CoreService {
} }
private async createKbnServer(config: Config, deps: Deps) { 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(), { const kbnServer: LegacyKbnServer = new KbnServer(config.toRaw(), {
// If core HTTP service is run we'll receive internal server reference and // 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 // options that were used to create that server so that we can properly

View file

@ -17,8 +17,8 @@
* under the License. * under the License.
*/ */
jest.mock('../../../../server/config'); jest.mock('../../../../legacy/server/config');
jest.mock('../../../../server/logging'); jest.mock('../../../../legacy/server/logging');
import { LogLevel } from '../../logging/log_level'; import { LogLevel } from '../../logging/log_level';
import { LegacyLoggingServer } from './legacy_logging_server'; import { LegacyLoggingServer } from './legacy_logging_server';

View file

@ -20,9 +20,9 @@
import { ServerExtType } from 'hapi'; import { ServerExtType } from 'hapi';
import Podium from 'podium'; import Podium from 'podium';
// @ts-ignore: implicit any for JS file // @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 // @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 { LogLevel } from '../../logging/log_level';
import { LogRecord } from '../../logging/log_record'; import { LogRecord } from '../../logging/log_record';

View file

@ -27,7 +27,7 @@ jest.mock('fs', () => ({
})); }));
const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); 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 { resolve } from 'path';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';

View file

@ -18,7 +18,7 @@
*/ */
const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); 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(); const mockDiscover = jest.fn();
jest.mock('./discovery/plugins_discovery', () => ({ discover: mockDiscover })); jest.mock('./discovery/plugins_discovery', () => ({ discover: mockDiscover }));

View file

@ -20,7 +20,7 @@
import execa from 'execa'; import execa from 'execa';
import chalk from 'chalk'; import chalk from 'chalk';
import { watchStdioForLine } from '../../../utils'; import { watchStdioForLine } from '../../../legacy/utils';
export async function exec(log, cmd, args, options = {}) { export async function exec(log, cmd, args, options = {}) {
const { const {

View file

@ -28,7 +28,7 @@ import { promisify } from 'bluebird';
import mkdirpCb from 'mkdirp'; import mkdirpCb from 'mkdirp';
import del from 'del'; import del from 'del';
import deleteEmpty from 'delete-empty'; import deleteEmpty from 'delete-empty';
import { createPromiseFromStreams, createMapStream } from '../../../utils'; import { createPromiseFromStreams, createMapStream } from '../../../legacy/utils';
import { Extract } from 'tar'; import { Extract } from 'tar';

View file

@ -20,7 +20,7 @@
import gulpBabel from 'gulp-babel'; import gulpBabel from 'gulp-babel';
import vfs from 'vinyl-fs'; import vfs from 'vinyl-fs';
import { createPromiseFromStreams } from '../../../utils'; import { createPromiseFromStreams } from '../../../legacy/utils';
export const TranspileBabelTask = { export const TranspileBabelTask = {
description: 'Transpiling sources with babel', description: 'Transpiling sources with babel',

View file

@ -18,9 +18,9 @@
*/ */
import { toArray } from 'rxjs/operators'; import { toArray } from 'rxjs/operators';
import { buildAll } from '../../../server/sass/build_all'; import { buildAll } from '../../../legacy/server/sass/build_all';
import { findPluginSpecs } from '../../../plugin_discovery/find_plugin_specs'; import { findPluginSpecs } from '../../../legacy/plugin_discovery/find_plugin_specs';
import { collectUiExports } from '../../../ui/ui_exports/collect_ui_exports'; import { collectUiExports } from '../../../legacy/ui/ui_exports/collect_ui_exports';
export const TranspileScssTask = { export const TranspileScssTask = {
description: 'Transpiling SCSS to CSS', description: 'Transpiling SCSS to CSS',

View file

@ -19,7 +19,7 @@
import xml2js from 'xml2js'; import xml2js from 'xml2js';
import vfs from 'vinyl-fs'; import vfs from 'vinyl-fs';
import { createMapStream } from '../../utils/streams'; import { createMapStream } from '../../legacy/utils/streams';
import { getGithubClient, markdownMetadata, paginate } from '../github_utils'; import { getGithubClient, markdownMetadata, paginate } from '../github_utils';
import { find } from 'lodash'; import { find } from 'lodash';
import stripAnsi from 'strip-ansi'; import stripAnsi from 'strip-ansi';

View file

@ -20,16 +20,16 @@
export default { export default {
rootDir: '../../..', rootDir: '../../..',
roots: [ roots: [
'<rootDir>/src/ui', '<rootDir>/src/legacy/ui',
'<rootDir>/src/core', '<rootDir>/src/core',
'<rootDir>/src/legacy/core_plugins', '<rootDir>/src/legacy/core_plugins',
'<rootDir>/src/server', '<rootDir>/src/legacy/server',
'<rootDir>/src/cli', '<rootDir>/src/cli',
'<rootDir>/src/cli_keystore', '<rootDir>/src/cli_keystore',
'<rootDir>/src/cli_plugin', '<rootDir>/src/cli_plugin',
'<rootDir>/src/functional_test_runner', '<rootDir>/src/functional_test_runner',
'<rootDir>/src/dev', '<rootDir>/src/dev',
'<rootDir>/src/utils', '<rootDir>/src/legacy/utils',
'<rootDir>/src/setup_node_env', '<rootDir>/src/setup_node_env',
'<rootDir>/packages', '<rootDir>/packages',
'<rootDir>/src/test_utils', '<rootDir>/src/test_utils',
@ -43,7 +43,7 @@ export default {
'!packages/kbn-ui-framework/src/services/**/*/index.js', '!packages/kbn-ui-framework/src/services/**/*/index.js',
], ],
moduleNameMapper: { moduleNameMapper: {
'^ui/(.*)': '<rootDir>/src/ui/public/$1', '^ui/(.*)': '<rootDir>/src/legacy/ui/public/$1',
'^test_utils/(.*)': '<rootDir>/src/test_utils/public/$1', '^test_utils/(.*)': '<rootDir>/src/test_utils/public/$1',
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/dev/jest/mocks/file_mock.js', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/dev/jest/mocks/file_mock.js',
'\\.(css|less|scss)$': '<rootDir>/src/dev/jest/mocks/style_mock.js', '\\.(css|less|scss)$': '<rootDir>/src/dev/jest/mocks/style_mock.js',

View file

@ -42,7 +42,7 @@ export const IGNORE_FILE_GLOBS = [
'**/{webpackShims,__mocks__}/**/*', '**/{webpackShims,__mocks__}/**/*',
'x-pack/docs/**/*', 'x-pack/docs/**/*',
'src/dev/tslint/rules/*', 'src/dev/tslint/rules/*',
'src/ui/public/assets/fonts/**/*', 'src/legacy/ui/public/assets/fonts/**/*',
// filename must match language code which requires capital letters // filename must match language code which requires capital letters
'**/translations/*.json', '**/translations/*.json',
@ -68,7 +68,7 @@ export const KEBAB_CASE_DIRECTORY_GLOBS = [
* When a file in one of these directories is checked, the directory * When a file in one of these directories is checked, the directory
* matched by these patterns is removed from the path before * matched by these patterns is removed from the path before
* the casing check so that the files casing is still checked. This * 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 * is named to match the npm package and follow the kebab-casing
* convention there, but allows us to still verify that files within * convention there, but allows us to still verify that files within
* that directory use snake_case * that directory use snake_case
@ -81,9 +81,9 @@ export const IGNORE_DIRECTORY_GLOBS = [
'src/babel-*', 'src/babel-*',
'packages/*', 'packages/*',
'packages/kbn-ui-framework/generator-kui', 'packages/kbn-ui-framework/generator-kui',
'src/ui/public/angular-bootstrap', 'src/legacy/ui/public/angular-bootstrap',
'src/ui/public/flot-charts', 'src/legacy/ui/public/flot-charts',
'src/ui/public/utils/lodash-mixins', 'src/legacy/ui/public/utils/lodash-mixins',
'test/functional/fixtures/es_archiver/visualize_source-filters', 'test/functional/fixtures/es_archiver/visualize_source-filters',
'packages/kbn-pm/src/utils/__fixtures__/*', 'packages/kbn-pm/src/utils/__fixtures__/*',
'x-pack/dev-tools', '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/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/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json',
'src/fixtures/vislib/mock_data/terms/_seriesMultiple.js', 'src/fixtures/vislib/mock_data/terms/_seriesMultiple.js',
'src/ui/public/angular-bootstrap/accordion/accordion-group.html', 'src/legacy/ui/public/angular-bootstrap/accordion/accordion-group.html',
'src/ui/public/angular-bootstrap/bindHtml/bindHtml.js', 'src/legacy/ui/public/angular-bootstrap/bindHtml/bindHtml.js',
'src/ui/public/angular-bootstrap/tooltip/tooltip-html-unsafe-popup.html', 'src/legacy/ui/public/angular-bootstrap/tooltip/tooltip-html-unsafe-popup.html',
'src/ui/public/angular-bootstrap/tooltip/tooltip-popup.html', 'src/legacy/ui/public/angular-bootstrap/tooltip/tooltip-popup.html',
'src/ui/public/angular-bootstrap/typeahead/typeahead-match.html', 'src/legacy/ui/public/angular-bootstrap/typeahead/typeahead-match.html',
'src/ui/public/angular-bootstrap/typeahead/typeahead-popup.html', 'src/legacy/ui/public/angular-bootstrap/typeahead/typeahead-popup.html',
'src/ui/public/assets/favicons/android-chrome-192x192.png', 'src/legacy/ui/public/assets/favicons/android-chrome-192x192.png',
'src/ui/public/assets/favicons/android-chrome-256x256.png', 'src/legacy/ui/public/assets/favicons/android-chrome-256x256.png',
'src/ui/public/assets/favicons/android-chrome-512x512.png', 'src/legacy/ui/public/assets/favicons/android-chrome-512x512.png',
'src/ui/public/assets/favicons/apple-touch-icon.png', 'src/legacy/ui/public/assets/favicons/apple-touch-icon.png',
'src/ui/public/assets/favicons/favicon-16x16.png', 'src/legacy/ui/public/assets/favicons/favicon-16x16.png',
'src/ui/public/assets/favicons/favicon-32x32.png', 'src/legacy/ui/public/assets/favicons/favicon-32x32.png',
'src/ui/public/assets/favicons/mstile-70x70.png', 'src/legacy/ui/public/assets/favicons/mstile-70x70.png',
'src/ui/public/assets/favicons/mstile-144x144.png', 'src/legacy/ui/public/assets/favicons/mstile-144x144.png',
'src/ui/public/assets/favicons/mstile-150x150.png', 'src/legacy/ui/public/assets/favicons/mstile-150x150.png',
'src/ui/public/assets/favicons/mstile-310x150.png', 'src/legacy/ui/public/assets/favicons/mstile-310x150.png',
'src/ui/public/assets/favicons/mstile-310x310.png', 'src/legacy/ui/public/assets/favicons/mstile-310x310.png',
'src/ui/public/assets/favicons/safari-pinned-tab.svg', 'src/legacy/ui/public/assets/favicons/safari-pinned-tab.svg',
'src/ui/public/directives/__tests__/confirm-click.js', 'src/legacy/ui/public/directives/__tests__/confirm-click.js',
'src/ui/public/field_format_editor/editors/url/icons/flag-icon.LICENSE', 'src/legacy/ui/public/field_format_editor/editors/url/icons/flag-icon.LICENSE',
'src/ui/public/icons/beats-color.svg', 'src/legacy/ui/public/icons/beats-color.svg',
'src/ui/public/icons/beats-gray.svg', 'src/legacy/ui/public/icons/beats-gray.svg',
'src/ui/public/icons/elasticsearch-color.svg', 'src/legacy/ui/public/icons/elasticsearch-color.svg',
'src/ui/public/icons/elasticsearch-gray.svg', 'src/legacy/ui/public/icons/elasticsearch-gray.svg',
'src/ui/public/icons/kibana-color.svg', 'src/legacy/ui/public/icons/kibana-color.svg',
'src/ui/public/icons/kibana-gray.svg', 'src/legacy/ui/public/icons/kibana-gray.svg',
'src/ui/public/icons/logstash-color.svg', 'src/legacy/ui/public/icons/logstash-color.svg',
'src/ui/public/icons/logstash-gray.svg', 'src/legacy/ui/public/icons/logstash-gray.svg',
'src/ui/public/icons/security-gray.svg', 'src/legacy/ui/public/icons/security-gray.svg',
'src/ui/public/query_bar/lib/queryLanguages.js', 'src/legacy/ui/public/query_bar/lib/queryLanguages.js',
'src/ui/public/styles/bootstrap/component-animations.less', 'src/legacy/ui/public/styles/bootstrap/component-animations.less',
'src/ui/public/styles/bootstrap/input-groups.less', 'src/legacy/ui/public/styles/bootstrap/input-groups.less',
'src/ui/public/styles/bootstrap/list-group.less', 'src/legacy/ui/public/styles/bootstrap/list-group.less',
'src/ui/public/styles/bootstrap/mixins/background-variant.less', 'src/legacy/ui/public/styles/bootstrap/mixins/background-variant.less',
'src/ui/public/styles/bootstrap/mixins/border-radius.less', 'src/legacy/ui/public/styles/bootstrap/mixins/border-radius.less',
'src/ui/public/styles/bootstrap/mixins/center-block.less', 'src/legacy/ui/public/styles/bootstrap/mixins/center-block.less',
'src/ui/public/styles/bootstrap/mixins/grid-framework.less', 'src/legacy/ui/public/styles/bootstrap/mixins/grid-framework.less',
'src/ui/public/styles/bootstrap/mixins/hide-text.less', 'src/legacy/ui/public/styles/bootstrap/mixins/hide-text.less',
'src/ui/public/styles/bootstrap/mixins/list-group.less', 'src/legacy/ui/public/styles/bootstrap/mixins/list-group.less',
'src/ui/public/styles/bootstrap/mixins/nav-divider.less', 'src/legacy/ui/public/styles/bootstrap/mixins/nav-divider.less',
'src/ui/public/styles/bootstrap/mixins/nav-vertical-align.less', 'src/legacy/ui/public/styles/bootstrap/mixins/nav-vertical-align.less',
'src/ui/public/styles/bootstrap/mixins/progress-bar.less', 'src/legacy/ui/public/styles/bootstrap/mixins/progress-bar.less',
'src/ui/public/styles/bootstrap/mixins/reset-filter.less', 'src/legacy/ui/public/styles/bootstrap/mixins/reset-filter.less',
'src/ui/public/styles/bootstrap/mixins/reset-text.less', 'src/legacy/ui/public/styles/bootstrap/mixins/reset-text.less',
'src/ui/public/styles/bootstrap/mixins/responsive-visibility.less', 'src/legacy/ui/public/styles/bootstrap/mixins/responsive-visibility.less',
'src/ui/public/styles/bootstrap/mixins/tab-focus.less', 'src/legacy/ui/public/styles/bootstrap/mixins/tab-focus.less',
'src/ui/public/styles/bootstrap/mixins/table-row.less', 'src/legacy/ui/public/styles/bootstrap/mixins/table-row.less',
'src/ui/public/styles/bootstrap/mixins/text-emphasis.less', 'src/legacy/ui/public/styles/bootstrap/mixins/text-emphasis.less',
'src/ui/public/styles/bootstrap/mixins/text-overflow.less', 'src/legacy/ui/public/styles/bootstrap/mixins/text-overflow.less',
'src/ui/public/styles/bootstrap/mixins/vendor-prefixes.less', 'src/legacy/ui/public/styles/bootstrap/mixins/vendor-prefixes.less',
'src/ui/public/styles/bootstrap/progress-bars.less', 'src/legacy/ui/public/styles/bootstrap/progress-bars.less',
'src/ui/public/styles/bootstrap/responsive-utilities.less', 'src/legacy/ui/public/styles/bootstrap/responsive-utilities.less',
'src/ui/public/typeahead/partials/typeahead-items.html', 'src/legacy/ui/public/typeahead/partials/typeahead-items.html',
'src/ui/public/utils/migrate_legacy_query.js', 'src/legacy/ui/public/utils/migrate_legacy_query.js',
'test/functional/apps/management/exports/_import_objects-conflicts.json', '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/elastic-logo.svg',
'packages/kbn-ui-framework/doc_site/src/images/hint-arrow.svg', 'packages/kbn-ui-framework/doc_site/src/images/hint-arrow.svg',

View file

@ -23,7 +23,7 @@ import { createGunzip, createGzip, Z_BEST_COMPRESSION } from 'zlib';
import { promisify } from 'util'; import { promisify } from 'util';
import globby from 'globby'; import globby from 'globby';
import { createPromiseFromStreams } from '../../utils'; import { createPromiseFromStreams } from '../../legacy/utils';
const unlinkAsync = promisify(Fs.unlink); const unlinkAsync = promisify(Fs.unlink);

View file

@ -23,7 +23,7 @@ import { createReadStream } from 'fs';
import { import {
createPromiseFromStreams, createPromiseFromStreams,
concatStreamProviders, concatStreamProviders,
} from '../../utils'; } from '../../legacy/utils';
import { import {
isGzip, isGzip,

View file

@ -34,7 +34,7 @@ import { fromNode } from 'bluebird';
import { import {
createPromiseFromStreams createPromiseFromStreams
} from '../../utils'; } from '../../legacy/utils';
import { import {
prioritizeMappings, prioritizeMappings,

View file

@ -26,7 +26,7 @@ import mkdirp from 'mkdirp';
import { import {
createListStream, createListStream,
createPromiseFromStreams, createPromiseFromStreams,
} from '../../utils'; } from '../../legacy/utils';
import { import {
createStats, createStats,

View file

@ -22,7 +22,7 @@ import { createReadStream } from 'fs';
import { import {
createPromiseFromStreams createPromiseFromStreams
} from '../../utils'; } from '../../legacy/utils';
import { import {
isGzip, isGzip,

View file

@ -26,7 +26,7 @@ import {
createListStream, createListStream,
createPromiseFromStreams, createPromiseFromStreams,
createConcatStream, createConcatStream,
} from '../../../../utils'; } from '../../../../legacy/utils';
import { createFormatArchiveStreams } from '../format'; import { createFormatArchiveStreams } from '../format';

View file

@ -26,7 +26,7 @@ import {
createConcatStream, createConcatStream,
createListStream, createListStream,
createPromiseFromStreams, createPromiseFromStreams,
} from '../../../../utils'; } from '../../../../legacy/utils';
import { createParseArchiveStreams } from '../parse'; import { createParseArchiveStreams } from '../parse';

View file

@ -23,7 +23,7 @@ import { PassThrough } from 'stream';
import { import {
createIntersperseStream, createIntersperseStream,
createJsonStringifyStream createJsonStringifyStream
} from '../../../utils'; } from '../../../legacy/utils';
import { RECORD_SEPARATOR } from './constants'; import { RECORD_SEPARATOR } from './constants';

View file

@ -24,7 +24,7 @@ import {
createSplitStream, createSplitStream,
createReplaceStream, createReplaceStream,
createJsonParseStream, createJsonParseStream,
} from '../../../utils'; } from '../../../legacy/utils';
import { RECORD_SEPARATOR } from './constants'; import { RECORD_SEPARATOR } from './constants';

View file

@ -25,7 +25,7 @@ import {
createListStream, createListStream,
createPromiseFromStreams, createPromiseFromStreams,
createConcatStream, createConcatStream,
} from '../../../../utils'; } from '../../../../legacy/utils';
import { createGenerateDocRecordsStream } from '../generate_doc_records_stream'; import { createGenerateDocRecordsStream } from '../generate_doc_records_stream';
import { import {

View file

@ -23,7 +23,7 @@ import { delay } from 'bluebird';
import { import {
createListStream, createListStream,
createPromiseFromStreams, createPromiseFromStreams,
} from '../../../../utils'; } from '../../../../legacy/utils';
import { createIndexDocRecordsStream } from '../index_doc_records_stream'; import { createIndexDocRecordsStream } from '../index_doc_records_stream';
import { import {

View file

@ -25,7 +25,7 @@ import {
createPromiseFromStreams, createPromiseFromStreams,
createConcatStream, createConcatStream,
createListStream createListStream
} from '../../../../utils'; } from '../../../../legacy/utils';
import { import {
createCreateIndexStream createCreateIndexStream

View file

@ -22,7 +22,7 @@ import sinon from 'sinon';
import { import {
createListStream, createListStream,
createPromiseFromStreams, createPromiseFromStreams,
} from '../../../../utils'; } from '../../../../legacy/utils';
import { import {
createDeleteIndexStream, createDeleteIndexStream,

View file

@ -24,7 +24,7 @@ import {
createListStream, createListStream,
createPromiseFromStreams, createPromiseFromStreams,
createConcatStream, createConcatStream,
} from '../../../../utils'; } from '../../../../legacy/utils';
import { import {
createStubClient, createStubClient,

View file

@ -25,9 +25,9 @@ import { toArray } from 'rxjs/operators';
import wreck from 'wreck'; import wreck from 'wreck';
import { deleteIndex } from './delete_index'; import { deleteIndex } from './delete_index';
import { collectUiExports } from '../../../ui/ui_exports'; import { collectUiExports } from '../../../legacy/ui/ui_exports';
import { KibanaMigrator } from '../../../server/saved_objects/migrations'; import { KibanaMigrator } from '../../../legacy/server/saved_objects/migrations';
import { findPluginSpecs } from '../../../plugin_discovery'; import { findPluginSpecs } from '../../../legacy/plugin_discovery';
/** /**
* This is an expensive operation, so we'll ensure it only happens once * This is an expensive operation, so we'll ensure it only happens once

View file

@ -24,7 +24,7 @@ import {
createListStream, createListStream,
createPromiseFromStreams, createPromiseFromStreams,
createConcatStream, createConcatStream,
} from '../../../../utils'; } from '../../../../legacy/utils';
import { import {
createFilterRecordsStream, createFilterRecordsStream,

View file

@ -17,8 +17,9 @@
* under the License. * under the License.
*/ */
import { castEsToKbnFieldTypeName } from '../utils'; import { castEsToKbnFieldTypeName } from '../legacy/utils';
import { shouldReadFieldFromDocValues } from '../server/index_patterns/service/lib/field_capabilities/should_read_field_from_doc_values'; // 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() { function stubbedLogstashFields() {
return [ return [

View file

@ -19,7 +19,7 @@
import TestUtilsStubIndexPatternProvider from 'test_utils/stub_index_pattern'; import TestUtilsStubIndexPatternProvider from 'test_utils/stub_index_pattern';
import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields'; import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
import { getKbnFieldType } from '../utils'; import { getKbnFieldType } from '../legacy/utils';
export default function stubbedLogstashIndexPatternService(Private) { export default function stubbedLogstashIndexPatternService(Private) {
const StubIndexPattern = Private(TestUtilsStubIndexPatternProvider); const StubIndexPattern = Private(TestUtilsStubIndexPatternProvider);

View file

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
import { createTransform, Deprecations } from '../../../deprecation'; import { createTransform, Deprecations } from '../../../legacy/deprecation';
export const transformDeprecations = createTransform([ export const transformDeprecations = createTransform([
Deprecations.unused('servers.webdriver') Deprecations.unused('servers.webdriver')

View file

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
import { Deprecations } from '../../../../deprecation'; import { Deprecations } from '../../../deprecation';
import expect from 'expect.js'; import expect from 'expect.js';
import index from '../index'; import index from '../index';
import { noop } from 'lodash'; import { noop } from 'lodash';

View file

@ -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. // Prefix all styles with "con" to avoid conflicts.
// Examples // Examples

View file

@ -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. // Prefix all styles with "icv" to avoid conflicts.
// Examples // Examples

View file

@ -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. // Prefix all styles with "ins" to avoid conflicts.
// Examples // Examples

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createBoolFormat } from '../boolean'; import { createBoolFormat } from '../boolean';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const BoolFormat = createBoolFormat(FieldFormat); const BoolFormat = createBoolFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createBytesFormat } from '../bytes'; import { createBytesFormat } from '../bytes';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const BytesFormat = createBytesFormat(FieldFormat); const BytesFormat = createBytesFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createColorFormat } from '../color'; import { createColorFormat } from '../color';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const ColorFormat = createColorFormat(FieldFormat); const ColorFormat = createColorFormat(FieldFormat);

View file

@ -20,7 +20,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import moment from 'moment-timezone'; import moment from 'moment-timezone';
import { createDateFormat } from '../date'; import { createDateFormat } from '../date';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const DateFormat = createDateFormat(FieldFormat); const DateFormat = createDateFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createDurationFormat } from '../duration'; import { createDurationFormat } from '../duration';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const DurationFormat = createDurationFormat(FieldFormat); const DurationFormat = createDurationFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createIpFormat } from '../ip'; import { createIpFormat } from '../ip';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const IpFormat = createIpFormat(FieldFormat); const IpFormat = createIpFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createNumberFormat } from '../number'; import { createNumberFormat } from '../number';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const NumberFormat = createNumberFormat(FieldFormat); const NumberFormat = createNumberFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createPercentFormat } from '../percent'; import { createPercentFormat } from '../percent';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const PercentFormat = createPercentFormat(FieldFormat); const PercentFormat = createPercentFormat(FieldFormat);

View file

@ -20,7 +20,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import moment from 'moment-timezone'; import moment from 'moment-timezone';
import { createRelativeDateFormat } from '../relative_date'; 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); const RelativeDateFormat = createRelativeDateFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createStringFormat } from '../string'; import { createStringFormat } from '../string';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const StringFormat = createStringFormat(FieldFormat); const StringFormat = createStringFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createTruncateFormat } from '../truncate'; import { createTruncateFormat } from '../truncate';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const TruncateFormat = createTruncateFormat(FieldFormat); const TruncateFormat = createTruncateFormat(FieldFormat);

View file

@ -19,7 +19,7 @@
import expect from 'expect.js'; import expect from 'expect.js';
import { createUrlFormat } from '../url'; import { createUrlFormat } from '../url';
import { FieldFormat } from '../../../../../../../ui/field_formats/field_format'; import { FieldFormat } from '../../../../../../ui/field_formats/field_format';
const UrlFormat = createUrlFormat(FieldFormat); const UrlFormat = createUrlFormat(FieldFormat);

View file

@ -21,7 +21,7 @@ import _ from 'lodash';
import expect from 'expect.js'; import expect from 'expect.js';
import chrome from 'ui/chrome'; import chrome from 'ui/chrome';
import { fieldFormats } from 'ui/registry/field_formats'; 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(); const config = chrome.getUiSettingsClient();

View file

@ -1,7 +1,7 @@
@import 'ui/public/styles/styling_constants'; @import 'src/legacy/ui/public/styles/styling_constants';
// Public UI styles // Public UI styles
@import 'ui/public/index'; @import 'src/legacy/ui/public/index';
// Context styles // Context styles
@import './context/index'; @import './context/index';
@ -19,7 +19,7 @@
@import './visualize/index'; @import './visualize/index';
// Has to come after visualize because of some // Has to come after visualize because of some
// bad cascading in the Editor layout // bad cascading in the Editor layout
@import 'ui/public/vis/index'; @import 'src/legacy/ui/public/vis/index';
// Management styles // Management styles
@import './management/index'; @import './management/index';

View file

@ -26,7 +26,7 @@ import uiRoutes from 'ui/routes';
import { uiModules } from 'ui/modules'; import { uiModules } from 'ui/modules';
import { fatalError, toastNotifications } from 'ui/notify'; import { fatalError, toastNotifications } from 'ui/notify';
import 'ui/accessibility/kbn_ui_ace_keyboard_mode'; import 'ui/accessibility/kbn_ui_ace_keyboard_mode';
import { castEsToKbnFieldTypeName } from '../../../../../../../utils'; import { castEsToKbnFieldTypeName } from '../../../../../../../legacy/utils';
import { SavedObjectsClientProvider } from 'ui/saved_objects'; import { SavedObjectsClientProvider } from 'ui/saved_objects';
import { isNumeric } from 'ui/utils/numeric'; import { isNumeric } from 'ui/utils/numeric';

View file

@ -44,7 +44,7 @@ import { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
import { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query'; import { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
import { recentlyAccessed } from 'ui/persisted_log'; import { recentlyAccessed } from 'ui/persisted_log';
import { timefilter } from 'ui/timefilter'; 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 { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share';
import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing'; import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing';
import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal'; import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal';
@ -135,7 +135,7 @@ function VisEditor(
// Retrieve the resolved SavedVis instance. // Retrieve the resolved SavedVis instance.
const savedVis = $route.current.locals.savedVis; 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. // SearchSource is a promise-based stream of search results that can inherit from other search sources.
const { vis, searchSource } = savedVis; const { vis, searchSource } = savedVis;

View file

@ -17,7 +17,7 @@
* under the License. * 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'; import { collectReferencesDeep } from './collect_references_deep';
const data = [ const data = [

View file

@ -20,7 +20,7 @@
import { import {
SavedObject, SavedObject,
SavedObjectsClient, SavedObjectsClient,
} from '../../../../../../server/saved_objects/service/saved_objects_client'; } from '../../../../../server/saved_objects/service/saved_objects_client';
const MAX_BULK_GET_SIZE = 10000; const MAX_BULK_GET_SIZE = 10000;

View file

@ -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. // Prefix all styles with "mkd" to avoid conflicts.
// Examples // Examples

View file

@ -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. // Prefix all styles with "mtr" to avoid conflicts.
// Examples // Examples

View file

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
import { relativeOptions } from '../../../../../../ui/public/timepicker/relative_options'; import { relativeOptions } from '../../../../../ui/public/timepicker/relative_options';
import _ from 'lodash'; import _ from 'lodash';
import moment from 'moment'; import moment from 'moment';
import { i18n } from '@kbn/i18n'; import { i18n } from '@kbn/i18n';

View file

@ -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. // Prefix all styles with "tvb" to avoid conflicts.
// Examples // Examples

View file

@ -17,7 +17,7 @@
* under the License. * under the License.
*/ */
import { IndexPatternsService } from '../../../../../server/index_patterns/service'; import { IndexPatternsService } from '../../../../server/index_patterns/service';
export const getIndexPatternService = { export const getIndexPatternService = {
assign: 'indexPatternsService', assign: 'indexPatternsService',
method(req) { method(req) {

View file

@ -26,9 +26,9 @@ import LogstashIndexPatternStubProvider from 'fixtures/stubbed_logstash_index_pa
import * as visModule from 'ui/vis'; import * as visModule from 'ui/vis';
import { ImageComparator } from 'test_utils/image_comparator'; import { ImageComparator } from 'test_utils/image_comparator';
import worldJson from './world.json'; import worldJson from './world.json';
import EMS_CATALOGUE from '../../../../../ui/public/vis/__tests__/map/ems_mocks/sample_manifest.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_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_TILES from '../../../../ui/public/vis/__tests__/map/ems_mocks/sample_tiles.json';
import initialPng from './initial.png'; import initialPng from './initial.png';
import toiso3Png from './toiso3.png'; import toiso3Png from './toiso3.png';

View file

@ -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. // Prefix all styles with "rgm" to avoid conflicts.
// Examples // Examples

View file

@ -1 +1 @@
@import 'ui/public/styles/styling_constants'; @import 'src/legacy/ui/public/styles/styling_constants';

View file

@ -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. // Prefix all styles with "tbv" to avoid conflicts.
// Examples // Examples

View file

@ -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. // Prefix all styles with "tgc" to avoid conflicts.
// Examples // Examples

View file

@ -18,7 +18,7 @@
*/ */
import { fromRoot } from '../../../utils'; import { fromRoot } from '../../../legacy/utils';
import { chain } from 'lodash'; import { chain } from 'lodash';
import { resolve } from 'path'; import { resolve } from 'path';
import { fromNode } from 'bluebird'; import { fromNode } from 'bluebird';

Some files were not shown because too many files have changed in this diff Show more