Skip to content

Commit

Permalink
Stop using 'plugins/...' import when within current plugin (elastic#1…
Browse files Browse the repository at this point in the history
  • Loading branch information
kimjoar authored Apr 18, 2018
1 parent 2045c93 commit 6748c6a
Show file tree
Hide file tree
Showing 79 changed files with 144 additions and 144 deletions.
2 changes: 1 addition & 1 deletion src/core_plugins/dev_mode/public/vis_debug_spy_panel.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import visDebugSpyPanelTemplate from 'plugins/dev_mode/vis_debug_spy_panel.html';
import visDebugSpyPanelTemplate from './vis_debug_spy_panel.html';
import { SpyModesRegistryProvider } from 'ui/registry/spy_modes';

function VisDetailsSpyProvider() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sinon from 'sinon';
import expect from 'expect.js';
import ngMock from 'ng_mock';
import 'ui/render_directive';
import 'plugins/kbn_doc_views/views/table';
import '../views/table';
import { DocViewsRegistryProvider } from 'ui/registry/doc_views';
import StubbedLogstashIndexPattern from 'fixtures/stubbed_logstash_index_pattern';
const hit = {
Expand Down
4 changes: 2 additions & 2 deletions src/core_plugins/kbn_doc_views/public/kbn_doc_views.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import 'plugins/kbn_doc_views/views/table';
import 'plugins/kbn_doc_views/views/json';
import './views/table';
import './views/json';
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/area.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { CATEGORY } from 'ui/vis/vis_category';
import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html';
import pointSeriesTemplate from './editors/point_series.html';
import image from './images/icon-area.svg';

export default function PointSeriesVisType(Private) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { uiModules } from 'ui/modules';
import gaugeOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/gauge_options.html';
import gaugeOptionsTemplate from './gauge_options.html';
import _ from 'lodash';
const module = uiModules.get('kibana');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { uiModules } from 'ui/modules';
import heatmapOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/heatmap_options.html';
import heatmapOptionsTemplate from './heatmap_options.html';
import _ from 'lodash';
const module = uiModules.get('kibana');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { uiModules } from 'ui/modules';
import lineInterpolationOptionTemplate from 'plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html';
import lineInterpolationOptionTemplate from './line_interpolation_option.html';
const module = uiModules.get('kibana');

module.directive('lineInterpolationOption', function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { uiModules } from 'ui/modules';
import vislibValueAxesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/category_axis.html';
import vislibValueAxesTemplate from './category_axis.html';
const module = uiModules.get('kibana');

module.directive('vislibCategoryAxis', function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { uiModules } from 'ui/modules';
import vislibGridTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/grid.html';
import vislibGridTemplate from './grid.html';
const module = uiModules.get('kibana');

module.directive('vislibGrid', function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'plugins/kbn_vislib_vis_types/controls/point_series/value_axes.js';
import 'plugins/kbn_vislib_vis_types/controls/point_series/category_axis.js';
import 'plugins/kbn_vislib_vis_types/controls/point_series/series.js';
import 'plugins/kbn_vislib_vis_types/controls/point_series/grid.js';
import './value_axes.js';
import './category_axis.js';
import './series.js';
import './grid.js';
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';
import { uiModules } from 'ui/modules';
import vislibSeriesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/series.html';
import vislibSeriesTemplate from './series.html';
const module = uiModules.get('kibana');

module.directive('vislibSeries', function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'lodash';
import { uiModules } from 'ui/modules';
import vislibValueAxesTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series/value_axes.html';
import vislibValueAxesTemplate from './value_axes.html';
const module = uiModules.get('kibana');

module.directive('vislibValueAxes', function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'ui/directives/inequality';
import { uiModules } from 'ui/modules';
import pointSeriesOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series_options.html';
import pointSeriesOptionsTemplate from './point_series_options.html';
const module = uiModules.get('kibana');

module.directive('pointSeriesOptions', function () {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { uiModules } from 'ui/modules';
import vislibBasicOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html';
import vislibBasicOptionsTemplate from './vislib_basic_options.html';
const module = uiModules.get('kibana');

module.directive('vislibBasicOptions', function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import expect from 'expect.js';
import ngMock from 'ng_mock';
import $ from 'jquery';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import LineVisTypeProvider from 'plugins/kbn_vislib_vis_types/line';
import LineVisTypeProvider from '../../line';
import { VisProvider } from 'ui/vis';
import { AggConfig } from 'ui/vis/agg_config';

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/gauge.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { CATEGORY } from 'ui/vis/vis_category';
import gaugeTemplate from 'plugins/kbn_vislib_vis_types/editors/gauge.html';
import gaugeTemplate from './editors/gauge.html';
import { vislibColorMaps } from 'ui/vislib/components/color/colormaps';
import image from './images/icon-gauge.svg';

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/goal.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { CATEGORY } from 'ui/vis/vis_category';
import gaugeTemplate from 'plugins/kbn_vislib_vis_types/editors/gauge.html';
import gaugeTemplate from './editors/gauge.html';
import { vislibColorMaps } from 'ui/vislib/components/color/colormaps';
import image from './images/icon-goal.svg';

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/heatmap.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { CATEGORY } from 'ui/vis/vis_category';
import heatmapTemplate from 'plugins/kbn_vislib_vis_types/editors/heatmap.html';
import heatmapTemplate from './editors/heatmap.html';
import { vislibColorMaps } from 'ui/vislib/components/color/colormaps';
import image from './images/icon-heatmap.svg';

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/histogram.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { CATEGORY } from 'ui/vis/vis_category';
import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html';
import pointSeriesTemplate from './editors/point_series.html';
import image from './images/icon-vertical.svg';

export default function PointSeriesVisType(Private) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { CATEGORY } from 'ui/vis/vis_category';
import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html';
import pointSeriesTemplate from './editors/point_series.html';
import image from './images/icon-horizontal.svg';

export default function PointSeriesVisType(Private) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { VisTypesRegistryProvider } from 'ui/registry/vis_types';

import histogramVisTypeProvider from 'plugins/kbn_vislib_vis_types/histogram';
import lineVisTypeProvider from 'plugins/kbn_vislib_vis_types/line';
import pieVisTypeProvider from 'plugins/kbn_vislib_vis_types/pie';
import areaVisTypeProvider from 'plugins/kbn_vislib_vis_types/area';
import heatmapVisTypeProvider from 'plugins/kbn_vislib_vis_types/heatmap';
import horizontalBarVisTypeProvider from 'plugins/kbn_vislib_vis_types/horizontal_bar';
import gaugeVisTypeProvider from 'plugins/kbn_vislib_vis_types/gauge';
import goalVisTypeProvider from 'plugins/kbn_vislib_vis_types/goal';
import histogramVisTypeProvider from './histogram';
import lineVisTypeProvider from './line';
import pieVisTypeProvider from './pie';
import areaVisTypeProvider from './area';
import heatmapVisTypeProvider from './heatmap';
import horizontalBarVisTypeProvider from './horizontal_bar';
import gaugeVisTypeProvider from './gauge';
import goalVisTypeProvider from './goal';

VisTypesRegistryProvider.register(histogramVisTypeProvider);
VisTypesRegistryProvider.register(lineVisTypeProvider);
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/line.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { CATEGORY } from 'ui/vis/vis_category';
import pointSeriesTemplate from 'plugins/kbn_vislib_vis_types/editors/point_series.html';
import pointSeriesTemplate from './editors/point_series.html';
import image from './images/icon-line.svg';

export default function PointSeriesVisType(Private) {
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kbn_vislib_vis_types/public/pie.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { VisFactoryProvider } from 'ui/vis/vis_factory';
import { Schemas } from 'ui/vis/editors/default/schemas';
import { CATEGORY } from 'ui/vis/vis_category';
import pieTemplate from 'plugins/kbn_vislib_vis_types/editors/pie.html';
import pieTemplate from './editors/pie.html';
import image from './images/icon-pie.svg';

export default function HistogramVisType(Private) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import expect from 'expect.js';
import {
reverseSortDirection,
reverseSortDirective
} from 'plugins/kibana/context/api/utils/sorting';
} from '../sorting';


describe('context app', function () {
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/dashboard/dashboard_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
import { DocTitleProvider } from 'ui/doc_title';
import { getTopNavConfig } from './top_nav/get_top_nav_config';
import { DashboardConstants, createDashboardEditUrl } from './dashboard_constants';
import { VisualizeConstants } from 'plugins/kibana/visualize/visualize_constants';
import { VisualizeConstants } from '../visualize/visualize_constants';
import { DashboardStateManager } from './dashboard_state_manager';
import { saveDashboard } from './lib';
import { showCloneModal } from './top_nav/show_clone_modal';
Expand Down
10 changes: 5 additions & 5 deletions src/core_plugins/kibana/public/dashboard/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'plugins/kibana/dashboard/dashboard_app';
import 'plugins/kibana/dashboard/saved_dashboard/saved_dashboards';
import 'plugins/kibana/dashboard/styles/index.less';
import 'plugins/kibana/dashboard/dashboard_config';
import './dashboard_app';
import './saved_dashboard/saved_dashboards';
import './styles/index.less';
import './dashboard_config';
import uiRoutes from 'ui/routes';
import { toastNotifications } from 'ui/notify';

import dashboardTemplate from 'plugins/kibana/dashboard/dashboard_app.html';
import dashboardTemplate from './dashboard_app.html';
import dashboardListingTemplate from './listing/dashboard_listing.html';

import { DashboardListingController } from './listing/dashboard_listing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import angular from 'angular';
import { uiModules } from 'ui/modules';
import { createDashboardEditUrl } from 'plugins/kibana/dashboard/dashboard_constants';
import { createDashboardEditUrl } from '../dashboard_constants';
import { createLegacyClass } from 'ui/utils/legacy_class';

const module = uiModules.get('app/dashboard');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'plugins/kibana/dashboard/saved_dashboard/saved_dashboard';
import './saved_dashboard';
import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/courier/saved_object/saved_object_loader';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
import { savedObjectManagementRegistry } from '../../management/saved_object_registry';

const module = uiModules.get('app/dashboard');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { uiModules } from 'ui/modules';
import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
import template from 'plugins/kibana/dev_tools/partials/dev_tools_app.html';
import 'plugins/kibana/dev_tools/styles/dev_tools_app.less';
import template from '../partials/dev_tools_app.html';
import '../styles/dev_tools_app.less';
import 'ui/kbn_top_nav';

uiModules
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/dev_tools/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import uiRoutes from 'ui/routes';
import { DevToolsRegistryProvider } from 'ui/registry/dev_tools';
import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
import 'plugins/kibana/dev_tools/directives/dev_tools_app';
import './directives/dev_tools_app';

uiRoutes
.when('/dev_tools', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sinon from 'sinon';
import ngMock from 'ng_mock';
import expect from 'expect.js';
import 'ui/private';
import 'plugins/kibana/discover/components/field_chooser/discover_field';
import '../../components/field_chooser/discover_field';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';

// Load the kibana app dependencies.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import _ from 'lodash';
import ngMock from 'ng_mock';
import { fieldCalculator } from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
import { fieldCalculator } from '../../components/field_chooser/lib/field_calculator';
import expect from 'expect.js';
import 'ui/private';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sinon from 'sinon';
import expect from 'expect.js';
import $ from 'jquery';
import 'ui/private';
import 'plugins/kibana/discover/components/field_chooser/field_chooser';
import '../../components/field_chooser/field_chooser';
import FixturesHitsProvider from 'fixtures/hits';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import { SavedObject } from 'ui/saved_objects';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import _ from 'lodash';
import ngMock from 'ng_mock';
import expect from 'expect.js';
import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
import PluginsKibanaDiscoverHitSortFnProvider from '../_hit_sort_fn';

describe('hit sort function', function () {
let createHitSortFn;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import $ from 'jquery';
import html from 'plugins/kibana/discover/components/field_chooser/discover_field.html';
import html from './discover_field.html';
import _ from 'lodash';
import 'ui/directives/css_truncate';
import 'ui/directives/field_name';
import detailsHtml from 'plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html';
import detailsHtml from './lib/detail_views/string.html';
import { uiModules } from 'ui/modules';
const app = uiModules.get('apps/discover');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import 'ui/directives/css_truncate';
import 'ui/directives/field_name';
import 'ui/filters/unique';
import 'plugins/kibana/discover/components/field_chooser/discover_field';
import './discover_field';
import 'angular-ui-select';
import _ from 'lodash';
import $ from 'jquery';
import rison from 'rison-node';
import { fieldCalculator } from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
import { fieldCalculator } from './lib/field_calculator';
import { IndexPatternsFieldListProvider } from 'ui/index_patterns/_field_list';
import { uiModules } from 'ui/modules';
import fieldChooserTemplate from 'plugins/kibana/discover/components/field_chooser/field_chooser.html';
import fieldChooserTemplate from './field_chooser.html';
const app = uiModules.get('apps/discover');

app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import { toastNotifications, getPainlessError } from 'ui/notify';
import { VisProvider } from 'ui/vis';
import { BasicResponseHandlerProvider } from 'ui/vis/response_handlers/basic';
import { DocTitleProvider } from 'ui/doc_title';
import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
import PluginsKibanaDiscoverHitSortFnProvider from '../_hit_sort_fn';
import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
import { AggTypesBucketsIntervalOptionsProvider } from 'ui/agg_types/buckets/_interval_options';
import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
import uiRoutes from 'ui/routes';
import { uiModules } from 'ui/modules';
import indexTemplate from 'plugins/kibana/discover/index.html';
import indexTemplate from '../index.html';
import { StateProvider } from 'ui/state_management/state';
import { migrateLegacyQuery } from 'ui/utils/migrateLegacyQuery';
import { FilterManagerProvider } from 'ui/filter_manager';
Expand Down
10 changes: 5 additions & 5 deletions src/core_plugins/kibana/public/discover/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'plugins/kibana/discover/saved_searches/saved_searches';
import 'plugins/kibana/discover/directives';
import './saved_searches/saved_searches';
import './directives';
import 'ui/collapsible_sidebar';
import 'plugins/kibana/discover/components/field_chooser/field_chooser';
import 'plugins/kibana/discover/controllers/discover';
import 'plugins/kibana/discover/styles/main.less';
import './components/field_chooser/field_chooser';
import './controllers/discover';
import './styles/main.less';
import 'ui/doc_table/components/table_row';
import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'plugins/kibana/discover/saved_searches/_saved_search';
import './_saved_search';
import 'ui/notify';
import { uiModules } from 'ui/modules';
import { SavedObjectLoader } from 'ui/courier/saved_object/saved_object_loader';
import { savedObjectManagementRegistry } from 'plugins/kibana/management/saved_object_registry';
import { savedObjectManagementRegistry } from '../../management/saved_object_registry';
const module = uiModules.get('discover/saved_searches', [
'kibana/notify'
]);
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/doc/__tests__/doc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Load the kibana app dependencies.
import ngMock from 'ng_mock';
import expect from 'expect.js';
import 'plugins/kibana/doc/index';
import '..';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';

let $scope;
Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/doc/controllers/doc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'ui/notify';
import 'ui/courier';
import 'ui/doc_viewer';
import 'ui/index_patterns';
import html from 'plugins/kibana/doc/index.html';
import html from '../index.html';
import uiRoutes from 'ui/routes';
import { uiModules } from 'ui/modules';

Expand Down
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/public/doc/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import 'plugins/kibana/doc/controllers/doc';
import './controllers/doc';
Loading

0 comments on commit 6748c6a

Please sign in to comment.