From 52a3679689765043c12ea17cb7f9f0cb017efb8e Mon Sep 17 00:00:00 2001 From: spalger Date: Tue, 2 Feb 2016 18:51:59 -0700 Subject: [PATCH] [es6modules] enhance basic requires --- src/cli/cluster/cluster_manager.js | 4 ++-- src/cli/serve/serve.js | 4 ++-- src/fixtures/agg_resp/geohash_grid.js | 2 +- src/fixtures/fake_row.js | 2 +- src/fixtures/hits.js | 2 +- src/fixtures/mock_courier.js | 4 ++-- src/fixtures/mock_state.js | 4 ++-- src/fixtures/mock_ui_state.js | 2 +- src/fixtures/search_response.js | 2 +- src/fixtures/stubbed_logstash_index_pattern.js | 2 +- src/fixtures/stubbed_search_source.js | 4 ++-- src/fixtures/tilemap_map.js | 2 +- src/fixtures/vislib/_vis_fixture.js | 2 +- src/optimize/index.js | 2 +- src/optimize/lazy/optmzrRole.js | 4 ++-- .../public/controls/line_interpolation_option.js | 4 ++-- .../public/controls/point_series_options.js | 4 ++-- .../public/controls/vislib_basic_options.js | 4 ++-- .../public/kbn_vislib_vis_types.js | 2 +- .../kbn_vislib_vis_types/public/tileMap.js | 4 ++-- .../dashboard/components/panel/lib/load_panel.js | 2 +- .../public/dashboard/components/panel/panel.js | 6 +++--- .../kibana/public/dashboard/directives/grid.js | 6 +++--- src/plugins/kibana/public/dashboard/index.js | 10 +++++----- .../dashboard/services/_saved_dashboard.js | 6 +++--- .../dashboard/services/saved_dashboards.js | 4 ++-- .../__tests__/directives/discover_field.js | 2 +- .../__tests__/directives/field_chooser.js | 2 +- .../components/field_chooser/discover_field.js | 8 ++++---- .../components/field_chooser/field_chooser.js | 8 ++++---- .../field_chooser/lib/field_calculator.js | 2 +- .../public/discover/controllers/discover.js | 16 ++++++++-------- .../public/discover/directives/timechart.js | 4 ++-- src/plugins/kibana/public/discover/index.js | 2 +- .../discover/saved_searches/_saved_search.js | 2 +- .../discover/saved_searches/saved_searches.js | 4 ++-- src/plugins/kibana/public/doc/controllers/doc.js | 6 +++--- src/plugins/kibana/public/settings/index.js | 4 ++-- .../public/settings/saved_object_registry.js | 2 +- .../public/settings/sections/about/index.js | 2 +- .../settings/sections/advanced/advanced_row.js | 2 +- .../public/settings/sections/advanced/index.js | 4 ++-- .../sections/advanced/lib/get_editor_type.js | 2 +- .../sections/advanced/lib/get_val_type.js | 2 +- .../sections/advanced/lib/to_editable_config.js | 6 +++--- .../public/settings/sections/indices/_create.js | 4 ++-- .../settings/sections/indices/_date_scripts.js | 2 +- .../public/settings/sections/indices/_edit.js | 2 +- .../settings/sections/indices/_field_types.js | 2 +- .../settings/sections/indices/_indexed_fields.js | 8 ++++---- .../sections/indices/_scripted_fields.js | 8 ++++---- .../public/settings/sections/indices/index.js | 2 +- .../public/settings/sections/objects/_objects.js | 8 ++++---- .../public/settings/sections/objects/_view.js | 10 +++++----- .../public/settings/sections/status/index.js | 2 +- .../public/visualize/editor/__tests__/agg.js | 2 +- .../kibana/public/visualize/editor/agg.js | 6 +++--- .../kibana/public/visualize/editor/agg_filter.js | 4 ++-- .../kibana/public/visualize/editor/agg_param.js | 2 +- .../kibana/public/visualize/editor/agg_params.js | 10 +++++----- .../kibana/public/visualize/editor/editor.js | 8 ++++---- .../public/visualize/editor/nesting_indicator.js | 4 ++-- .../kibana/public/visualize/editor/sidebar.js | 2 +- .../public/visualize/editor/vis_options.js | 4 ++-- .../visualize/saved_visualizations/_saved_vis.js | 2 +- .../saved_visualizations/saved_visualizations.js | 4 ++-- .../kibana/public/visualize/wizard/wizard.js | 4 ++-- .../public/__tests__/markdown_vis_controller.js | 4 ++-- .../public/markdown_vis_controller.js | 2 +- .../public/__tests__/metric_vis_controller.js | 4 ++-- .../metric_vis/public/metric_vis_controller.js | 2 +- .../spyModes/public/reqRespStatsSpyMode.js | 4 ++-- src/plugins/spyModes/public/tableSpyMode.js | 2 +- src/plugins/statusPage/public/statusPage.js | 2 +- .../table_vis/public/__tests__/_table_vis.js | 10 +++++----- .../public/__tests__/_table_vis_controller.js | 15 ++++++--------- src/plugins/table_vis/public/table_vis_params.js | 2 +- src/plugins/testsBundle/index.js | 2 +- src/server/config/setup.js | 2 +- src/server/http/index.js | 10 +++++----- src/server/plugins/scan.js | 4 ++-- src/server/status/index.js | 4 ++-- src/server/status/metrics.js | 4 ++-- src/testUtils/simulateKeys.js | 8 ++++---- src/testUtils/stub_index_pattern.js | 14 +++++++------- src/ui/index.js | 12 ++++++------ src/ui/public/Binder/Binder.js | 2 +- src/ui/public/Binder/__tests__/Binder.js | 2 +- src/ui/public/ConfigTemplate.js | 2 +- src/ui/public/IndexedArray/IndexedArray.js | 4 ++-- .../public/StackTraceMapper/StackTraceMapper.js | 2 +- src/ui/public/Vis/AggConfig.js | 2 +- src/ui/public/Vis/AggConfigs.js | 4 ++-- src/ui/public/Vis/Renderbot.js | 2 +- src/ui/public/Vis/Schemas.js | 4 ++-- src/ui/public/Vis/Vis.js | 2 +- src/ui/public/Vis/__tests__/_AggConfig.js | 6 +++--- src/ui/public/Vis/__tests__/_AggConfigResult.js | 8 ++++---- src/ui/public/Vis/__tests__/_AggConfigs.js | 10 +++++----- src/ui/public/Vis/__tests__/_Renderbot.js | 4 ++-- src/ui/public/Vis/__tests__/_Vis.js | 6 +++--- src/ui/public/__tests__/metadata.js | 4 ++-- .../agg_response/geo_json/_tooltip_formatter.js | 4 ++-- src/ui/public/agg_response/geo_json/geo_json.js | 4 ++-- .../agg_response/geo_json/rowsToFeatures.js | 6 +++--- .../__tests__/transform_aggregation.js | 6 +++--- .../hierarchical/_array_to_linked_list.js | 2 +- .../agg_response/hierarchical/_build_split.js | 2 +- .../agg_response/hierarchical/_collect_keys.js | 2 +- .../hierarchical/_create_raw_data.js | 4 ++-- .../hierarchical/_extract_buckets.js | 2 +- .../_hierarchical_tooltip_formatter.js | 8 ++++---- .../hierarchical/_transform_aggregation.js | 6 +++--- .../hierarchical/build_hierarchical_data.js | 10 +++++----- .../point_series/__tests__/_add_to_siri.js | 4 ++-- .../point_series/__tests__/_fake_x_aspect.js | 4 ++-- .../point_series/__tests__/_get_aspects.js | 8 ++++---- .../point_series/__tests__/_get_point.js | 6 +++--- .../point_series/__tests__/_get_series.js | 6 +++--- .../point_series/__tests__/_init_x_axis.js | 6 +++--- .../point_series/__tests__/_init_y_axis.js | 6 +++--- .../agg_response/point_series/__tests__/_main.js | 10 +++++----- .../point_series/__tests__/_ordered_date_axis.js | 10 +++++----- .../point_series/__tests__/_tooltip_formatter.js | 8 ++++---- .../agg_response/point_series/_get_aspects.js | 2 +- .../agg_response/point_series/_get_point.js | 2 +- .../agg_response/point_series/_get_series.js | 2 +- .../agg_response/point_series/_init_y_axis.js | 2 +- .../point_series/_ordered_date_axis.js | 2 +- .../point_series/_tooltip_formatter.js | 2 +- .../agg_response/point_series/point_series.js | 2 +- .../agg_response/tabify/__tests__/_buckets.js | 4 ++-- .../tabify/__tests__/_get_columns.js | 4 ++-- .../tabify/__tests__/_integration.js | 8 ++++---- .../tabify/__tests__/_response_writer.js | 8 ++++---- .../agg_response/tabify/__tests__/_table.js | 6 +++--- .../tabify/__tests__/_table_group.js | 4 ++-- src/ui/public/agg_response/tabify/_buckets.js | 2 +- .../public/agg_response/tabify/_get_columns.js | 2 +- .../agg_response/tabify/_response_writer.js | 4 ++-- src/ui/public/agg_response/tabify/_table.js | 2 +- .../public/agg_response/tabify/_table_group.js | 2 +- src/ui/public/agg_response/tabify/tabify.js | 2 +- src/ui/public/agg_table/__tests__/_group.js | 10 +++++----- src/ui/public/agg_table/__tests__/_table.js | 12 ++++++------ src/ui/public/agg_table/agg_table.js | 2 +- src/ui/public/agg_types/AggParams.js | 4 ++-- src/ui/public/agg_types/AggType.js | 2 +- .../public/agg_types/__tests__/AggParamWriter.js | 2 +- src/ui/public/agg_types/__tests__/AggParams.js | 6 +++--- src/ui/public/agg_types/__tests__/AggType.js | 10 +++++----- .../agg_types/__tests__/bucketCountBetween.js | 6 +++--- .../agg_types/__tests__/buckets/_histogram.js | 6 +++--- .../public/agg_types/__tests__/buckets/_range.js | 8 ++++---- .../buckets/create_filter/date_histogram.js | 12 ++++++------ .../__tests__/buckets/create_filter/ip_range.js | 4 ++-- .../__tests__/buckets/create_filter/range.js | 4 ++-- .../__tests__/buckets/create_filter/terms.js | 4 ++-- .../__tests__/buckets/date_histogram/_editor.js | 8 ++++---- .../__tests__/buckets/date_histogram/_params.js | 8 ++++---- .../agg_types/__tests__/controls/number_list.js | 10 +++++----- .../agg_types/__tests__/param_types/_field.js | 6 +++--- .../agg_types/__tests__/param_types/_optioned.js | 6 +++--- .../agg_types/__tests__/param_types/_regex.js | 6 +++--- .../public/agg_types/buckets/_bucket_agg_type.js | 2 +- .../agg_types/buckets/_interval_options.js | 2 +- .../buckets/create_filter/date_histogram.js | 4 ++-- .../buckets/create_filter/date_range.js | 4 ++-- .../agg_types/buckets/create_filter/filters.js | 4 ++-- .../agg_types/buckets/create_filter/histogram.js | 2 +- .../agg_types/buckets/create_filter/ip_range.js | 4 ++-- .../agg_types/buckets/create_filter/range.js | 2 +- .../agg_types/buckets/create_filter/terms.js | 2 +- .../public/agg_types/buckets/date_histogram.js | 4 ++-- src/ui/public/agg_types/buckets/date_range.js | 4 ++-- src/ui/public/agg_types/buckets/filters.js | 4 ++-- src/ui/public/agg_types/buckets/geo_hash.js | 4 ++-- src/ui/public/agg_types/buckets/histogram.js | 4 ++-- src/ui/public/agg_types/buckets/ip_range.js | 2 +- src/ui/public/agg_types/buckets/range.js | 2 +- .../agg_types/buckets/significant_terms.js | 2 +- src/ui/public/agg_types/buckets/terms.js | 2 +- src/ui/public/agg_types/index.js | 2 +- src/ui/public/agg_types/metrics/MetricAggType.js | 2 +- .../metrics/getResponseAggConfigClass.js | 2 +- src/ui/public/agg_types/metrics/median.js | 2 +- .../public/agg_types/metrics/percentile_ranks.js | 4 ++-- src/ui/public/agg_types/metrics/percentiles.js | 6 +++--- src/ui/public/agg_types/metrics/stdDeviation.js | 2 +- src/ui/public/agg_types/param_types/base.js | 2 +- src/ui/public/agg_types/param_types/field.js | 4 ++-- src/ui/public/agg_types/param_types/optioned.js | 4 ++-- src/ui/public/agg_types/param_types/raw_json.js | 4 ++-- src/ui/public/agg_types/param_types/regex.js | 4 ++-- src/ui/public/agg_types/param_types/string.js | 4 ++-- src/ui/public/bind/__tests__/bind.js | 6 +++--- src/ui/public/bind/bind.js | 4 ++-- src/ui/public/bound_to_config_obj.js | 2 +- src/ui/public/chrome/api/angular.js | 2 +- src/ui/public/chrome/chrome.js | 2 +- src/ui/public/chrome/context.js | 4 ++-- .../app_switcher/__tests__/app_switcher.js | 2 +- .../collapsible_sidebar/collapsible_sidebar.js | 4 ++-- src/ui/public/compile_recursive_directive.js | 2 +- src/ui/public/config/__tests__/config.js | 4 ++-- src/ui/public/config/_delayed_updater.js | 4 ++-- src/ui/public/config/config.js | 4 ++-- src/ui/public/config/defaults.js | 4 ++-- src/ui/public/courier/_redirect_when_missing.js | 2 +- src/ui/public/courier/_request_queue.js | 2 +- src/ui/public/courier/courier.js | 4 ++-- .../data_source/__tests__/decorate_query.js | 2 +- .../__tests__/normalize_sort_request.js | 4 ++-- src/ui/public/courier/data_source/_abstract.js | 4 ++-- .../courier/data_source/_decorate_query.js | 2 +- .../courier/data_source/_doc_send_to_es.js | 4 ++-- .../data_source/_normalize_sort_request.js | 2 +- src/ui/public/courier/data_source/doc_source.js | 2 +- .../public/courier/data_source/search_source.js | 4 ++-- src/ui/public/courier/fetch/__tests__/doc.js | 6 +++--- .../courier/fetch/__tests__/fetch_these.js | 8 ++++---- src/ui/public/courier/fetch/_call_client.js | 2 +- .../public/courier/fetch/_for_each_strategy.js | 2 +- src/ui/public/courier/fetch/fetch.js | 2 +- .../courier/fetch/request/__tests__/segmented.js | 6 +++--- .../request/__tests__/segmented_create_queue.js | 8 ++++---- .../__tests__/segmented_index_selection.js | 2 +- .../request/__tests__/segmented_size_picking.js | 2 +- .../courier/fetch/request/_segmented_handle.js | 2 +- src/ui/public/courier/fetch/request/doc.js | 2 +- src/ui/public/courier/fetch/request/request.js | 6 +++--- src/ui/public/courier/fetch/request/search.js | 2 +- src/ui/public/courier/fetch/request/segmented.js | 2 +- .../courier/fetch/strategy/__tests__/search.js | 8 ++++---- src/ui/public/courier/fetch/strategy/search.js | 4 ++-- src/ui/public/courier/looper/_looper.js | 2 +- .../public/courier/saved_object/saved_object.js | 8 ++++---- src/ui/public/debounce/debounce.js | 2 +- src/ui/public/directives/__tests__/config.js | 2 +- .../public/directives/__tests__/confirm-click.js | 2 +- .../public/directives/__tests__/css_truncate.js | 2 +- .../public/directives/__tests__/fixedScroll.js | 6 +++--- .../public/directives/__tests__/input_focus.js | 2 +- src/ui/public/directives/__tests__/spinner.js | 2 +- src/ui/public/directives/__tests__/timepicker.js | 2 +- src/ui/public/directives/__tests__/truncate.js | 2 +- src/ui/public/directives/click_focus.js | 4 ++-- src/ui/public/directives/config.js | 6 +++--- src/ui/public/directives/css_truncate.js | 4 ++-- src/ui/public/directives/file_upload.js | 2 +- src/ui/public/directives/infinite_scroll.js | 2 +- src/ui/public/directives/info.js | 2 +- src/ui/public/directives/input_datetime.js | 6 +++--- src/ui/public/directives/json_input.js | 4 ++-- src/ui/public/directives/paginate.js | 2 +- src/ui/public/directives/pretty_duration.js | 6 +++--- src/ui/public/directives/rows.js | 6 +++--- src/ui/public/directives/saved_object_finder.js | 6 +++--- src/ui/public/directives/truncated.js | 2 +- src/ui/public/directives/validate_cidr_mask.js | 4 ++-- src/ui/public/directives/validate_date_math.js | 4 ++-- src/ui/public/directives/validate_index_name.js | 2 +- src/ui/public/directives/validate_ip.js | 4 ++-- src/ui/public/directives/validate_json.js | 4 ++-- src/ui/public/doc_table/__tests__/doc_table.js | 2 +- .../doc_table/__tests__/lib/rows_headers.js | 2 +- .../public/doc_table/components/table_header.js | 4 ++-- src/ui/public/doc_table/components/table_row.js | 12 ++++++------ src/ui/public/doc_table/doc_table.js | 6 +++--- src/ui/public/doc_table/lib/get_sort.js | 2 +- src/ui/public/doc_title/__tests__/doc_title.js | 8 ++++---- src/ui/public/doc_title/doc_title.js | 4 ++-- src/ui/public/doc_viewer/__tests__/doc_viewer.js | 2 +- src/ui/public/doc_viewer/doc_viewer.js | 6 +++--- src/ui/public/elastic_textarea.js | 2 +- src/ui/public/errors.js | 4 ++-- src/ui/public/es.js | 2 +- src/ui/public/events.js | 6 +++--- src/ui/public/fancy_forms/KbnFormController.js | 2 +- .../public/fancy_forms/__tests__/fancy_forms.js | 2 +- src/ui/public/fancy_forms/fancy_forms.js | 6 +++--- .../field_editor/__tests__/field_editor.js | 6 +++--- src/ui/public/field_editor/field_editor.js | 2 +- .../field_format_editor/field_format_editor.js | 4 ++-- .../field_format_editor/samples/samples.js | 2 +- .../public/filter_bar/__tests__/_addFilters.js | 10 +++++----- .../public/filter_bar/__tests__/_getFilters.js | 8 ++++---- .../filter_bar/__tests__/_invertFilters.js | 10 +++++----- .../public/filter_bar/__tests__/_pinFilters.js | 10 +++++----- .../filter_bar/__tests__/_removeFilters.js | 10 +++++----- .../filter_bar/__tests__/_toggleFilters.js | 10 +++++----- .../filter_bar/__tests__/_updateFilters.js | 10 +++++----- src/ui/public/filter_bar/__tests__/filter_bar.js | 2 +- .../public/filter_bar/__tests__/push_filter.js | 6 +++--- src/ui/public/filter_bar/filter_bar.js | 10 +++++----- .../filter_bar/filter_bar_click_handler.js | 8 ++++---- .../lib/__tests__/extractTimeFilter.js | 6 +++--- .../lib/__tests__/filterOutTimeBasedFilter.js | 6 +++--- .../lib/__tests__/mapAndFlattenFilters.js | 6 +++--- .../filter_bar/lib/__tests__/mapDefault.js | 4 ++-- .../public/filter_bar/lib/__tests__/mapExists.js | 4 ++-- .../public/filter_bar/lib/__tests__/mapFilter.js | 6 +++--- .../lib/__tests__/mapFlattenAndWrapFilters.js | 6 +++--- .../lib/__tests__/mapGeoBoundingBox.js | 6 +++--- .../filter_bar/lib/__tests__/mapMatchAll.js | 4 ++-- .../filter_bar/lib/__tests__/mapQueryString.js | 4 ++-- .../public/filter_bar/lib/__tests__/mapRange.js | 6 +++--- .../public/filter_bar/lib/__tests__/mapScript.js | 6 +++--- .../public/filter_bar/lib/__tests__/mapTerms.js | 6 +++--- src/ui/public/filter_bar/lib/changeTimeFilter.js | 4 ++-- src/ui/public/filter_bar/lib/compareFilters.js | 4 ++-- src/ui/public/filter_bar/lib/dedupFilters.js | 6 +++--- .../public/filter_bar/lib/extractTimeFilter.js | 2 +- .../filter_bar/lib/filterAppliedAndUnwrap.js | 2 +- .../filter_bar/lib/filterOutTimeBasedFilter.js | 2 +- .../filter_bar/lib/generateMappingChain.js | 2 +- .../filter_bar/lib/mapAndFlattenFilters.js | 2 +- src/ui/public/filter_bar/lib/mapDefault.js | 4 ++-- src/ui/public/filter_bar/lib/mapFilter.js | 2 +- .../filter_bar/lib/mapFlattenAndWrapFilters.js | 2 +- .../public/filter_bar/lib/mapGeoBoundingBox.js | 2 +- src/ui/public/filter_bar/lib/mapTerms.js | 2 +- src/ui/public/filter_bar/lib/onlyDisabled.js | 2 +- src/ui/public/filter_bar/lib/onlyStateChanged.js | 4 ++-- src/ui/public/filter_bar/lib/uniqFilters.js | 4 ++-- src/ui/public/filter_bar/push_filter.js | 2 +- src/ui/public/filter_bar/query_filter.js | 12 ++++++------ src/ui/public/filter_manager/filter_manager.js | 2 +- src/ui/public/filter_manager/lib/phrase.js | 2 +- src/ui/public/filter_manager/lib/query.js | 2 +- src/ui/public/filter_manager/lib/range.js | 2 +- src/ui/public/filters/_prop_filter.js | 2 +- src/ui/public/filters/commaList.js | 2 +- src/ui/public/filters/field_type.js | 4 ++-- src/ui/public/filters/match_any.js | 2 +- src/ui/public/filters/moment.js | 4 ++-- src/ui/public/filters/rison.js | 2 +- src/ui/public/filters/short_dots.js | 2 +- src/ui/public/filters/trust_as_html.js | 2 +- src/ui/public/filters/unique.js | 2 +- src/ui/public/fixedScroll.js | 4 ++-- src/ui/public/highlight/__tests__/highlight.js | 6 +++--- src/ui/public/highlight/highlight.js | 4 ++-- .../index_patterns/__tests__/_FieldFormat.js | 6 +++--- .../__tests__/_cast_mapping_type.js | 6 +++--- .../__tests__/_get_computed_fields.js | 6 +++--- .../index_patterns/__tests__/_index_pattern.js | 14 +++++++------- .../index_patterns/__tests__/_map_field.js | 6 +++--- .../__tests__/_pattern_to_wildcard.js | 2 +- .../__tests__/calculate_indices.js | 10 +++++----- .../index_patterns/__tests__/flatten_hit.js | 6 +++--- .../public/index_patterns/__tests__/intervals.js | 4 ++-- .../public/index_patterns/_calculate_indices.js | 4 ++-- .../public/index_patterns/_cast_mapping_type.js | 2 +- src/ui/public/index_patterns/_ensure_some.js | 2 +- src/ui/public/index_patterns/_field.js | 2 +- .../index_patterns/_field_format/FieldFormat.js | 2 +- .../index_patterns/_field_format/contentTypes.js | 4 ++-- src/ui/public/index_patterns/_field_list.js | 4 ++-- src/ui/public/index_patterns/_field_types.js | 2 +- src/ui/public/index_patterns/_flatten_hit.js | 2 +- src/ui/public/index_patterns/_format_hit.js | 2 +- .../index_patterns/_get_computed_fields.js | 2 +- src/ui/public/index_patterns/_get_ids.js | 2 +- src/ui/public/index_patterns/_index_pattern.js | 10 +++++----- src/ui/public/index_patterns/_intervals.js | 6 +++--- src/ui/public/index_patterns/_local_cache.js | 4 ++-- src/ui/public/index_patterns/_map_field.js | 2 +- src/ui/public/index_patterns/_mapper.js | 4 ++-- src/ui/public/index_patterns/_pattern_cache.js | 2 +- .../_transform_mapping_into_fields.js | 2 +- src/ui/public/index_patterns/index_patterns.js | 4 ++-- .../public/jquery/__tests__/findTestSubject.js | 2 +- src/ui/public/listen/__tests__/listen.js | 6 +++--- src/ui/public/listen/listen.js | 2 +- src/ui/public/metadata.js | 2 +- src/ui/public/modules.js | 4 ++-- src/ui/public/navbar/navbar.js | 2 +- .../notify/__tests__/lib/_format_es_msg.js | 4 ++-- .../public/notify/__tests__/lib/_format_msg.js | 4 ++-- src/ui/public/notify/__tests__/notifier.js | 8 ++++---- src/ui/public/notify/directives.js | 2 +- src/ui/public/notify/errors.js | 2 +- src/ui/public/notify/lib/_format_es_msg.js | 2 +- src/ui/public/notify/lib/_format_msg.js | 4 ++-- src/ui/public/notify/notifier.js | 10 +++++----- src/ui/public/notify/notify.js | 10 +++++----- src/ui/public/number_list/number_list.js | 4 ++-- src/ui/public/number_list/number_list_input.js | 6 +++--- src/ui/public/paginated_table/__tests__/index.js | 2 +- src/ui/public/paginated_table/paginated_table.js | 2 +- src/ui/public/parse_query/lib/from_user.js | 2 +- src/ui/public/parse_query/lib/to_user.js | 4 ++-- src/ui/public/parse_query/parse_query.js | 2 +- src/ui/public/persisted_log/persisted_log.js | 4 ++-- src/ui/public/persisted_state/persisted_state.js | 8 ++++---- src/ui/public/private/__tests__/private.js | 4 ++-- src/ui/public/private/private.js | 2 +- src/ui/public/promises/promises.js | 2 +- .../reflow_watcher/__tests__/reflow_watcher.js | 10 +++++----- src/ui/public/reflow_watcher/reflow_watcher.js | 6 +++--- src/ui/public/registry/__tests__/index.js | 10 +++++----- src/ui/public/registry/_registry.js | 4 ++-- src/ui/public/registry/field_formats.js | 2 +- .../public/render_directive/render_directive.js | 2 +- src/ui/public/routes/WorkQueue.js | 2 +- src/ui/public/routes/wrapRouteWithPrep.js | 8 ++++---- .../safe_confirm/__tests__/safe_confirm.js | 6 +++--- src/ui/public/state_management/_state_sync.js | 6 +++--- src/ui/public/state_management/app_state.js | 4 ++-- src/ui/public/state_management/global_state.js | 8 ++++---- src/ui/public/state_management/state.js | 8 ++++---- src/ui/public/storage/storage.js | 4 ++-- src/ui/public/stringify/__tests__/_color.js | 4 ++-- src/ui/public/stringify/__tests__/_date.js | 6 +++--- src/ui/public/stringify/__tests__/_ip.js | 4 ++-- src/ui/public/stringify/__tests__/_source.js | 8 ++++---- src/ui/public/stringify/__tests__/_string.js | 4 ++-- src/ui/public/stringify/__tests__/_truncate.js | 4 ++-- src/ui/public/stringify/__tests__/_url.js | 6 +++--- src/ui/public/stringify/register.js | 2 +- src/ui/public/stringify/types/Color.js | 2 +- src/ui/public/stringify/types/Date.js | 4 ++-- src/ui/public/stringify/types/Ip.js | 2 +- src/ui/public/stringify/types/Percent.js | 2 +- src/ui/public/stringify/types/Source.js | 6 +++--- src/ui/public/stringify/types/String.js | 2 +- src/ui/public/stringify/types/Url.js | 2 +- src/ui/public/stringify/types/_Numeral.js | 2 +- src/ui/public/stringify/types/truncate.js | 2 +- .../styleCompile/__tests__/styleCompile.js | 6 +++--- src/ui/public/styleCompile/styleCompile.js | 4 ++-- .../template_vis_type/TemplateRenderbot.js | 2 +- .../public/template_vis_type/TemplateVisType.js | 2 +- src/ui/public/testHarness/testHarness.js | 2 +- src/ui/public/time_buckets/calc_auto_interval.js | 2 +- src/ui/public/time_buckets/calc_es_interval.js | 4 ++-- src/ui/public/time_buckets/time_buckets.js | 8 ++++---- src/ui/public/timefilter/lib/diff_interval.js | 2 +- src/ui/public/timefilter/lib/diff_time.js | 2 +- src/ui/public/timefilter/timefilter.js | 8 ++++---- src/ui/public/timepicker/timepicker.js | 10 +++++----- src/ui/public/tooltip/tooltip.js | 2 +- src/ui/public/typeahead/_input.js | 2 +- src/ui/public/typeahead/_items.js | 4 ++-- src/ui/public/typeahead/typeahead.js | 2 +- src/ui/public/url/url.js | 2 +- src/ui/public/utils/BaseObject.js | 6 +++--- src/ui/public/utils/CidrMask.js | 2 +- src/ui/public/utils/ObjDefine.js | 2 +- src/ui/public/utils/SimpleEmitter.js | 4 ++-- src/ui/public/utils/__tests__/ObjDefine.js | 2 +- src/ui/public/utils/__tests__/SimpleEmitter.js | 6 +++--- .../public/utils/__tests__/aggressive_parse.js | 8 ++++---- src/ui/public/utils/__tests__/range.js | 6 +++--- src/ui/public/utils/__tests__/sequencer.js | 6 +++--- src/ui/public/utils/brush_event.js | 2 +- src/ui/public/utils/dateMath.js | 4 ++-- src/ui/public/utils/date_range.js | 2 +- src/ui/public/utils/diff_object.js | 4 ++-- src/ui/public/utils/diff_time_picker_vals.js | 4 ++-- src/ui/public/utils/find_by_param.js | 2 +- .../utils/lodash-mixins/__tests__/_move.js | 4 ++-- .../lodash-mixins/__tests__/_organize_by.js | 4 ++-- .../utils/lodash-mixins/__tests__/_push_all.js | 4 ++-- src/ui/public/utils/mapping_setup.js | 4 ++-- src/ui/public/utils/ordinal_suffix.js | 2 +- src/ui/public/utils/parse_interval.js | 6 +++--- src/ui/public/utils/range.js | 2 +- src/ui/public/utils/sequencer.js | 2 +- src/ui/public/utils/slugify_id.js | 2 +- src/ui/public/utils/supports.js | 2 +- src/ui/public/validateDateInterval.js | 2 +- src/ui/public/vislib/__tests__/lib/axis_title.js | 2 +- .../public/vislib/__tests__/lib/chart_title.js | 2 +- src/ui/public/vislib/__tests__/lib/dispatch.js | 2 +- .../vislib/__tests__/lib/handler/handler.js | 2 +- .../public/vislib/__tests__/lib/layout/layout.js | 2 +- .../lib/layout/splits/column_chart/splits.js | 2 +- .../vislib/__tests__/lib/resize_checker.js | 12 ++++++------ src/ui/public/vislib/__tests__/lib/x_axis.js | 2 +- src/ui/public/vislib/__tests__/lib/y_axis.js | 2 +- src/ui/public/vislib/__tests__/vis.js | 2 +- .../__tests__/visualizations/area_chart.js | 2 +- .../__tests__/visualizations/column_chart.js | 2 +- .../__tests__/visualizations/line_chart.js | 2 +- .../vislib/__tests__/visualizations/pie_chart.js | 2 +- .../__tests__/visualizations/tile_maps/map.js | 2 +- .../visualizations/tile_maps/markers.js | 2 +- .../visualizations/tile_maps/tile_map.js | 2 +- .../__tests__/visualizations/time_marker.js | 2 +- .../public/vislib/components/Tooltip/Tooltip.js | 2 +- .../components/Tooltip/__tests__/positioning.js | 8 ++++---- .../vislib/components/Tooltip/positionTooltip.js | 2 +- src/ui/public/vislib/components/color/color.js | 2 +- .../vislib/components/color/color_palette.js | 4 ++-- .../vislib/components/color/mapped_colors.js | 4 ++-- .../vislib/components/labels/data_array.js | 2 +- .../vislib/components/labels/flatten_series.js | 2 +- src/ui/public/vislib/components/labels/labels.js | 2 +- .../components/labels/pie/get_pie_names.js | 2 +- .../vislib/components/labels/pie/pie_labels.js | 2 +- .../components/labels/pie/remove_zero_slices.js | 2 +- .../vislib/components/labels/uniq_labels.js | 2 +- .../components/zero_injection/flatten_data.js | 2 +- .../components/zero_injection/inject_zeros.js | 2 +- .../components/zero_injection/ordered_x_keys.js | 4 ++-- .../components/zero_injection/uniq_keys.js | 2 +- .../zero_injection/zero_fill_data_array.js | 2 +- .../zero_injection/zero_filled_array.js | 2 +- src/ui/public/vislib/lib/_data_label.js | 2 +- src/ui/public/vislib/lib/_error_handler.js | 4 ++-- src/ui/public/vislib/lib/alerts.js | 8 ++++---- src/ui/public/vislib/lib/axis_title.js | 6 +++--- src/ui/public/vislib/lib/chart_title.js | 6 +++--- src/ui/public/vislib/lib/data.js | 6 +++--- src/ui/public/vislib/lib/dispatch.js | 8 ++++---- src/ui/public/vislib/lib/handler/handler.js | 8 ++++---- .../public/vislib/lib/handler/types/tile_map.js | 2 +- src/ui/public/vislib/lib/layout/layout.js | 4 ++-- .../layout/splits/column_chart/chart_split.js | 2 +- .../splits/column_chart/chart_title_split.js | 2 +- .../layout/splits/column_chart/x_axis_split.js | 2 +- .../layout/splits/column_chart/y_axis_split.js | 2 +- .../lib/layout/splits/pie_chart/chart_split.js | 2 +- .../layout/splits/pie_chart/chart_title_split.js | 2 +- .../lib/layout/splits/tile_map/map_split.js | 2 +- .../vislib/lib/layout/types/column_layout.js | 2 +- .../public/vislib/lib/layout/types/map_layout.js | 2 +- .../public/vislib/lib/layout/types/pie_layout.js | 2 +- src/ui/public/vislib/lib/resize_checker.js | 6 +++--- src/ui/public/vislib/lib/x_axis.js | 8 ++++---- src/ui/public/vislib/lib/y_axis.js | 8 ++++---- src/ui/public/vislib/vis.js | 8 ++++---- src/ui/public/vislib/visualizations/_chart.js | 8 ++++---- src/ui/public/vislib/visualizations/_map.js | 6 +++--- .../vislib/visualizations/_point_series_chart.js | 4 ++-- .../public/vislib/visualizations/area_chart.js | 8 ++++---- .../public/vislib/visualizations/column_chart.js | 10 +++++----- .../public/vislib/visualizations/line_chart.js | 8 ++++---- .../visualizations/marker_types/base_marker.js | 8 ++++---- .../visualizations/marker_types/geohash_grid.js | 4 ++-- .../visualizations/marker_types/heatmap.js | 6 +++--- .../marker_types/scaled_circles.js | 4 ++-- .../marker_types/shaded_circles.js | 4 ++-- src/ui/public/vislib/visualizations/pie_chart.js | 8 ++++---- src/ui/public/vislib/visualizations/tile_map.js | 6 +++--- .../public/vislib/visualizations/time_marker.js | 4 ++-- src/ui/public/vislib_vis_type/VislibRenderbot.js | 2 +- src/ui/public/vislib_vis_type/VislibVisType.js | 2 +- .../__tests__/_VislibRenderbot.js | 10 +++++----- .../vislib_vis_type/__tests__/_buildChartData.js | 8 ++++---- src/ui/public/visualize/spy.js | 4 ++-- src/ui/public/visualize/visualize.js | 4 ++-- src/ui/public/visualize/visualize_legend.js | 10 +++++----- .../public/watch_multi/__tests__/watch_multi.js | 2 +- src/ui/public/watch_multi/watch_multi.js | 2 +- 557 files changed, 1159 insertions(+), 1162 deletions(-) diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index 71caff8414902..adf502f4d6cf9 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -7,6 +7,8 @@ const { debounce, compact, get, invoke, bindAll, once, sample } = require('lodas import Log from '../Log'; import Worker from './worker'; import BasePathProxy from './base_path_proxy'; +import chokidar from 'chokidar'; +import readline from 'readline'; process.env.kbnWorkerType = 'managr'; @@ -76,7 +78,6 @@ module.exports = class ClusterManager { } setupWatching() { - const chokidar = require('chokidar'); const utils = require('requirefrom')('src/utils'); const fromRoot = utils('fromRoot'); @@ -106,7 +107,6 @@ module.exports = class ClusterManager { } setupManualRestart() { - const readline = require('readline'); const rl = readline.createInterface(process.stdin, process.stdout); let nls = 0; diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js index 46eb2428a2f37..837544cf66d48 100644 --- a/src/cli/serve/serve.js +++ b/src/cli/serve/serve.js @@ -1,4 +1,6 @@ import _ from 'lodash'; +import readYamlConfig from './read_yaml_config'; +import ClusterManager from '../cluster/cluster_manager'; const { isWorker } = require('cluster'); const { resolve } = require('path'); @@ -26,7 +28,6 @@ const pluginDirCollector = pathCollector(); const pluginPathCollector = pathCollector(); function initServerSettings(opts, extraCliOptions) { - const readYamlConfig = require('./read_yaml_config'); const settings = readYamlConfig(opts.config); const set = _.partial(_.set, settings); const get = _.partial(_.get, settings); @@ -117,7 +118,6 @@ module.exports = function (program) { if (canCluster && opts.dev && !isWorker) { // stop processing the action and handoff to cluster manager - const ClusterManager = require('../cluster/cluster_manager'); new ClusterManager(opts, settings); return; } diff --git a/src/fixtures/agg_resp/geohash_grid.js b/src/fixtures/agg_resp/geohash_grid.js index df9b6513de6b9..1818aed2051f2 100644 --- a/src/fixtures/agg_resp/geohash_grid.js +++ b/src/fixtures/agg_resp/geohash_grid.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; define(function (require) { return function GeoHashGridAggResponseFixture() { - var _ = require('lodash'); // for vis: // diff --git a/src/fixtures/fake_row.js b/src/fixtures/fake_row.js index 855d6bd7e50af..5c58fb02df0ce 100644 --- a/src/fixtures/fake_row.js +++ b/src/fixtures/fake_row.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); var longString = Array(200).join('_'); return function (id, mapping) { diff --git a/src/fixtures/hits.js b/src/fixtures/hits.js index 92665b504bbea..93994426d7aa0 100644 --- a/src/fixtures/hits.js +++ b/src/fixtures/hits.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function fitsFixture() { return _.map([ {_source: {'@timestamp': 0, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 10, request: 'foo'}}, diff --git a/src/fixtures/mock_courier.js b/src/fixtures/mock_courier.js index 07e6de0091f62..84ab876b783cf 100644 --- a/src/fixtures/mock_courier.js +++ b/src/fixtures/mock_courier.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; define(function (require) { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); return function (Private, Promise) { var indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern')); diff --git a/src/fixtures/mock_state.js b/src/fixtures/mock_state.js index fca7b9cf5454a..20b1155e746bb 100644 --- a/src/fixtures/mock_state.js +++ b/src/fixtures/mock_state.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; define(function (require) { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); function MockState(defaults) { this.on = _.noop; diff --git a/src/fixtures/mock_ui_state.js b/src/fixtures/mock_ui_state.js index b0e794722f794..00b9eecdf4cb3 100644 --- a/src/fixtures/mock_ui_state.js +++ b/src/fixtures/mock_ui_state.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); var keys = {}; return { get: function (path, def) { diff --git a/src/fixtures/search_response.js b/src/fixtures/search_response.js index 3c0b495da06a4..5c361e21e4da0 100644 --- a/src/fixtures/search_response.js +++ b/src/fixtures/search_response.js @@ -1,5 +1,5 @@ +import hits from 'fixtures/real_hits'; define(function (require) { - var hits = require('fixtures/real_hits'); return { took: 73, diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js index b91257e863a04..0936fa4cb410e 100644 --- a/src/fixtures/stubbed_logstash_index_pattern.js +++ b/src/fixtures/stubbed_logstash_index_pattern.js @@ -1,10 +1,10 @@ +import _ from 'lodash'; define(function (require) { return function stubbedLogstashIndexPatternService(Private) { var StubIndexPattern = Private(require('testUtils/stub_index_pattern')); var fieldTypes = Private(require('ui/index_patterns/_field_types')); var mockLogstashFields = Private(require('fixtures/logstash_fields')); - var _ = require('lodash'); var fields = mockLogstashFields.map(function (field) { field.displayName = field.name; diff --git a/src/fixtures/stubbed_search_source.js b/src/fixtures/stubbed_search_source.js index 3a5dc3a465551..a90dd9d293143 100644 --- a/src/fixtures/stubbed_search_source.js +++ b/src/fixtures/stubbed_search_source.js @@ -1,6 +1,6 @@ +import sinon from 'auto-release-sinon'; +import searchResponse from 'fixtures/search_response'; define(function (require) { - var sinon = require('auto-release-sinon'); - var searchResponse = require('fixtures/search_response'); return function stubSearchSource(Private, $q, Promise) { var deferedResult = $q.defer(); diff --git a/src/fixtures/tilemap_map.js b/src/fixtures/tilemap_map.js index 5d07de8349212..2c808be0bbc6e 100644 --- a/src/fixtures/tilemap_map.js +++ b/src/fixtures/tilemap_map.js @@ -1,5 +1,5 @@ +import sinon from 'auto-release-sinon'; define(function (require) { - var sinon = require('auto-release-sinon'); function MockMap(container, chartData, params) { this.container = container; diff --git a/src/fixtures/vislib/_vis_fixture.js b/src/fixtures/vislib/_vis_fixture.js index 084036ed48d98..b06885c8aac34 100644 --- a/src/fixtures/vislib/_vis_fixture.js +++ b/src/fixtures/vislib/_vis_fixture.js @@ -1,5 +1,5 @@ -var $ = require('jquery'); import _ from 'lodash'; +import $ from 'jquery'; var $visCanvas = $('
').attr('id', 'vislib-vis-fixtures').appendTo('body'); var count = 0; diff --git a/src/optimize/index.js b/src/optimize/index.js index 003722005111a..fd7d4ac5a6423 100644 --- a/src/optimize/index.js +++ b/src/optimize/index.js @@ -1,3 +1,4 @@ +import FsOptimizer from './FsOptimizer'; module.exports = async (kbnServer, server, config) => { if (!config.get('optimize.enabled')) return; @@ -33,7 +34,6 @@ module.exports = async (kbnServer, server, config) => { } // only require the FsOptimizer when we need to - let FsOptimizer = require('./FsOptimizer'); let optimizer = new FsOptimizer({ env: bundles.env, bundles: bundles, diff --git a/src/optimize/lazy/optmzrRole.js b/src/optimize/lazy/optmzrRole.js index f2ffcf911279c..51bdcc6ae9705 100644 --- a/src/optimize/lazy/optmzrRole.js +++ b/src/optimize/lazy/optmzrRole.js @@ -1,9 +1,9 @@ +import LazyServer from './LazyServer'; +import LazyOptimizer from './LazyOptimizer'; module.exports = async (kbnServer, kibanaHapiServer, config) => { let src = require('requirefrom')('src'); let fromRoot = src('utils/fromRoot'); - let LazyServer = require('./LazyServer'); - let LazyOptimizer = require('./LazyOptimizer'); let server = new LazyServer( config.get('optimize.lazyHost'), diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js index b9ee57748263e..5d3a7c912e9ca 100644 --- a/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js +++ b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { - const _ = require('lodash'); - const $ = require('jquery'); const module = require('ui/modules').get('kibana'); module.directive('lineInterpolationOption', function ($parse, $compile) { diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js index b0d6e337fbc7b..e14657b2aff69 100644 --- a/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js +++ b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { - const _ = require('lodash'); - const $ = require('jquery'); const module = require('ui/modules').get('kibana'); require('ui/directives/inequality'); diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js index 92c0cca39413d..ead3c8fb257e7 100644 --- a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js +++ b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { - const _ = require('lodash'); - const $ = require('jquery'); const module = require('ui/modules').get('kibana'); module.directive('vislibBasicOptions', function ($parse, $compile) { diff --git a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js index a1712742393ef..3c4d0be9c2f00 100644 --- a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js +++ b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js @@ -1,5 +1,5 @@ +import visTypes from 'ui/registry/vis_types'; define(function (require) { - const visTypes = require('ui/registry/vis_types'); visTypes.register(require('plugins/kbn_vislib_vis_types/histogram')); visTypes.register(require('plugins/kbn_vislib_vis_types/line')); visTypes.register(require('plugins/kbn_vislib_vis_types/pie')); diff --git a/src/plugins/kbn_vislib_vis_types/public/tileMap.js b/src/plugins/kbn_vislib_vis_types/public/tileMap.js index 668ee2320ce2a..2b68cf7200bbd 100644 --- a/src/plugins/kbn_vislib_vis_types/public/tileMap.js +++ b/src/plugins/kbn_vislib_vis_types/public/tileMap.js @@ -1,10 +1,10 @@ +import _ from 'lodash'; +import supports from 'ui/utils/supports'; define(function (require) { return function TileMapVisType(Private, getAppState, courier, config) { const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); const Schemas = Private(require('ui/Vis/Schemas')); const geoJsonConverter = Private(require('ui/agg_response/geo_json/geo_json')); - const _ = require('lodash'); - const supports = require('ui/utils/supports'); return new VislibVisType({ name: 'tile_map', diff --git a/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js b/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js index b954c88fea005..c0bdfb20f28af 100644 --- a/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js +++ b/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); return function loadPanelFunction(Private) { // Inject services here return function (panel, $scope) { // Function parameters here const panelTypes = { diff --git a/src/plugins/kibana/public/dashboard/components/panel/panel.js b/src/plugins/kibana/public/dashboard/components/panel/panel.js index 9dce83395c8ae..669ffe9ca16b1 100644 --- a/src/plugins/kibana/public/dashboard/components/panel/panel.js +++ b/src/plugins/kibana/public/dashboard/components/panel/panel.js @@ -1,10 +1,10 @@ +import moment from 'moment'; +import $ from 'jquery'; +import _ from 'lodash'; define(function (require) { - const moment = require('moment'); - const $ = require('jquery'); require('ui/modules') .get('app/dashboard') .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) { - const _ = require('lodash'); const loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel')); const filterManager = Private(require('ui/filter_manager')); const notify = new Notifier(); diff --git a/src/plugins/kibana/public/dashboard/directives/grid.js b/src/plugins/kibana/public/dashboard/directives/grid.js index da93a5b5a271a..0e570348e60e2 100644 --- a/src/plugins/kibana/public/dashboard/directives/grid.js +++ b/src/plugins/kibana/public/dashboard/directives/grid.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import Binder from 'ui/Binder'; define(function (require) { - const _ = require('lodash'); - const $ = require('jquery'); - const Binder = require('ui/Binder'); require('gridster'); const app = require('ui/modules').get('app/dashboard'); diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js index d0f9da568a276..a7aae9d259eec 100644 --- a/src/plugins/kibana/public/dashboard/index.js +++ b/src/plugins/kibana/public/dashboard/index.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import angular from 'angular'; +import ConfigTemplate from 'ui/ConfigTemplate'; +import chrome from 'ui/chrome'; define(function (require) { - const _ = require('lodash'); - const $ = require('jquery'); - const angular = require('angular'); - const ConfigTemplate = require('ui/ConfigTemplate'); - const chrome = require('ui/chrome'); require('ui/directives/config'); require('ui/courier'); diff --git a/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js b/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js index 100b0e652ce9d..0745998c4f148 100644 --- a/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js +++ b/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js @@ -1,8 +1,8 @@ +import angular from 'angular'; +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { const module = require('ui/modules').get('app/dashboard'); - const angular = require('angular'); - const _ = require('lodash'); - const moment = require('moment'); // Used only by the savedDashboards service, usually no reason to change this module.factory('SavedDashboard', function (courier, config) { diff --git a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js index 513a30b04e582..681b17103bf7c 100644 --- a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js +++ b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import Scanner from 'ui/utils/scanner'; define(function (require) { const module = require('ui/modules').get('app/dashboard'); - const _ = require('lodash'); - const Scanner = require('ui/utils/scanner'); // bring in the factory require('plugins/kibana/dashboard/services/_saved_dashboard'); diff --git a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js index ab93cde813c27..b1cf0df2db71e 100644 --- a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js +++ b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js @@ -1,10 +1,10 @@ import angular from 'angular'; -const $ = require('jquery'); import _ from 'lodash'; import sinon from 'auto-release-sinon'; import ngMock from 'ngMock'; import expect from 'expect.js'; +import $ from 'jquery'; // Load the kibana app dependencies. require('ui/private'); diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js index 1b1e30127e130..63fa7c8645fa8 100644 --- a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js +++ b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js @@ -1,10 +1,10 @@ import angular from 'angular'; import ngMock from 'ngMock'; -const $ = require('jquery'); import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; +import $ from 'jquery'; // Load the kibana app dependencies. require('ui/private'); diff --git a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js index 07be3785b0e92..f250e9491262c 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js +++ b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js @@ -1,8 +1,9 @@ +import $ from 'jquery'; +import html from 'plugins/kibana/discover/components/field_chooser/discover_field.html'; +import _ from 'lodash'; +import detailsHtml from 'plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html'; define(function (require) { - const $ = require('jquery'); const app = require('ui/modules').get('apps/discover'); - const html = require('plugins/kibana/discover/components/field_chooser/discover_field.html'); - const _ = require('lodash'); require('ui/directives/css_truncate'); require('ui/directives/field_name'); @@ -17,7 +18,6 @@ define(function (require) { let detailsElem; let detailScope = $scope.$new(); - const detailsHtml = require('plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html'); const init = function () { if ($scope.field.details) { diff --git a/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js index 85a4c294d8887..af01b8fc42079 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js +++ b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js @@ -1,3 +1,7 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import rison from 'ui/utils/rison'; +import fieldCalculator from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator'; define(function (require) { const app = require('ui/modules').get('apps/discover'); @@ -8,10 +12,6 @@ define(function (require) { require('plugins/kibana/discover/components/field_chooser/discover_field'); app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) { - const _ = require('lodash'); - const $ = require('jquery'); - const rison = require('ui/utils/rison'); - const fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator'); const FieldList = Private(require('ui/index_patterns/_field_list')); return { diff --git a/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js b/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js index add0c7bdb4cd6..c6efd46416e65 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js +++ b/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); function getFieldValues(hits, field) { const name = field.name; diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js index 17bf4cab75296..80e8b0a6f6ad2 100644 --- a/src/plugins/kibana/public/discover/controllers/discover.js +++ b/src/plugins/kibana/public/discover/controllers/discover.js @@ -1,12 +1,12 @@ +import _ from 'lodash'; +import angular from 'angular'; +import moment from 'moment'; +import ConfigTemplate from 'ui/ConfigTemplate'; +import getSort from 'ui/doc_table/lib/get_sort'; +import rison from 'ui/utils/rison'; +import dateMath from 'ui/utils/dateMath'; define(function (require) { - const _ = require('lodash'); - const angular = require('angular'); - const moment = require('moment'); - const ConfigTemplate = require('ui/ConfigTemplate'); - const getSort = require('ui/doc_table/lib/get_sort'); - const rison = require('ui/utils/rison'); - - const dateMath = require('ui/utils/dateMath'); + require('ui/doc_table'); require('ui/visualize'); diff --git a/src/plugins/kibana/public/discover/directives/timechart.js b/src/plugins/kibana/public/discover/directives/timechart.js index b397d752054af..e303a361fb6d6 100644 --- a/src/plugins/kibana/public/discover/directives/timechart.js +++ b/src/plugins/kibana/public/discover/directives/timechart.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import $ from 'jquery'; require('ui/modules') .get('apps/discover') .directive('discoverTimechart', function (Private, $compile) { - const _ = require('lodash'); - const $ = require('jquery'); const vislib = Private(require('ui/vislib')); return { diff --git a/src/plugins/kibana/public/discover/index.js b/src/plugins/kibana/public/discover/index.js index 6fc76ad568b1e..95880c9394105 100644 --- a/src/plugins/kibana/public/discover/index.js +++ b/src/plugins/kibana/public/discover/index.js @@ -1,3 +1,4 @@ +import savedObjectRegistry from 'ui/saved_objects/saved_object_registry'; define(function (require) { require('plugins/kibana/discover/saved_searches/saved_searches'); require('plugins/kibana/discover/directives/timechart'); @@ -10,6 +11,5 @@ define(function (require) { // preload require('ui/doc_table/components/table_row'); - const savedObjectRegistry = require('ui/saved_objects/saved_object_registry'); savedObjectRegistry.register(require('plugins/kibana/discover/saved_searches/saved_search_register')); }); diff --git a/src/plugins/kibana/public/discover/saved_searches/_saved_search.js b/src/plugins/kibana/public/discover/saved_searches/_saved_search.js index 14d9dcba9cb94..5bc4bfc8556fa 100644 --- a/src/plugins/kibana/public/discover/saved_searches/_saved_search.js +++ b/src/plugins/kibana/public/discover/saved_searches/_saved_search.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); require('ui/notify'); diff --git a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js index 60cbe43b79ac7..41ed9eab090c2 100644 --- a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js +++ b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import Scanner from 'ui/utils/scanner'; define(function (require) { - const _ = require('lodash'); - const Scanner = require('ui/utils/scanner'); require('plugins/kibana/discover/saved_searches/_saved_search'); require('ui/notify'); diff --git a/src/plugins/kibana/public/doc/controllers/doc.js b/src/plugins/kibana/public/doc/controllers/doc.js index 975bd5c0a277b..56d0b8b393d32 100644 --- a/src/plugins/kibana/public/doc/controllers/doc.js +++ b/src/plugins/kibana/public/doc/controllers/doc.js @@ -1,6 +1,7 @@ +import _ from 'lodash'; +import angular from 'angular'; +import html from 'plugins/kibana/doc/index.html'; define(function (require) { - const _ = require('lodash'); - const angular = require('angular'); require('ui/notify'); require('ui/courier'); @@ -13,7 +14,6 @@ define(function (require) { 'kibana/index_patterns' ]); - const html = require('plugins/kibana/doc/index.html'); const resolveIndexPattern = { indexPattern: function (courier, savedSearches, $route) { diff --git a/src/plugins/kibana/public/settings/index.js b/src/plugins/kibana/public/settings/index.js index 344dc2ec05f7b..9ef06ea35c679 100644 --- a/src/plugins/kibana/public/settings/index.js +++ b/src/plugins/kibana/public/settings/index.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import sections from 'plugins/kibana/settings/sections/index'; define(function (require) { - const _ = require('lodash'); - const sections = require('plugins/kibana/settings/sections/index'); require('plugins/kibana/settings/styles/main.less'); require('ui/filters/start_from'); diff --git a/src/plugins/kibana/public/settings/saved_object_registry.js b/src/plugins/kibana/public/settings/saved_object_registry.js index ae384c891eb9b..ea23f5f25f2ae 100644 --- a/src/plugins/kibana/public/settings/saved_object_registry.js +++ b/src/plugins/kibana/public/settings/saved_object_registry.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); const registry = []; return { register: function (service) { diff --git a/src/plugins/kibana/public/settings/sections/about/index.js b/src/plugins/kibana/public/settings/sections/about/index.js index f5e7921e8d39f..6cebf1e650dcf 100644 --- a/src/plugins/kibana/public/settings/sections/about/index.js +++ b/src/plugins/kibana/public/settings/sections/about/index.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); require('ui/routes') .when('/settings/about', { diff --git a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js index 75d84a2815f76..b171b32c9cfd2 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js +++ b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); require('ui/elastic_textarea'); require('ui/modules').get('apps/settings') diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.js b/src/plugins/kibana/public/settings/sections/advanced/index.js index d7e04dbf95515..8d0e1654ae9f7 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/index.js +++ b/src/plugins/kibana/public/settings/sections/advanced/index.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import toEditableConfig from 'plugins/kibana/settings/sections/advanced/lib/to_editable_config'; define(function (require) { - const _ = require('lodash'); - const toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config'); require('plugins/kibana/settings/sections/advanced/advanced_row'); diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js index 3b75cc23091b6..4001adbe53540 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); const NAMED_EDITORS = ['json', 'array', 'boolean', 'select']; const NORMAL_EDITOR = ['number', 'string', 'null', 'undefined']; diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js index 784f1f3844e6b..c923044251bf8 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); /** * @param {object} advanced setting definition object diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js b/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js index cf6b359eb8ba8..3eaddfa47542f 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import getValType from './get_val_type'; +import getEditorType from './get_editor_type'; define(function (require) { - const _ = require('lodash'); - const getValType = require('./get_val_type'); - const getEditorType = require('./get_editor_type'); /** * @param {object} advanced setting definition object diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.js b/src/plugins/kibana/public/settings/sections/indices/_create.js index 720e5de639d09..d400a5e764631 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_create.js +++ b/src/plugins/kibana/public/settings/sections/indices/_create.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { - const _ = require('lodash'); - const moment = require('moment'); const { IndexPatternMissingIndices } = require('ui/errors'); require('ui/directives/validate_index_name'); diff --git a/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js b/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js index 735e7ae7bfa02..3e5b52b002b79 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js +++ b/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); return function (indexPattern) { const dateScripts = {}; diff --git a/src/plugins/kibana/public/settings/sections/indices/_edit.js b/src/plugins/kibana/public/settings/sections/indices/_edit.js index e7dfee046db96..188b4d5a31ca1 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_edit.js +++ b/src/plugins/kibana/public/settings/sections/indices/_edit.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); require('plugins/kibana/settings/sections/indices/_indexed_fields'); require('plugins/kibana/settings/sections/indices/_scripted_fields'); require('plugins/kibana/settings/sections/indices/_index_header'); diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_types.js b/src/plugins/kibana/public/settings/sections/indices/_field_types.js index e4c3725ca27c5..6e436964cf8b3 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_field_types.js +++ b/src/plugins/kibana/public/settings/sections/indices/_field_types.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function GetFieldTypes() { - const _ = require('lodash'); return function (indexPattern) { const fieldCount = _.countBy(indexPattern.fields, function (field) { diff --git a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js index 6b72662e308da..fb69e0ecec4bc 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js +++ b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js @@ -1,14 +1,14 @@ +import _ from 'lodash'; +import nameHtml from 'plugins/kibana/settings/sections/indices/_field_name.html'; +import typeHtml from 'plugins/kibana/settings/sections/indices/_field_type.html'; +import controlsHtml from 'plugins/kibana/settings/sections/indices/_field_controls.html'; define(function (require) { - const _ = require('lodash'); require('ui/paginated_table'); require('ui/modules').get('apps/settings') .directive('indexedFields', function ($filter) { const yesTemplate = ''; const noTemplate = ''; - const nameHtml = require('plugins/kibana/settings/sections/indices/_field_name.html'); - const typeHtml = require('plugins/kibana/settings/sections/indices/_field_type.html'); - const controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html'); const filter = $filter('filter'); return { diff --git a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js index a3d8c97e8fbd7..c3debd55c41e9 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js +++ b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js @@ -1,12 +1,13 @@ +import _ from 'lodash'; +import popularityHtml from 'plugins/kibana/settings/sections/indices/_field_popularity.html'; +import controlsHtml from 'plugins/kibana/settings/sections/indices/_field_controls.html'; +import dateScripts from 'plugins/kibana/settings/sections/indices/_date_scripts'; define(function (require) { - const _ = require('lodash'); require('ui/paginated_table'); require('ui/modules').get('apps/settings') .directive('scriptedFields', function (kbnUrl, Notifier, $filter) { const rowScopes = []; // track row scopes, so they can be destroyed as needed - const popularityHtml = require('plugins/kibana/settings/sections/indices/_field_popularity.html'); - const controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html'); const filter = $filter('filter'); const notify = new Notifier(); @@ -16,7 +17,6 @@ define(function (require) { template: require('plugins/kibana/settings/sections/indices/_scripted_fields.html'), scope: true, link: function ($scope) { - const dateScripts = require('plugins/kibana/settings/sections/indices/_date_scripts'); const fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField'; const fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}'; diff --git a/src/plugins/kibana/public/settings/sections/indices/index.js b/src/plugins/kibana/public/settings/sections/indices/index.js index c292fa61815ce..a25332339fd1a 100644 --- a/src/plugins/kibana/public/settings/sections/indices/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/index.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); require('plugins/kibana/settings/sections/indices/_create'); require('plugins/kibana/settings/sections/indices/_edit'); diff --git a/src/plugins/kibana/public/settings/sections/objects/_objects.js b/src/plugins/kibana/public/settings/sections/objects/_objects.js index 702cc14130072..50113492e50d6 100644 --- a/src/plugins/kibana/public/settings/sections/objects/_objects.js +++ b/src/plugins/kibana/public/settings/sections/objects/_objects.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import angular from 'angular'; +import registry from 'plugins/kibana/settings/saved_object_registry'; +import objectIndexHTML from 'plugins/kibana/settings/sections/objects/_objects.html'; define(function (require) { - const _ = require('lodash'); - const angular = require('angular'); const saveAs = require('@spalger/filesaver').saveAs; - const registry = require('plugins/kibana/settings/saved_object_registry'); - const objectIndexHTML = require('plugins/kibana/settings/sections/objects/_objects.html'); const MAX_SIZE = Math.pow(2, 31) - 1; require('ui/directives/file_upload'); diff --git a/src/plugins/kibana/public/settings/sections/objects/_view.js b/src/plugins/kibana/public/settings/sections/objects/_view.js index 3fef727f455df..c174c7d44fd7b 100644 --- a/src/plugins/kibana/public/settings/sections/objects/_view.js +++ b/src/plugins/kibana/public/settings/sections/objects/_view.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import angular from 'angular'; +import rison from 'ui/utils/rison'; +import registry from 'plugins/kibana/settings/saved_object_registry'; +import objectViewHTML from 'plugins/kibana/settings/sections/objects/_view.html'; define(function (require) { - const _ = require('lodash'); - const angular = require('angular'); - const rison = require('ui/utils/rison'); - const registry = require('plugins/kibana/settings/saved_object_registry'); - const objectViewHTML = require('plugins/kibana/settings/sections/objects/_view.html'); require('ui/routes') .when('/settings/objects/:service/:id', { diff --git a/src/plugins/kibana/public/settings/sections/status/index.js b/src/plugins/kibana/public/settings/sections/status/index.js index aba30e10f6155..9dbbf3a1473f7 100644 --- a/src/plugins/kibana/public/settings/sections/status/index.js +++ b/src/plugins/kibana/public/settings/sections/status/index.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); return { order: 3, diff --git a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js index efa6838edbddb..e5459bfdf6f5f 100644 --- a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js +++ b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js @@ -1,9 +1,9 @@ import angular from 'angular'; -const $ = require('jquery'); import _ from 'lodash'; import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; require('plugins/kibana/visualize/editor/agg'); diff --git a/src/plugins/kibana/public/visualize/editor/agg.js b/src/plugins/kibana/public/visualize/editor/agg.js index df8012c6fc85a..a09d2ba909504 100644 --- a/src/plugins/kibana/public/visualize/editor/agg.js +++ b/src/plugins/kibana/public/visualize/editor/agg.js @@ -1,3 +1,6 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import advancedToggleHtml from 'plugins/kibana/visualize/editor/advanced_toggle.html'; define(function (require) { require('ui/modules') .get('app/visualize') @@ -5,10 +8,7 @@ define(function (require) { require('plugins/kibana/visualize/editor/agg_params'); require('plugins/kibana/visualize/editor/agg_add'); - const _ = require('lodash'); - const $ = require('jquery'); const aggTypes = Private(require('ui/agg_types/index')); - const advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html'); const notify = new Notifier({ location: 'visAggGroup' diff --git a/src/plugins/kibana/public/visualize/editor/agg_filter.js b/src/plugins/kibana/public/visualize/editor/agg_filter.js index 97ba638fd0815..86dc69c3df48b 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_filter.js +++ b/src/plugins/kibana/public/visualize/editor/agg_filter.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import propFilter from 'ui/filters/_prop_filter'; define(function (require) { - const _ = require('lodash'); - const propFilter = require('ui/filters/_prop_filter'); require('ui/modules') .get('kibana') diff --git a/src/plugins/kibana/public/visualize/editor/agg_param.js b/src/plugins/kibana/public/visualize/editor/agg_param.js index 82730722889ec..f704bdf8489bb 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_param.js +++ b/src/plugins/kibana/public/visualize/editor/agg_param.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); require('ui/modules') .get('app/visualize') diff --git a/src/plugins/kibana/public/visualize/editor/agg_params.js b/src/plugins/kibana/public/visualize/editor/agg_params.js index 3ebd55d105eb4..dd46d7e4d3208 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_params.js +++ b/src/plugins/kibana/public/visualize/editor/agg_params.js @@ -1,14 +1,14 @@ +import IndexedArray from 'ui/IndexedArray'; +import _ from 'lodash'; +import $ from 'jquery'; +import aggSelectHtml from 'plugins/kibana/visualize/editor/agg_select.html'; +import advancedToggleHtml from 'plugins/kibana/visualize/editor/advanced_toggle.html'; define(function (require) { - const IndexedArray = require('ui/IndexedArray'); require('ui/modules') .get('app/visualize') .directive('visEditorAggParams', function ($compile, $parse, Private, Notifier, $filter) { - const _ = require('lodash'); - const $ = require('jquery'); const aggTypes = Private(require('ui/agg_types/index')); - const aggSelectHtml = require('plugins/kibana/visualize/editor/agg_select.html'); - const advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html'); require('ui/filters/match_any'); require('plugins/kibana/visualize/editor/agg_param'); diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js index 85466abe0fd70..2f54b8fc5aa30 100644 --- a/src/plugins/kibana/public/visualize/editor/editor.js +++ b/src/plugins/kibana/public/visualize/editor/editor.js @@ -1,5 +1,8 @@ +import _ from 'lodash'; +import angular from 'angular'; +import ConfigTemplate from 'ui/ConfigTemplate'; +import Notifier from 'ui/notify/notifier'; define(function (require) { - const _ = require('lodash'); require('plugins/kibana/visualize/saved_visualizations/saved_visualizations'); require('plugins/kibana/visualize/editor/sidebar'); require('plugins/kibana/visualize/editor/agg_filter'); @@ -49,9 +52,6 @@ define(function (require) { ]) .controller('VisEditor', function ($scope, $route, timefilter, AppState, $location, kbnUrl, $timeout, courier, Private, Promise) { - const angular = require('angular'); - const ConfigTemplate = require('ui/ConfigTemplate'); - const Notifier = require('ui/notify/notifier'); const docTitle = Private(require('ui/doc_title')); const brushEvent = Private(require('ui/utils/brush_event')); const queryFilter = Private(require('ui/filter_bar/query_filter')); diff --git a/src/plugins/kibana/public/visualize/editor/nesting_indicator.js b/src/plugins/kibana/public/visualize/editor/nesting_indicator.js index 7288eb51f3a7f..fab1f18ccacc2 100644 --- a/src/plugins/kibana/public/visualize/editor/nesting_indicator.js +++ b/src/plugins/kibana/public/visualize/editor/nesting_indicator.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { require('ui/modules') .get('kibana') .directive('nestingIndicator', function ($rootScope, $parse, Private) { - const _ = require('lodash'); - const $ = require('jquery'); const getColors = Private(require('ui/vislib/components/color/color_palette')); return { diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.js b/src/plugins/kibana/public/visualize/editor/sidebar.js index 8394bdd04dd19..a35f5a783c41c 100644 --- a/src/plugins/kibana/public/visualize/editor/sidebar.js +++ b/src/plugins/kibana/public/visualize/editor/sidebar.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; define(function (require) { require('ui/modules') .get('app/visualize') .directive('visEditorSidebar', function () { - const _ = require('lodash'); require('plugins/kibana/visualize/editor/agg_group'); require('plugins/kibana/visualize/editor/vis_options'); diff --git a/src/plugins/kibana/public/visualize/editor/vis_options.js b/src/plugins/kibana/public/visualize/editor/vis_options.js index ed6d4e76807f7..2daccc1851267 100644 --- a/src/plugins/kibana/public/visualize/editor/vis_options.js +++ b/src/plugins/kibana/public/visualize/editor/vis_options.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { - const _ = require('lodash'); - const $ = require('jquery'); require('ui/modules') .get('app/visualize') diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js index c1da50201bba5..1f87b09c3c6fa 100644 --- a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js +++ b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; define(function (require) { require('ui/modules') .get('app/visualize') .factory('SavedVis', function (config, $injector, courier, Promise, savedSearches, Private, Notifier) { - const _ = require('lodash'); const Vis = Private(require('ui/Vis')); const notify = new Notifier({ diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js index 4c3ca00b19988..7b6f6da422d49 100644 --- a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js +++ b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import Scanner from 'ui/utils/scanner'; define(function (require) { const app = require('ui/modules').get('app/visualize'); - const _ = require('lodash'); - const Scanner = require('ui/utils/scanner'); require('plugins/kibana/visualize/saved_visualizations/_saved_vis'); diff --git a/src/plugins/kibana/public/visualize/wizard/wizard.js b/src/plugins/kibana/public/visualize/wizard/wizard.js index 3097e3adf9c70..087ab9deaf9cc 100644 --- a/src/plugins/kibana/public/visualize/wizard/wizard.js +++ b/src/plugins/kibana/public/visualize/wizard/wizard.js @@ -1,5 +1,6 @@ +import _ from 'lodash'; +import routes from 'ui/routes'; define(function (require) { - const _ = require('lodash'); require('plugins/kibana/visualize/saved_visualizations/saved_visualizations'); require('ui/directives/saved_object_finder'); @@ -10,7 +11,6 @@ define(function (require) { }; const module = require('ui/modules').get('app/visualize', ['kibana/courier']); - const routes = require('ui/routes'); /******** /** Wizard Step 1 diff --git a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js index 465eeb6f0ce69..0c6f45fef4553 100644 --- a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js +++ b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js @@ -1,9 +1,9 @@ +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('markdown vis controller', function () { let $scope; let $el; - const ngMock = require('ngMock'); - const expect = require('expect.js'); beforeEach(ngMock.module('kibana/markdown_vis')); beforeEach(ngMock.inject(function ($rootScope, $controller) { diff --git a/src/plugins/markdown_vis/public/markdown_vis_controller.js b/src/plugins/markdown_vis/public/markdown_vis_controller.js index 00b859702edd5..f67944a135787 100644 --- a/src/plugins/markdown_vis/public/markdown_vis_controller.js +++ b/src/plugins/markdown_vis/public/markdown_vis_controller.js @@ -1,5 +1,5 @@ +import marked from 'marked'; define(function (require) { - const marked = require('marked'); marked.setOptions({ gfm: true, // Github-flavored markdown sanitize: true // Sanitize HTML tags diff --git a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js index 133d8d6f979ac..032d83fedf2a7 100644 --- a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js +++ b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js @@ -1,8 +1,8 @@ +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('metric vis', function () { let $scope; - const ngMock = require('ngMock'); - const expect = require('expect.js'); const formatter = function (value) { return value.toFixed(3); diff --git a/src/plugins/metric_vis/public/metric_vis_controller.js b/src/plugins/metric_vis/public/metric_vis_controller.js index 1d21f328d96c6..6387c83ab9c4e 100644 --- a/src/plugins/metric_vis/public/metric_vis_controller.js +++ b/src/plugins/metric_vis/public/metric_vis_controller.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); // get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it // didn't already const module = require('ui/modules').get('kibana/metric_vis', ['kibana']); diff --git a/src/plugins/spyModes/public/reqRespStatsSpyMode.js b/src/plugins/spyModes/public/reqRespStatsSpyMode.js index 59b42509f5f8d..2ffcb614f31cd 100644 --- a/src/plugins/spyModes/public/reqRespStatsSpyMode.js +++ b/src/plugins/spyModes/public/reqRespStatsSpyMode.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import reqRespStatsHTML from 'plugins/spyModes/reqRespStatsSpyMode.html'; define(function (require) { - const _ = require('lodash'); - const reqRespStatsHTML = require('plugins/spyModes/reqRespStatsSpyMode.html'); const linkReqRespStats = function ($scope, config) { $scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]'); diff --git a/src/plugins/spyModes/public/tableSpyMode.js b/src/plugins/spyModes/public/tableSpyMode.js index d7a2981623d45..182607903c74c 100644 --- a/src/plugins/spyModes/public/tableSpyMode.js +++ b/src/plugins/spyModes/public/tableSpyMode.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) { - const _ = require('lodash'); const saveAs = require('@spalger/filesaver').saveAs; const tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify')); diff --git a/src/plugins/statusPage/public/statusPage.js b/src/plugins/statusPage/public/statusPage.js index ca83494de5a65..c0f7940038ed8 100644 --- a/src/plugins/statusPage/public/statusPage.js +++ b/src/plugins/statusPage/public/statusPage.js @@ -1,6 +1,6 @@ -const $ = require('jquery'); import _ from 'lodash'; import notify from 'ui/notify'; +import $ from 'jquery'; require('ui/autoload/styles'); require('plugins/statusPage/statusPageMetric'); diff --git a/src/plugins/table_vis/public/__tests__/_table_vis.js b/src/plugins/table_vis/public/__tests__/_table_vis.js index 8df38cb5c669d..06b0f578d0c7e 100644 --- a/src/plugins/table_vis/public/__tests__/_table_vis.js +++ b/src/plugins/table_vis/public/__tests__/_table_vis.js @@ -1,9 +1,9 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import sinon from 'auto-release-sinon'; describe('Integration', function () { - const $ = require('jquery'); - const _ = require('lodash'); - const expect = require('expect.js'); - const ngMock = require('ngMock'); - const sinon = require('auto-release-sinon'); let $rootScope; let TableGroup; diff --git a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js index 4ea3df8f66a2d..013962ddaa1fa 100644 --- a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js +++ b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js @@ -1,9 +1,10 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import sinon from 'auto-release-sinon'; +import tabifyPm from 'ui/agg_response/tabify/tabify'; describe('Controller', function () { - const $ = require('jquery'); - const _ = require('lodash'); - const expect = require('expect.js'); - const ngMock = require('ngMock'); - const sinon = require('auto-release-sinon'); let $rootScope; let TableGroup; @@ -114,7 +115,6 @@ describe('Controller', function () { it('passes partialRows:true to tabify based on the vis params', function () { // spy on the tabify private module - const tabifyPm = require('ui/agg_response/tabify/tabify'); const spiedTabify = sinon.spy(Private(tabifyPm)); Private.stub(tabifyPm, spiedTabify); @@ -128,7 +128,6 @@ describe('Controller', function () { it('passes partialRows:false to tabify based on the vis params', function () { // spy on the tabify private module - const tabifyPm = require('ui/agg_response/tabify/tabify'); const spiedTabify = sinon.spy(Private(tabifyPm)); Private.stub(tabifyPm, spiedTabify); @@ -142,7 +141,6 @@ describe('Controller', function () { it('passes partialRows:true to tabify based on the vis params', function () { // spy on the tabify private module - const tabifyPm = require('ui/agg_response/tabify/tabify'); const spiedTabify = sinon.spy(Private(tabifyPm)); Private.stub(tabifyPm, spiedTabify); @@ -156,7 +154,6 @@ describe('Controller', function () { it('passes partialRows:false to tabify based on the vis params', function () { // spy on the tabify private module - const tabifyPm = require('ui/agg_response/tabify/tabify'); const spiedTabify = sinon.spy(Private(tabifyPm)); Private.stub(tabifyPm, spiedTabify); diff --git a/src/plugins/table_vis/public/table_vis_params.js b/src/plugins/table_vis/public/table_vis_params.js index a984b428b0aa6..ca65aa1f978af 100644 --- a/src/plugins/table_vis/public/table_vis_params.js +++ b/src/plugins/table_vis/public/table_vis_params.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); require('ui/modules').get('kibana/table_vis') .directive('tableVisParams', function () { diff --git a/src/plugins/testsBundle/index.js b/src/plugins/testsBundle/index.js index 903224d3657c4..ddf4c55378edb 100644 --- a/src/plugins/testsBundle/index.js +++ b/src/plugins/testsBundle/index.js @@ -1,9 +1,9 @@ +import findSourceFiles from './findSourceFiles'; module.exports = (kibana) => { let { union } = require('lodash'); let utils = require('requirefrom')('src/utils'); let fromRoot = utils('fromRoot'); - let findSourceFiles = require('./findSourceFiles'); return new kibana.Plugin({ config: (Joi) => { diff --git a/src/server/config/setup.js b/src/server/config/setup.js index 7e63d48a6867a..dcecb0c2abb79 100644 --- a/src/server/config/setup.js +++ b/src/server/config/setup.js @@ -1,4 +1,4 @@ +import Config from './config'; module.exports = function (kbnServer) { - let Config = require('./config'); kbnServer.config = Config.withDefaultSchema(kbnServer.settings); }; diff --git a/src/server/http/index.js b/src/server/http/index.js index 951d8374c5468..8d857a689ecf8 100644 --- a/src/server/http/index.js +++ b/src/server/http/index.js @@ -1,12 +1,12 @@ +import _ from 'lodash'; +import fs from 'fs'; +import Boom from 'boom'; +import Hapi from 'hapi'; +import getDefaultRoute from './getDefaultRoute'; module.exports = async function (kbnServer, server, config) { - let _ = require('lodash'); - let fs = require('fs'); - let Boom = require('boom'); - let Hapi = require('hapi'); let parse = require('url').parse; let format = require('url').format; - let getDefaultRoute = require('./getDefaultRoute'); server = kbnServer.server = new Hapi.Server(); diff --git a/src/server/plugins/scan.js b/src/server/plugins/scan.js index 37d07e0537c09..66051c6a39518 100644 --- a/src/server/plugins/scan.js +++ b/src/server/plugins/scan.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import PluginCollection from './PluginCollection'; module.exports = async (kbnServer, server, config) => { - let _ = require('lodash'); let { fromNode } = require('bluebird'); let { readdir, stat } = require('fs'); let { resolve } = require('path'); let { each } = require('bluebird'); - var PluginCollection = require('./PluginCollection'); var plugins = kbnServer.plugins = new PluginCollection(kbnServer); let scanDirs = [].concat(config.get('plugins.scanDirs') || []); diff --git a/src/server/status/index.js b/src/server/status/index.js index 16dc436b01369..223d55afe1203 100644 --- a/src/server/status/index.js +++ b/src/server/status/index.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import ServerStatus from './ServerStatus'; module.exports = function (kbnServer, server, config) { - var _ = require('lodash'); - var ServerStatus = require('./ServerStatus'); var { join } = require('path'); kbnServer.status = new ServerStatus(kbnServer.server); diff --git a/src/server/status/metrics.js b/src/server/status/metrics.js index 837c0bf01939b..af9af67a4c2b2 100644 --- a/src/server/status/metrics.js +++ b/src/server/status/metrics.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import Samples from './Samples'; module.exports = function (kbnServer, server, config) { - var _ = require('lodash'); - var Samples = require('./Samples'); let lastReport = Date.now(); kbnServer.metrics = new Samples(12); diff --git a/src/testUtils/simulateKeys.js b/src/testUtils/simulateKeys.js index ae3c6c0738b1b..2a3d71f78c4ea 100644 --- a/src/testUtils/simulateKeys.js +++ b/src/testUtils/simulateKeys.js @@ -1,8 +1,8 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import Promise from 'bluebird'; +import keyMap from 'ui/utils/key_map'; define(function (require) { - var $ = require('jquery'); - var _ = require('lodash'); - var Promise = require('bluebird'); - var keyMap = require('ui/utils/key_map'); var reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1)); var KeyboardEvent = window.KeyboardEvent; diff --git a/src/testUtils/stub_index_pattern.js b/src/testUtils/stub_index_pattern.js index d350fa1254ca6..bd5654d045571 100644 --- a/src/testUtils/stub_index_pattern.js +++ b/src/testUtils/stub_index_pattern.js @@ -1,14 +1,14 @@ +import _ from 'lodash'; +import sinon from 'sinon'; +import Promise from 'bluebird'; +import IndexedArray from 'ui/IndexedArray'; +import IndexPattern from 'ui/index_patterns/_index_pattern'; +import formatHit from 'ui/index_patterns/_format_hit'; +import getComputedFields from 'ui/index_patterns/_get_computed_fields'; define(function (require) { return function (Private) { - var _ = require('lodash'); - var sinon = require('sinon'); - var Promise = require('bluebird'); - var IndexedArray = require('ui/IndexedArray'); - var IndexPattern = require('ui/index_patterns/_index_pattern'); var fieldFormats = Private(require('ui/registry/field_formats')); var flattenHit = Private(require('ui/index_patterns/_flatten_hit')); - var formatHit = require('ui/index_patterns/_format_hit'); - var getComputedFields = require('ui/index_patterns/_get_computed_fields'); var Field = Private(require('ui/index_patterns/_field')); diff --git a/src/ui/index.js b/src/ui/index.js index cf0945bc9ae46..1b0d6b5f41a14 100644 --- a/src/ui/index.js +++ b/src/ui/index.js @@ -1,15 +1,15 @@ +import Boom from 'boom'; +import fromRoot from '../utils/fromRoot'; +import UiExports from './ui_exports'; +import UiBundle from './ui_bundle'; +import UiBundleCollection from './ui_bundle_collection'; +import UiBundlerEnv from './ui_bundler_env'; module.exports = async (kbnServer, server, config) => { let { defaults } = require('lodash'); - let Boom = require('boom'); let formatUrl = require('url').format; let { resolve } = require('path'); let readFile = require('fs').readFileSync; - let fromRoot = require('../utils/fromRoot'); - let UiExports = require('./ui_exports'); - let UiBundle = require('./ui_bundle'); - let UiBundleCollection = require('./ui_bundle_collection'); - let UiBundlerEnv = require('./ui_bundler_env'); let loadingGif = readFile(fromRoot('src/ui/public/loading.gif'), { encoding: 'base64'}); let uiExports = kbnServer.uiExports = new UiExports({ diff --git a/src/ui/public/Binder/Binder.js b/src/ui/public/Binder/Binder.js index 601d78ffd5e18..7d5e754f0ac28 100644 --- a/src/ui/public/Binder/Binder.js +++ b/src/ui/public/Binder/Binder.js @@ -1,5 +1,5 @@ -var $ = require('jquery'); import d3 from 'd3'; +import $ from 'jquery'; var callEach = require('lodash').callEach; var bindKey = require('lodash').bindKey; var rest = require('lodash').rest; diff --git a/src/ui/public/Binder/__tests__/Binder.js b/src/ui/public/Binder/__tests__/Binder.js index ca400e814090c..d68119a73cb6d 100644 --- a/src/ui/public/Binder/__tests__/Binder.js +++ b/src/ui/public/Binder/__tests__/Binder.js @@ -1,9 +1,9 @@ -var $ = require('jquery'); import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; import Binder from 'ui/Binder'; +import $ from 'jquery'; describe('Binder class', function () { var $scope; diff --git a/src/ui/public/ConfigTemplate.js b/src/ui/public/ConfigTemplate.js index 3b8307ab8481a..b0ebb3a5a8007 100644 --- a/src/ui/public/ConfigTemplate.js +++ b/src/ui/public/ConfigTemplate.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); function ConfigTemplate(templates) { var template = this; diff --git a/src/ui/public/IndexedArray/IndexedArray.js b/src/ui/public/IndexedArray/IndexedArray.js index e42b67bbf7502..ff0095f532644 100644 --- a/src/ui/public/IndexedArray/IndexedArray.js +++ b/src/ui/public/IndexedArray/IndexedArray.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import inflector from 'ui/IndexedArray/inflector'; define(function (require) { - var _ = require('lodash'); - var inflector = require('ui/IndexedArray/inflector'); var pathGetter = _(_.get).rearg(1, 0).ary(2); var inflectIndex = inflector('by'); var inflectOrder = inflector('in', 'Order'); diff --git a/src/ui/public/StackTraceMapper/StackTraceMapper.js b/src/ui/public/StackTraceMapper/StackTraceMapper.js index fa1c55f6c3c7c..9c2d059e568e2 100644 --- a/src/ui/public/StackTraceMapper/StackTraceMapper.js +++ b/src/ui/public/StackTraceMapper/StackTraceMapper.js @@ -1,5 +1,4 @@ import _ from 'lodash'; -var $ = require('jquery'); var resolve = require('bluebird').resolve; import fetch from 'exports?window.fetch!imports?Promise=bluebird!whatwg-fetch'; @@ -7,6 +6,7 @@ import setErrorStack from './setErrorStack'; import translateStackLine from './translateStackLine'; import stackLineFormat from './stackLineFormat'; import SourceMapReader from './SourceMapReader'; +import $ from 'jquery'; function StackTraceMapper() { this.maps = []; diff --git a/src/ui/public/Vis/AggConfig.js b/src/ui/public/Vis/AggConfig.js index b877d310662f8..4f55e9e16dd39 100644 --- a/src/ui/public/Vis/AggConfig.js +++ b/src/ui/public/Vis/AggConfig.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function AggConfigFactory(Private, fieldTypeFilter) { - var _ = require('lodash'); var fieldFormats = Private(require('ui/registry/field_formats')); function AggConfig(vis, opts) { diff --git a/src/ui/public/Vis/AggConfigs.js b/src/ui/public/Vis/AggConfigs.js index 5a42d9accef10..8e8ec2bf21215 100644 --- a/src/ui/public/Vis/AggConfigs.js +++ b/src/ui/public/Vis/AggConfigs.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import IndexedArray from 'ui/IndexedArray'; define(function (require) { return function AggConfigsFactory(Private) { - var _ = require('lodash'); var AggConfig = Private(require('ui/Vis/AggConfig')); - var IndexedArray = require('ui/IndexedArray'); AggConfig.aggTypes = Private(require('ui/agg_types/index')); diff --git a/src/ui/public/Vis/Renderbot.js b/src/ui/public/Vis/Renderbot.js index a491065889fb2..fd29b2ce86685 100644 --- a/src/ui/public/Vis/Renderbot.js +++ b/src/ui/public/Vis/Renderbot.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function RenderbotFactory(Private) { diff --git a/src/ui/public/Vis/Schemas.js b/src/ui/public/Vis/Schemas.js index d3b4159f985ee..2eccf8e462ab7 100644 --- a/src/ui/public/Vis/Schemas.js +++ b/src/ui/public/Vis/Schemas.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import IndexedArray from 'ui/IndexedArray'; define(function (require) { return function VisTypeSchemasFactory(Private) { - var _ = require('lodash'); - var IndexedArray = require('ui/IndexedArray'); var AggParams = Private(require('ui/agg_types/AggParams')); function Schemas(schemas) { diff --git a/src/ui/public/Vis/Vis.js b/src/ui/public/Vis/Vis.js index e0e1d268d4b06..41ee3fe8970d9 100644 --- a/src/ui/public/Vis/Vis.js +++ b/src/ui/public/Vis/Vis.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function VisFactory(Notifier, Private) { - var _ = require('lodash'); var aggTypes = Private(require('ui/agg_types/index')); var visTypes = Private(require('ui/registry/vis_types')); var AggConfigs = Private(require('ui/Vis/AggConfigs')); diff --git a/src/ui/public/Vis/__tests__/_AggConfig.js b/src/ui/public/Vis/__tests__/_AggConfig.js index 5dc2213735ba1..95dd8a82a60ae 100644 --- a/src/ui/public/Vis/__tests__/_AggConfig.js +++ b/src/ui/public/Vis/__tests__/_AggConfig.js @@ -1,7 +1,7 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('AggConfig', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var Vis; var AggType; diff --git a/src/ui/public/Vis/__tests__/_AggConfigResult.js b/src/ui/public/Vis/__tests__/_AggConfigResult.js index 9a48b95f433be..f0887ed8f3689 100644 --- a/src/ui/public/Vis/__tests__/_AggConfigResult.js +++ b/src/ui/public/Vis/__tests__/_AggConfigResult.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import AggConfigResult from 'ui/Vis/AggConfigResult'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('AggConfigResult', function () { - var _ = require('lodash'); - var AggConfigResult = require('ui/Vis/AggConfigResult'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var AggConfig; var indexPattern; diff --git a/src/ui/public/Vis/__tests__/_AggConfigs.js b/src/ui/public/Vis/__tests__/_AggConfigs.js index cd165a86c0682..3900c5323cf9e 100644 --- a/src/ui/public/Vis/__tests__/_AggConfigs.js +++ b/src/ui/public/Vis/__tests__/_AggConfigs.js @@ -1,8 +1,9 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import RealAggConfigPM from 'ui/Vis/AggConfig'; describe('AggConfigs', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var Vis; var IndexedArray; @@ -15,7 +16,6 @@ describe('AggConfigs', function () { beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { // replace the AggConfig module with a spy - var RealAggConfigPM = require('ui/Vis/AggConfig'); AggConfig = Private(RealAggConfigPM); var spy = sinon.spy(AggConfig); Object.defineProperty(spy, 'aggTypes', { diff --git a/src/ui/public/Vis/__tests__/_Renderbot.js b/src/ui/public/Vis/__tests__/_Renderbot.js index 2ef792fcf0817..5d19ea4b6599a 100644 --- a/src/ui/public/Vis/__tests__/_Renderbot.js +++ b/src/ui/public/Vis/__tests__/_Renderbot.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('renderbot', function () { var Renderbot; - var expect = require('expect.js'); - var ngMock = require('ngMock'); function init() { ngMock.module('kibana'); diff --git a/src/ui/public/Vis/__tests__/_Vis.js b/src/ui/public/Vis/__tests__/_Vis.js index f72e69e29af9d..7507b1700b801 100644 --- a/src/ui/public/Vis/__tests__/_Vis.js +++ b/src/ui/public/Vis/__tests__/_Vis.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('Vis Class', function () { - var _ = require('lodash'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); var indexPattern; var Vis; diff --git a/src/ui/public/__tests__/metadata.js b/src/ui/public/__tests__/metadata.js index 58e213c1761d3..62bb7813e7a0a 100644 --- a/src/ui/public/__tests__/metadata.js +++ b/src/ui/public/__tests__/metadata.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import metadata from 'ui/metadata'; describe('ui/metadata', () => { - const expect = require('expect.js'); - const metadata = require('ui/metadata'); it('is same data as window.__KBN__', () => { expect(metadata.version).to.equal(window.__KBN__.version); diff --git a/src/ui/public/agg_response/geo_json/_tooltip_formatter.js b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js index 071fc482298be..70e6de1dac147 100644 --- a/src/ui/public/agg_response/geo_json/_tooltip_formatter.js +++ b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js @@ -1,7 +1,7 @@ +import $ from 'jquery'; +import _ from 'lodash'; define(function (require) { return function TileMapTooltipFormatter($compile, $rootScope, Private) { - var $ = require('jquery'); - var _ = require('lodash'); var fieldFormats = Private(require('ui/registry/field_formats')); var $tooltipScope = $rootScope.$new(); diff --git a/src/ui/public/agg_response/geo_json/geo_json.js b/src/ui/public/agg_response/geo_json/geo_json.js index 4b883f13820a5..55cf951a87dfe 100644 --- a/src/ui/public/agg_response/geo_json/geo_json.js +++ b/src/ui/public/agg_response/geo_json/geo_json.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import rowsToFeatures from 'ui/agg_response/geo_json/rowsToFeatures'; define(function (require) { return function TileMapConverterFn(Private, timefilter, $compile, $rootScope) { - var _ = require('lodash'); - var rowsToFeatures = require('ui/agg_response/geo_json/rowsToFeatures'); var tooltipFormatter = Private(require('ui/agg_response/geo_json/_tooltip_formatter')); return function (vis, table) { diff --git a/src/ui/public/agg_response/geo_json/rowsToFeatures.js b/src/ui/public/agg_response/geo_json/rowsToFeatures.js index 5ce58a6ddbece..15f5aa3f6f160 100644 --- a/src/ui/public/agg_response/geo_json/rowsToFeatures.js +++ b/src/ui/public/agg_response/geo_json/rowsToFeatures.js @@ -1,7 +1,7 @@ +import decodeGeoHash from 'ui/utils/decode_geo_hash'; +import AggConfigResult from 'ui/Vis/AggConfigResult'; +import _ from 'lodash'; define(function (require) { - var decodeGeoHash = require('ui/utils/decode_geo_hash'); - var AggConfigResult = require('ui/Vis/AggConfigResult'); - var _ = require('lodash'); function getAcr(val) { return val instanceof AggConfigResult ? val : null; diff --git a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js index 378df0c65d4cb..7d76b16561858 100644 --- a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js +++ b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('buildHierarchicalData()', function () { describe('transformAggregation()', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var transform; var fixture; diff --git a/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js index fb8b236cd0c0c..bd9949f5e8434 100644 --- a/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js +++ b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function (buckets) { var previous; _.each(buckets, function (bucket) { diff --git a/src/ui/public/agg_response/hierarchical/_build_split.js b/src/ui/public/agg_response/hierarchical/_build_split.js index 7c6bacc9c5f7f..6b28a965f91cc 100644 --- a/src/ui/public/agg_response/hierarchical/_build_split.js +++ b/src/ui/public/agg_response/hierarchical/_build_split.js @@ -1,7 +1,7 @@ +import collectKeys from 'ui/agg_response/hierarchical/_collect_keys'; define(function (require) { return function biuldSplitProvider(Private) { var transformer = Private(require('ui/agg_response/hierarchical/_transform_aggregation')); - var collectKeys = require('ui/agg_response/hierarchical/_collect_keys'); return function (agg, metric, aggData) { // Ceate the split structure var split = { label: '', slices: { children: [] } }; diff --git a/src/ui/public/agg_response/hierarchical/_collect_keys.js b/src/ui/public/agg_response/hierarchical/_collect_keys.js index 460e6c0091e2e..e8cb7e24f92de 100644 --- a/src/ui/public/agg_response/hierarchical/_collect_keys.js +++ b/src/ui/public/agg_response/hierarchical/_collect_keys.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function collectKeys(children) { var nextChildren = _.pluck(children, 'children'); var keys = _.pluck(children, 'name'); diff --git a/src/ui/public/agg_response/hierarchical/_create_raw_data.js b/src/ui/public/agg_response/hierarchical/_create_raw_data.js index 9f4346a9fca57..f1fae932087a8 100644 --- a/src/ui/public/agg_response/hierarchical/_create_raw_data.js +++ b/src/ui/public/agg_response/hierarchical/_create_raw_data.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets'; define(function (require) { - var _ = require('lodash'); - var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets'); return function (vis, resp) { // Create the initial results structure diff --git a/src/ui/public/agg_response/hierarchical/_extract_buckets.js b/src/ui/public/agg_response/hierarchical/_extract_buckets.js index e1866ea5d0062..15e8733d97cee 100644 --- a/src/ui/public/agg_response/hierarchical/_extract_buckets.js +++ b/src/ui/public/agg_response/hierarchical/_extract_buckets.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function (bucket, agg) { if (bucket && _.isPlainObject(bucket.buckets)) { return _.map(bucket.buckets, function (value, key) { diff --git a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js index bfae524ebf840..100f7f1c47c89 100644 --- a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js +++ b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import collectBranch from 'ui/agg_response/hierarchical/_collect_branch'; +import numeral from 'numeral'; define(function (require) { return function HierarchicalTooltipFormaterProvider($rootScope, $compile, $sce) { - var _ = require('lodash'); - var $ = require('jquery'); var $tooltip = $(require('ui/agg_response/hierarchical/_tooltip.html')); - var collectBranch = require('ui/agg_response/hierarchical/_collect_branch'); var $tooltipScope = $rootScope.$new(); - var numeral = require('numeral'); $compile($tooltip)($tooltipScope); diff --git a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js index 0a3342ce8d23f..9f0108b5cfeeb 100644 --- a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js +++ b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets'; +import AggConfigResult from 'ui/Vis/AggConfigResult'; define(function (require) { - var _ = require('lodash'); - var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets'); return function transformAggregationProvider(Private) { - var AggConfigResult = require('ui/Vis/AggConfigResult'); return function transformAggregation(agg, metric, aggData, parent) { return _.map(extractBuckets(aggData, agg), function (bucket) { var aggConfigResult = new AggConfigResult( diff --git a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js index 31ca1ca4b0b69..8c01393897488 100644 --- a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js +++ b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js @@ -1,13 +1,13 @@ +import _ from 'lodash'; +import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets'; +import createRawData from 'ui/agg_response/hierarchical/_create_raw_data'; +import arrayToLinkedList from 'ui/agg_response/hierarchical/_array_to_linked_list'; +import AggConfigResult from 'ui/Vis/AggConfigResult'; define(function (require) { return function buildHierarchicalDataProvider(Private, Notifier) { - var _ = require('lodash'); var buildSplit = Private(require('ui/agg_response/hierarchical/_build_split')); - var extractBuckets = require('ui/agg_response/hierarchical/_extract_buckets'); - var createRawData = require('ui/agg_response/hierarchical/_create_raw_data'); - var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list'); var tooltipFormatter = Private(require('ui/agg_response/hierarchical/_hierarchical_tooltip_formatter')); - var AggConfigResult = require('ui/Vis/AggConfigResult'); var notify = new Notifier({ location: 'Pie chart response converter' diff --git a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js index 0e7042d8a2e3a..edb78b36c3c04 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js +++ b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js @@ -1,6 +1,6 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('addToSiri', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); var addToSiri; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js index 1f7d8e338cf56..9679cb610653c 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js +++ b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js @@ -1,3 +1,5 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('makeFakeXAspect', function () { var makeFakeXAspect; @@ -5,8 +7,6 @@ describe('makeFakeXAspect', function () { var AggType; var AggConfig; var indexPattern; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js index 9ac566e0e48bd..12954add1c20f 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import moment from 'moment'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('getAspects', function () { - var _ = require('lodash'); - var moment = require('moment'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var Vis; var Table; diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_point.js b/src/ui/public/agg_response/point_series/__tests__/_get_point.js index 26afb0d767506..23b3607476a4a 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_point.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_point.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('getPoint', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var getPoint; diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_series.js b/src/ui/public/agg_response/point_series/__tests__/_get_series.js index c7c0bf6a2c05e..5ce959e5f1928 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_get_series.js +++ b/src/ui/public/agg_response/point_series/__tests__/_get_series.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('getSeries', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var getSeries; var agg = { fieldFormatter: _.constant(_.identity) }; diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js index 904ee1c1b20d1..9a8d43b1b728a 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('initXAxis', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var initXAxis; diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js index 0421369f95ff7..0435403fb251a 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('initYAxis', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var initYAxis; diff --git a/src/ui/public/agg_response/point_series/__tests__/_main.js b/src/ui/public/agg_response/point_series/__tests__/_main.js index c2f1939ac4182..5cf151f223c81 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_main.js +++ b/src/ui/public/agg_response/point_series/__tests__/_main.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import moment from 'moment'; +import AggConfigResult from 'ui/Vis/AggConfigResult'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('pointSeriesChartDataFromTable', function () { this.slow(1000); - var _ = require('lodash'); - var moment = require('moment'); - var AggConfigResult = require('ui/Vis/AggConfigResult'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var pointSeriesChartDataFromTable; var indexPattern; diff --git a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js index f25fcd8321ef0..2176511befa0f 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js +++ b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js @@ -1,9 +1,9 @@ +import moment from 'moment'; +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('orderedDateAxis', function () { - var moment = require('moment'); - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var baseArgs = { vis: { diff --git a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js index 75566f842fc09..8c68bed9ca199 100644 --- a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js +++ b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('tooltipFormatter', function () { - var _ = require('lodash'); - var $ = require('jquery'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var tooltipFormatter; diff --git a/src/ui/public/agg_response/point_series/_get_aspects.js b/src/ui/public/agg_response/point_series/_get_aspects.js index 58ce78b3549ef..55f6fc6d85763 100644 --- a/src/ui/public/agg_response/point_series/_get_aspects.js +++ b/src/ui/public/agg_response/point_series/_get_aspects.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function PointSeriesGetAspects(Private) { - var _ = require('lodash'); var fakeXAspect = Private(require('ui/agg_response/point_series/_fake_x_aspect')); var map = { diff --git a/src/ui/public/agg_response/point_series/_get_point.js b/src/ui/public/agg_response/point_series/_get_point.js index c0b4e30ef2f0c..2ef62ff1a9da5 100644 --- a/src/ui/public/agg_response/point_series/_get_point.js +++ b/src/ui/public/agg_response/point_series/_get_point.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function PointSeriesGetPoint() { - var _ = require('lodash'); function unwrap(aggConfigResult, def) { return aggConfigResult ? aggConfigResult.value : def; } diff --git a/src/ui/public/agg_response/point_series/_get_series.js b/src/ui/public/agg_response/point_series/_get_series.js index 7e86ecf67ba2f..e3d4f67d4c891 100644 --- a/src/ui/public/agg_response/point_series/_get_series.js +++ b/src/ui/public/agg_response/point_series/_get_series.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function PointSeriesGetSeries(Private) { - var _ = require('lodash'); var getPoint = Private(require('ui/agg_response/point_series/_get_point')); var addToSiri = Private(require('ui/agg_response/point_series/_add_to_siri')); diff --git a/src/ui/public/agg_response/point_series/_init_y_axis.js b/src/ui/public/agg_response/point_series/_init_y_axis.js index b47ec2ef884c2..de0a967bc2fbe 100644 --- a/src/ui/public/agg_response/point_series/_init_y_axis.js +++ b/src/ui/public/agg_response/point_series/_init_y_axis.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function PointSeriesInitYAxis() { - var _ = require('lodash'); return function initYAxis(chart) { var y = chart.aspects.y; diff --git a/src/ui/public/agg_response/point_series/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/_ordered_date_axis.js index 805bea1c43bbe..c59586b337f82 100644 --- a/src/ui/public/agg_response/point_series/_ordered_date_axis.js +++ b/src/ui/public/agg_response/point_series/_ordered_date_axis.js @@ -1,6 +1,6 @@ +import moment from 'moment'; define(function (require) { return function PointSeriesOrderedDateAxis(timefilter) { - var moment = require('moment'); return function orderedDateAxis(vis, chart) { var xAgg = chart.aspects.x.agg; diff --git a/src/ui/public/agg_response/point_series/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/_tooltip_formatter.js index 97345117543a3..f3ffdafb20702 100644 --- a/src/ui/public/agg_response/point_series/_tooltip_formatter.js +++ b/src/ui/public/agg_response/point_series/_tooltip_formatter.js @@ -1,6 +1,6 @@ +import $ from 'jquery'; define(function (require) { return function PointSeriesTooltipFormatter($compile, $rootScope) { - var $ = require('jquery'); var $tooltipScope = $rootScope.$new(); var $tooltip = $(require('ui/agg_response/point_series/_tooltip.html')); diff --git a/src/ui/public/agg_response/point_series/point_series.js b/src/ui/public/agg_response/point_series/point_series.js index ddaf2c9beef21..d4933cc259fdf 100644 --- a/src/ui/public/agg_response/point_series/point_series.js +++ b/src/ui/public/agg_response/point_series/point_series.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function PointSeriesProvider(Private) { - var _ = require('lodash'); var getSeries = Private(require('ui/agg_response/point_series/_get_series')); var getAspects = Private(require('ui/agg_response/point_series/_get_aspects')); diff --git a/src/ui/public/agg_response/tabify/__tests__/_buckets.js b/src/ui/public/agg_response/tabify/__tests__/_buckets.js index f019564d93853..9e4053114a535 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_buckets.js +++ b/src/ui/public/agg_response/tabify/__tests__/_buckets.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Buckets wrapper', function () { var Buckets; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { diff --git a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js index 136ad133d362c..65a64a064d105 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js +++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js @@ -1,9 +1,9 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('get columns', function () { var getColumns; var Vis; var indexPattern; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js index fec883f229585..4c5177ea29967 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_integration.js +++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import fixtures from 'fixtures/fake_hierarchical_data'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('tabifyAggResponse Integration', function () { - var _ = require('lodash'); - var fixtures = require('fixtures/fake_hierarchical_data'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var Vis; var Buckets; diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js index 0b5ab94190f4f..d01edeb5b29e5 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js +++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('ResponseWriter class', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var Vis; var Table; diff --git a/src/ui/public/agg_response/tabify/__tests__/_table.js b/src/ui/public/agg_response/tabify/__tests__/_table.js index d65a93b1e906e..d42722cbafda9 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_table.js +++ b/src/ui/public/agg_response/tabify/__tests__/_table.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Table class', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var Table; diff --git a/src/ui/public/agg_response/tabify/__tests__/_table_group.js b/src/ui/public/agg_response/tabify/__tests__/_table_group.js index ead9e4e41e5ea..07b493a276c4c 100644 --- a/src/ui/public/agg_response/tabify/__tests__/_table_group.js +++ b/src/ui/public/agg_response/tabify/__tests__/_table_group.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Table Group class', function () { var TableGroup; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $injector) { diff --git a/src/ui/public/agg_response/tabify/_buckets.js b/src/ui/public/agg_response/tabify/_buckets.js index 6fc08cd41e75f..1c5d26a8b1f50 100644 --- a/src/ui/public/agg_response/tabify/_buckets.js +++ b/src/ui/public/agg_response/tabify/_buckets.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function AggResponseBucketsProvider() { - var _ = require('lodash'); function Buckets(aggResp) { aggResp = aggResp || false; diff --git a/src/ui/public/agg_response/tabify/_get_columns.js b/src/ui/public/agg_response/tabify/_get_columns.js index e652cf0f61e02..059d4e535ae0e 100644 --- a/src/ui/public/agg_response/tabify/_get_columns.js +++ b/src/ui/public/agg_response/tabify/_get_columns.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function GetColumnsProvider(Private) { - var _ = require('lodash'); var AggConfig = Private(require('ui/Vis/AggConfig')); return function getColumns(vis, minimal) { diff --git a/src/ui/public/agg_response/tabify/_response_writer.js b/src/ui/public/agg_response/tabify/_response_writer.js index f6da52f7b4229..8d0a4abfcc017 100644 --- a/src/ui/public/agg_response/tabify/_response_writer.js +++ b/src/ui/public/agg_response/tabify/_response_writer.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import AggConfigResult from 'ui/Vis/AggConfigResult'; define(function (require) { return function TabbedAggResponseWriterProvider(Private) { - var _ = require('lodash'); var Table = Private(require('ui/agg_response/tabify/_table')); var TableGroup = Private(require('ui/agg_response/tabify/_table_group')); var getColumns = Private(require('ui/agg_response/tabify/_get_columns')); - var AggConfigResult = require('ui/Vis/AggConfigResult'); _.class(SplitAcr).inherits(AggConfigResult); function SplitAcr(agg, parent, key) { diff --git a/src/ui/public/agg_response/tabify/_table.js b/src/ui/public/agg_response/tabify/_table.js index 855a72a6b4df2..5555cf2de44fc 100644 --- a/src/ui/public/agg_response/tabify/_table.js +++ b/src/ui/public/agg_response/tabify/_table.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function TableProvider() { - var _ = require('lodash'); /** * Simple table class that is used to contain the rows and columns that create diff --git a/src/ui/public/agg_response/tabify/_table_group.js b/src/ui/public/agg_response/tabify/_table_group.js index 28830e82493ba..6f266efb708ab 100644 --- a/src/ui/public/agg_response/tabify/_table_group.js +++ b/src/ui/public/agg_response/tabify/_table_group.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function TableGroupProvider() { - var _ = require('lodash'); /** * Simple object that wraps multiple tables. It contains information about the aggConfig diff --git a/src/ui/public/agg_response/tabify/tabify.js b/src/ui/public/agg_response/tabify/tabify.js index 4caa8ee92a93d..b8da4a3d0a973 100644 --- a/src/ui/public/agg_response/tabify/tabify.js +++ b/src/ui/public/agg_response/tabify/tabify.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function tabifyAggResponseProvider(Private, Notifier) { - var _ = require('lodash'); var AggConfig = Private(require('ui/Vis/AggConfig')); var TabbedAggResponseWriter = Private(require('ui/agg_response/tabify/_response_writer')); diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js index 945a2f274dd6b..da3bdf1c5a4e2 100644 --- a/src/ui/public/agg_table/__tests__/_group.js +++ b/src/ui/public/agg_table/__tests__/_group.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; +import fixtures from 'fixtures/fake_hierarchical_data'; describe('AggTableGroup Directive', function () { - var _ = require('lodash'); - var $ = require('jquery'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); - var fixtures = require('fixtures/fake_hierarchical_data'); var $rootScope; var $compile; diff --git a/src/ui/public/agg_table/__tests__/_table.js b/src/ui/public/agg_table/__tests__/_table.js index d54ca44a8efd8..a9406bb615f01 100644 --- a/src/ui/public/agg_table/__tests__/_table.js +++ b/src/ui/public/agg_table/__tests__/_table.js @@ -1,10 +1,10 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; +import fixtures from 'fixtures/fake_hierarchical_data'; +import sinon from 'auto-release-sinon'; describe('AggTable Directive', function () { - var _ = require('lodash'); - var $ = require('jquery'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); - var fixtures = require('fixtures/fake_hierarchical_data'); - var sinon = require('auto-release-sinon'); var $rootScope; var $compile; diff --git a/src/ui/public/agg_table/agg_table.js b/src/ui/public/agg_table/agg_table.js index 2b6fe0cceccde..6e13dad100416 100644 --- a/src/ui/public/agg_table/agg_table.js +++ b/src/ui/public/agg_table/agg_table.js @@ -1,3 +1,4 @@ +import _ from 'lodash'; define(function (require) { require('ui/paginated_table'); require('ui/compile_recursive_directive'); @@ -6,7 +7,6 @@ define(function (require) { require('ui/modules') .get('kibana') .directive('kbnAggTable', function ($filter, config, Private, compileRecursiveDirective) { - var _ = require('lodash'); return { restrict: 'E', diff --git a/src/ui/public/agg_types/AggParams.js b/src/ui/public/agg_types/AggParams.js index 503335d9c567e..8200affb60ec9 100644 --- a/src/ui/public/agg_types/AggParams.js +++ b/src/ui/public/agg_types/AggParams.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import IndexedArray from 'ui/IndexedArray'; define(function (require) { return function AggParamsFactory(Private) { require('ui/filters/label'); - var _ = require('lodash'); - var IndexedArray = require('ui/IndexedArray'); var paramTypeMap = { field: Private(require('ui/agg_types/param_types/field')), diff --git a/src/ui/public/agg_types/AggType.js b/src/ui/public/agg_types/AggType.js index 522f4c1d373d1..1c70265cffcfc 100644 --- a/src/ui/public/agg_types/AggType.js +++ b/src/ui/public/agg_types/AggType.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function AggTypeFactory(Private) { - var _ = require('lodash'); var AggParams = Private(require('ui/agg_types/AggParams')); var fieldFormats = Private(require('ui/registry/field_formats')); diff --git a/src/ui/public/agg_types/__tests__/AggParamWriter.js b/src/ui/public/agg_types/__tests__/AggParamWriter.js index b37ff90795d57..b451d16445518 100644 --- a/src/ui/public/agg_types/__tests__/AggParamWriter.js +++ b/src/ui/public/agg_types/__tests__/AggParamWriter.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; module.exports = function AggParamWriterHelper(Private) { - var _ = require('lodash'); var Vis = Private(require('ui/Vis')); var aggTypes = Private(require('ui/agg_types/index')); var visTypes = Private(require('ui/registry/vis_types')); diff --git a/src/ui/public/agg_types/__tests__/AggParams.js b/src/ui/public/agg_types/__tests__/AggParams.js index 0d0c839fb9aef..64ca6edeef257 100644 --- a/src/ui/public/agg_types/__tests__/AggParams.js +++ b/src/ui/public/agg_types/__tests__/AggParams.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('AggParams class', function () { - var _ = require('lodash'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); var AggParams; var BaseAggParam; diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/AggType.js index 6fa42678c1535..a87e70af00518 100644 --- a/src/ui/public/agg_types/__tests__/AggType.js +++ b/src/ui/public/agg_types/__tests__/AggType.js @@ -1,8 +1,9 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import sinon from 'auto-release-sinon'; +import AggParamsPM from 'ui/agg_types/AggParams'; describe('AggType Class', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var sinon = require('auto-release-sinon'); var AggType; var AggParams; var AggConfig; @@ -14,7 +15,6 @@ describe('AggType Class', function () { beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { - var AggParamsPM = require('ui/agg_types/AggParams'); AggParams = sinon.spy(Private(AggParamsPM)); Private.stub(AggParamsPM, AggParams); diff --git a/src/ui/public/agg_types/__tests__/bucketCountBetween.js b/src/ui/public/agg_types/__tests__/bucketCountBetween.js index 45f716b99e408..b72d0e6151a91 100644 --- a/src/ui/public/agg_types/__tests__/bucketCountBetween.js +++ b/src/ui/public/agg_types/__tests__/bucketCountBetween.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('bucketCountBetween util', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var indexPattern; var Vis; var visTypes; diff --git a/src/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/ui/public/agg_types/__tests__/buckets/_histogram.js index 5da2bf18b56a1..bca81871c7088 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Histogram Agg', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); describe('ordered', function () { var histogram; diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js index 998b0857ba642..c18c7c37288ed 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/_range.js @@ -1,10 +1,10 @@ +import _ from 'lodash'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; +import resp from 'fixtures/agg_resp/range'; describe('Range Agg', function () { - var _ = require('lodash'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); var values = require('lodash').values; - var resp = require('fixtures/agg_resp/range'); var buckets = values(resp.aggregations[1].buckets); var range; diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js index 21da090d58cd8..d717c77652d96 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import moment from 'moment'; +import sinon from 'auto-release-sinon'; +import aggResp from 'fixtures/agg_resp/date_histogram'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('AggConfig Filters', function () { describe('date_histogram', function () { - var _ = require('lodash'); - var moment = require('moment'); - var sinon = require('auto-release-sinon'); - var aggResp = require('fixtures/agg_resp/date_histogram'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); var vis; var agg; diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js index c58bcff71dbb8..5af1fa7e86543 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js @@ -1,6 +1,6 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('AggConfig Filters', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); describe('IP range', function () { var AggConfig; diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js index ca5b8eff5f745..eaa56de80d35c 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js @@ -1,6 +1,6 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('AggConfig Filters', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); describe('range', function () { var AggConfig; diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js index 32a9fe897921d..97a26d489d434 100644 --- a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js +++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js @@ -1,6 +1,6 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('AggConfig Filters', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); describe('terms', function () { var AggConfig; diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js index 88152a39f55e3..2ae1ccad2f597 100644 --- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js +++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('editor', function () { - var _ = require('lodash'); - var $ = require('jquery'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); var indexPattern; var vis; diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js index 4ad58ff3d3026..1152b702fa9e8 100644 --- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js +++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import moment from 'moment'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('params', function () { - var _ = require('lodash'); - var moment = require('moment'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var paramWriter; var writeInterval; diff --git a/src/ui/public/agg_types/__tests__/controls/number_list.js b/src/ui/public/agg_types/__tests__/controls/number_list.js index 8ea2d47d297f2..bb799ee9813e3 100644 --- a/src/ui/public/agg_types/__tests__/controls/number_list.js +++ b/src/ui/public/agg_types/__tests__/controls/number_list.js @@ -1,9 +1,9 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import expect from 'expect.js'; +import simulateKeys from 'testUtils/simulateKeys'; +import ngMock from 'ngMock'; describe('NumberList directive', function () { - var $ = require('jquery'); - var _ = require('lodash'); - var expect = require('expect.js'); - var simulateKeys = require('testUtils/simulateKeys'); - var ngMock = require('ngMock'); require('ui/number_list'); diff --git a/src/ui/public/agg_types/__tests__/param_types/_field.js b/src/ui/public/agg_types/__tests__/param_types/_field.js index 2bc90026efba4..6cccef2b8d149 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_field.js +++ b/src/ui/public/agg_types/__tests__/param_types/_field.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Field', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var BaseAggParam; var FieldAggParam; diff --git a/src/ui/public/agg_types/__tests__/param_types/_optioned.js b/src/ui/public/agg_types/__tests__/param_types/_optioned.js index b15ecd02e47bd..0d31eff536f00 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_optioned.js +++ b/src/ui/public/agg_types/__tests__/param_types/_optioned.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Optioned', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var BaseAggParam; var OptionedAggParam; diff --git a/src/ui/public/agg_types/__tests__/param_types/_regex.js b/src/ui/public/agg_types/__tests__/param_types/_regex.js index 6d466df588925..02b3196cf1e16 100644 --- a/src/ui/public/agg_types/__tests__/param_types/_regex.js +++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Regex', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var BaseAggParam; var RegexAggParam; diff --git a/src/ui/public/agg_types/buckets/_bucket_agg_type.js b/src/ui/public/agg_types/buckets/_bucket_agg_type.js index b76e3911e0c8e..86ca3fca962a0 100644 --- a/src/ui/public/agg_types/buckets/_bucket_agg_type.js +++ b/src/ui/public/agg_types/buckets/_bucket_agg_type.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function BucketAggTypeProvider(Private) { - var _ = require('lodash'); var AggType = Private(require('ui/agg_types/AggType')); _.class(BucketAggType).inherits(AggType); diff --git a/src/ui/public/agg_types/buckets/_interval_options.js b/src/ui/public/agg_types/buckets/_interval_options.js index fa27d2291a01d..f7af882b5793b 100644 --- a/src/ui/public/agg_types/buckets/_interval_options.js +++ b/src/ui/public/agg_types/buckets/_interval_options.js @@ -1,6 +1,6 @@ +import moment from 'moment'; define(function (require) { return function IntervalOptionsService(Private) { - var moment = require('moment'); require('ui/directives/input_whole_number'); // shorthand diff --git a/src/ui/public/agg_types/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/buckets/create_filter/date_histogram.js index 6040c31ac207b..def48fb3cab57 100644 --- a/src/ui/public/agg_types/buckets/create_filter/date_histogram.js +++ b/src/ui/public/agg_types/buckets/create_filter/date_histogram.js @@ -1,7 +1,7 @@ +import moment from 'moment'; +import buildRangeFilter from 'ui/filter_manager/lib/range'; define(function (require) { return function createDateHistogramFilterProvider(Private) { - var moment = require('moment'); - var buildRangeFilter = require('ui/filter_manager/lib/range'); return function (agg, key) { var start = moment(key); diff --git a/src/ui/public/agg_types/buckets/create_filter/date_range.js b/src/ui/public/agg_types/buckets/create_filter/date_range.js index 9b075ee023f03..c0bb06fa46848 100644 --- a/src/ui/public/agg_types/buckets/create_filter/date_range.js +++ b/src/ui/public/agg_types/buckets/create_filter/date_range.js @@ -1,8 +1,8 @@ +import dateRange from 'ui/utils/date_range'; +import buildRangeFilter from 'ui/filter_manager/lib/range'; define(function (require) { - var dateRange = require('ui/utils/date_range'); return function createDateRangeFilterProvider(config) { - var buildRangeFilter = require('ui/filter_manager/lib/range'); return function (agg, key) { var range = dateRange.parse(key, config.get('dateFormat')); diff --git a/src/ui/public/agg_types/buckets/create_filter/filters.js b/src/ui/public/agg_types/buckets/create_filter/filters.js index 89b22f6adc06c..c4252bb2010ad 100644 --- a/src/ui/public/agg_types/buckets/create_filter/filters.js +++ b/src/ui/public/agg_types/buckets/create_filter/filters.js @@ -1,6 +1,6 @@ +import buildQueryFilter from 'ui/filter_manager/lib/query'; +import _ from 'lodash'; define(function (require) { - var buildQueryFilter = require('ui/filter_manager/lib/query'); - var _ = require('lodash'); return function CreateFilterFiltersProvider(Private) { return function (aggConfig, key) { // have the aggConfig write agg dsl params diff --git a/src/ui/public/agg_types/buckets/create_filter/histogram.js b/src/ui/public/agg_types/buckets/create_filter/histogram.js index c84883a8fd5b4..d491857d5dc2b 100644 --- a/src/ui/public/agg_types/buckets/create_filter/histogram.js +++ b/src/ui/public/agg_types/buckets/create_filter/histogram.js @@ -1,5 +1,5 @@ +import buildRangeFilter from 'ui/filter_manager/lib/range'; define(function (require) { - var buildRangeFilter = require('ui/filter_manager/lib/range'); return function createHistogramFitlerProvider(Private) { return function (aggConfig, key) { diff --git a/src/ui/public/agg_types/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/buckets/create_filter/ip_range.js index ccb21d517f4c9..cbc3e52f12e94 100644 --- a/src/ui/public/agg_types/buckets/create_filter/ip_range.js +++ b/src/ui/public/agg_types/buckets/create_filter/ip_range.js @@ -1,6 +1,6 @@ +import CidrMask from 'ui/utils/CidrMask'; +import buildRangeFilter from 'ui/filter_manager/lib/range'; define(function (require) { - var CidrMask = require('ui/utils/CidrMask'); - var buildRangeFilter = require('ui/filter_manager/lib/range'); return function createIpRangeFilterProvider() { return function (aggConfig, key) { var range; diff --git a/src/ui/public/agg_types/buckets/create_filter/range.js b/src/ui/public/agg_types/buckets/create_filter/range.js index 70af0a2c19097..5bd87ef924bed 100644 --- a/src/ui/public/agg_types/buckets/create_filter/range.js +++ b/src/ui/public/agg_types/buckets/create_filter/range.js @@ -1,5 +1,5 @@ +import buildRangeFilter from 'ui/filter_manager/lib/range'; define(function (require) { - var buildRangeFilter = require('ui/filter_manager/lib/range'); return function createRangeFilterProvider(Private) { return function (aggConfig, key) { return buildRangeFilter( diff --git a/src/ui/public/agg_types/buckets/create_filter/terms.js b/src/ui/public/agg_types/buckets/create_filter/terms.js index db2361bffe2f3..a4f53db533c38 100644 --- a/src/ui/public/agg_types/buckets/create_filter/terms.js +++ b/src/ui/public/agg_types/buckets/create_filter/terms.js @@ -1,5 +1,5 @@ +import buildPhraseFilter from 'ui/filter_manager/lib/phrase'; define(function (require) { - var buildPhraseFilter = require('ui/filter_manager/lib/phrase'); return function createTermsFilterProvider(Private) { return function (aggConfig, key) { return buildPhraseFilter(aggConfig.params.field, key, aggConfig.vis.indexPattern); diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js index a323e304850c5..505bc2c3429e9 100644 --- a/src/ui/public/agg_types/buckets/date_histogram.js +++ b/src/ui/public/agg_types/buckets/date_histogram.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { return function DateHistogramAggType(timefilter, config, Private) { - var _ = require('lodash'); - var moment = require('moment'); var tzDetect = require('jstimezonedetect').jstz; var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type')); var TimeBuckets = Private(require('ui/time_buckets')); diff --git a/src/ui/public/agg_types/buckets/date_range.js b/src/ui/public/agg_types/buckets/date_range.js index 9296485a425b2..1ac67fb5e1a81 100644 --- a/src/ui/public/agg_types/buckets/date_range.js +++ b/src/ui/public/agg_types/buckets/date_range.js @@ -1,6 +1,6 @@ +import moment from 'moment'; +import dateRange from 'ui/utils/date_range'; define(function (require) { - var moment = require('moment'); - var dateRange = require('ui/utils/date_range'); require('ui/directives/validate_date_math'); return function DateRangeAggDefinition(Private, config) { diff --git a/src/ui/public/agg_types/buckets/filters.js b/src/ui/public/agg_types/buckets/filters.js index 4acee45b705f7..5734905461289 100644 --- a/src/ui/public/agg_types/buckets/filters.js +++ b/src/ui/public/agg_types/buckets/filters.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { return function FiltersAggDefinition(Private, Notifier) { - var _ = require('lodash'); - var angular = require('angular'); var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type')); var createFilter = Private(require('ui/agg_types/buckets/create_filter/filters')); var decorateQuery = Private(require('ui/courier/data_source/_decorate_query')); diff --git a/src/ui/public/agg_types/buckets/geo_hash.js b/src/ui/public/agg_types/buckets/geo_hash.js index 471b051fc7df6..89afc27585a8f 100644 --- a/src/ui/public/agg_types/buckets/geo_hash.js +++ b/src/ui/public/agg_types/buckets/geo_hash.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { return function GeoHashAggDefinition(Private, config) { - var _ = require('lodash'); - var moment = require('moment'); var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type')); var defaultPrecision = 2; diff --git a/src/ui/public/agg_types/buckets/histogram.js b/src/ui/public/agg_types/buckets/histogram.js index 416b387d01620..212c49caef95f 100644 --- a/src/ui/public/agg_types/buckets/histogram.js +++ b/src/ui/public/agg_types/buckets/histogram.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { return function HistogramAggDefinition(Private) { - var _ = require('lodash'); - var moment = require('moment'); var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type')); var createFilter = Private(require('ui/agg_types/buckets/create_filter/histogram')); diff --git a/src/ui/public/agg_types/buckets/ip_range.js b/src/ui/public/agg_types/buckets/ip_range.js index 2eeee56bd0261..ca02f78a4739b 100644 --- a/src/ui/public/agg_types/buckets/ip_range.js +++ b/src/ui/public/agg_types/buckets/ip_range.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); require('ui/directives/validate_ip'); require('ui/directives/validate_cidr_mask'); diff --git a/src/ui/public/agg_types/buckets/range.js b/src/ui/public/agg_types/buckets/range.js index 8f5023f111c65..bcc7e1238be9b 100644 --- a/src/ui/public/agg_types/buckets/range.js +++ b/src/ui/public/agg_types/buckets/range.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function RangeAggDefinition(Private) { - var _ = require('lodash'); var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type')); var createFilter = Private(require('ui/agg_types/buckets/create_filter/range')); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); diff --git a/src/ui/public/agg_types/buckets/significant_terms.js b/src/ui/public/agg_types/buckets/significant_terms.js index 65b833ea124c9..be44232d93766 100644 --- a/src/ui/public/agg_types/buckets/significant_terms.js +++ b/src/ui/public/agg_types/buckets/significant_terms.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function SignificantTermsAggDefinition(Private) { - var _ = require('lodash'); var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type')); var createFilter = Private(require('ui/agg_types/buckets/create_filter/terms')); diff --git a/src/ui/public/agg_types/buckets/terms.js b/src/ui/public/agg_types/buckets/terms.js index c9eecec142e1b..e6c0cb62853d0 100644 --- a/src/ui/public/agg_types/buckets/terms.js +++ b/src/ui/public/agg_types/buckets/terms.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function TermsAggDefinition(Private) { - var _ = require('lodash'); var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type')); var bucketCountBetween = Private(require('ui/agg_types/buckets/_bucket_count_between')); var AggConfig = Private(require('ui/Vis/AggConfig')); diff --git a/src/ui/public/agg_types/index.js b/src/ui/public/agg_types/index.js index 16395c10f8aab..ccf46bde24670 100644 --- a/src/ui/public/agg_types/index.js +++ b/src/ui/public/agg_types/index.js @@ -1,6 +1,6 @@ +import IndexedArray from 'ui/IndexedArray'; define(function (require) { return function AggTypeService(Private) { - var IndexedArray = require('ui/IndexedArray'); var aggs = { metrics: [ diff --git a/src/ui/public/agg_types/metrics/MetricAggType.js b/src/ui/public/agg_types/metrics/MetricAggType.js index a33d7a9c16437..f7ab278e660d0 100644 --- a/src/ui/public/agg_types/metrics/MetricAggType.js +++ b/src/ui/public/agg_types/metrics/MetricAggType.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function MetricAggTypeProvider(Private) { - var _ = require('lodash'); var AggType = Private(require('ui/agg_types/AggType')); var fieldFormats = Private(require('ui/registry/field_formats')); diff --git a/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js b/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js index 69314d64a80b8..fd76e7690e660 100644 --- a/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js +++ b/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function ResponseAggConfigProvider() { - var _ = require('lodash'); /** * Get the ResponseAggConfig class for an aggConfig, diff --git a/src/ui/public/agg_types/metrics/median.js b/src/ui/public/agg_types/metrics/median.js index 9b8f982ded545..826fe4588afa4 100644 --- a/src/ui/public/agg_types/metrics/median.js +++ b/src/ui/public/agg_types/metrics/median.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function AggTypeMetricMaxProvider(Private) { - var _ = require('lodash'); var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType')); var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass')); var percentiles = Private(require('ui/agg_types/metrics/percentiles')); diff --git a/src/ui/public/agg_types/metrics/percentile_ranks.js b/src/ui/public/agg_types/metrics/percentile_ranks.js index 15c3a74e98399..c0fcff14509f7 100644 --- a/src/ui/public/agg_types/metrics/percentile_ranks.js +++ b/src/ui/public/agg_types/metrics/percentile_ranks.js @@ -1,12 +1,12 @@ +import _ from 'lodash'; +import valuesEditor from 'ui/agg_types/controls/percentile_ranks.html'; define(function (require) { return function AggTypeMetricPercentileRanksProvider(Private) { - var _ = require('lodash'); var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType')); var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass')); var fieldFormats = Private(require('ui/registry/field_formats')); - var valuesEditor = require('ui/agg_types/controls/percentile_ranks.html'); // required by the values editor require('ui/number_list'); diff --git a/src/ui/public/agg_types/metrics/percentiles.js b/src/ui/public/agg_types/metrics/percentiles.js index 1b859a4293d47..9fe729a6edfb3 100644 --- a/src/ui/public/agg_types/metrics/percentiles.js +++ b/src/ui/public/agg_types/metrics/percentiles.js @@ -1,13 +1,13 @@ +import _ from 'lodash'; +import ordinalSuffix from 'ui/utils/ordinal_suffix'; +import percentsEditor from 'ui/agg_types/controls/percentiles.html'; define(function (require) { return function AggTypeMetricPercentilesProvider(Private) { - var _ = require('lodash'); var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType')); var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass')); - var ordinalSuffix = require('ui/utils/ordinal_suffix'); var fieldFormats = Private(require('ui/registry/field_formats')); - var percentsEditor = require('ui/agg_types/controls/percentiles.html'); // required by the percentiles editor require('ui/number_list'); diff --git a/src/ui/public/agg_types/metrics/stdDeviation.js b/src/ui/public/agg_types/metrics/stdDeviation.js index 9a7a7ad27ddc5..37c4a8a47ab5d 100644 --- a/src/ui/public/agg_types/metrics/stdDeviation.js +++ b/src/ui/public/agg_types/metrics/stdDeviation.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function AggTypeMetricStandardDeviationProvider(Private) { - var _ = require('lodash'); var MetricAggType = Private(require('ui/agg_types/metrics/MetricAggType')); var getResponseAggConfigClass = Private(require('ui/agg_types/metrics/getResponseAggConfigClass')); diff --git a/src/ui/public/agg_types/param_types/base.js b/src/ui/public/agg_types/param_types/base.js index e0be2ae5b13e6..8a621b8e2db64 100644 --- a/src/ui/public/agg_types/param_types/base.js +++ b/src/ui/public/agg_types/param_types/base.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function BaseAggParamFactory() { - var _ = require('lodash'); function BaseAggParam(config) { _.assign(this, config); diff --git a/src/ui/public/agg_types/param_types/field.js b/src/ui/public/agg_types/param_types/field.js index 8a697da80f9a3..0b9b10bef80ec 100644 --- a/src/ui/public/agg_types/param_types/field.js +++ b/src/ui/public/agg_types/param_types/field.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import editorHtml from 'ui/agg_types/controls/field.html'; define(function (require) { return function FieldAggParamFactory(Private) { - var _ = require('lodash'); - var editorHtml = require('ui/agg_types/controls/field.html'); var BaseAggParam = Private(require('ui/agg_types/param_types/base')); var SavedObjectNotFound = require('ui/errors').SavedObjectNotFound; diff --git a/src/ui/public/agg_types/param_types/optioned.js b/src/ui/public/agg_types/param_types/optioned.js index 5d42ddf4e89bd..f72ef4e2fb956 100644 --- a/src/ui/public/agg_types/param_types/optioned.js +++ b/src/ui/public/agg_types/param_types/optioned.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import IndexedArray from 'ui/IndexedArray'; define(function (require) { return function OptionedAggParamFactory(Private) { - var _ = require('lodash'); - var IndexedArray = require('ui/IndexedArray'); var BaseAggParam = Private(require('ui/agg_types/param_types/base')); _.class(OptionedAggParam).inherits(BaseAggParam); diff --git a/src/ui/public/agg_types/param_types/raw_json.js b/src/ui/public/agg_types/param_types/raw_json.js index c338ee8feec34..8e5ce33f3579f 100644 --- a/src/ui/public/agg_types/param_types/raw_json.js +++ b/src/ui/public/agg_types/param_types/raw_json.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import editorHtml from 'ui/agg_types/controls/raw_json.html'; define(function (require) { return function RawJSONAggParamFactory(Private) { - var _ = require('lodash'); var BaseAggParam = Private(require('ui/agg_types/param_types/base')); - var editorHtml = require('ui/agg_types/controls/raw_json.html'); _.class(RawJSONAggParam).inherits(BaseAggParam); function RawJSONAggParam(config) { diff --git a/src/ui/public/agg_types/param_types/regex.js b/src/ui/public/agg_types/param_types/regex.js index ea1a3165b5c40..43cad9a6a04a3 100644 --- a/src/ui/public/agg_types/param_types/regex.js +++ b/src/ui/public/agg_types/param_types/regex.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import editorHtml from 'ui/agg_types/controls/regular_expression.html'; define(function (require) { return function RegexAggParamFactory(Private) { - var _ = require('lodash'); var BaseAggParam = Private(require('ui/agg_types/param_types/base')); - var editorHtml = require('ui/agg_types/controls/regular_expression.html'); _.class(RegexAggParam).inherits(BaseAggParam); function RegexAggParam(config) { diff --git a/src/ui/public/agg_types/param_types/string.js b/src/ui/public/agg_types/param_types/string.js index e6135741e8971..991441ce0635c 100644 --- a/src/ui/public/agg_types/param_types/string.js +++ b/src/ui/public/agg_types/param_types/string.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import editorHtml from 'ui/agg_types/controls/string.html'; define(function (require) { return function FieldAggParamFactory(Private) { - var _ = require('lodash'); - var editorHtml = require('ui/agg_types/controls/string.html'); var BaseAggParam = Private(require('ui/agg_types/param_types/base')); _.class(ScriptAggParam).inherits(BaseAggParam); diff --git a/src/ui/public/bind/__tests__/bind.js b/src/ui/public/bind/__tests__/bind.js index 34fbbbd395f19..76aaa29082f19 100644 --- a/src/ui/public/bind/__tests__/bind.js +++ b/src/ui/public/bind/__tests__/bind.js @@ -1,7 +1,7 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('$scope.$bind', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var $rootScope; var $scope; diff --git a/src/ui/public/bind/bind.js b/src/ui/public/bind/bind.js index fe229ad68adef..4baf74fdc3417 100644 --- a/src/ui/public/bind/bind.js +++ b/src/ui/public/bind/bind.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); require('ui/modules').get('kibana') .config(function ($provide) { diff --git a/src/ui/public/bound_to_config_obj.js b/src/ui/public/bound_to_config_obj.js index a16487835a6c1..088a71ac8330d 100644 --- a/src/ui/public/bound_to_config_obj.js +++ b/src/ui/public/bound_to_config_obj.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function BoundToConfigObjProvider($rootScope, config) { - var _ = require('lodash'); /** * Create an object with properties that may be bound to config values. diff --git a/src/ui/public/chrome/api/angular.js b/src/ui/public/chrome/api/angular.js index f312c7df2af19..77d8ea77ec3fb 100644 --- a/src/ui/public/chrome/api/angular.js +++ b/src/ui/public/chrome/api/angular.js @@ -1,9 +1,9 @@ import _ from 'lodash'; +import modules from 'ui/modules'; module.exports = function (chrome, internals) { chrome.setupAngular = function () { - var modules = require('ui/modules'); var kibana = modules.get('kibana'); _.forOwn(chrome.getInjected(), function (val, name) { diff --git a/src/ui/public/chrome/chrome.js b/src/ui/public/chrome/chrome.js index db05b4905f1ea..70290103a1602 100644 --- a/src/ui/public/chrome/chrome.js +++ b/src/ui/public/chrome/chrome.js @@ -1,7 +1,6 @@ require('babel/polyfill'); import _ from 'lodash'; -var $ = require('jquery'); import angular from 'angular'; require('ui/timefilter'); @@ -9,6 +8,7 @@ require('ui/private'); require('ui/promises'); import metadata from 'ui/metadata'; +import $ from 'jquery'; var chrome = {}; var internals = _.defaults( diff --git a/src/ui/public/chrome/context.js b/src/ui/public/chrome/context.js index 2202f7900311d..1741c87b27ce1 100644 --- a/src/ui/public/chrome/context.js +++ b/src/ui/public/chrome/context.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import ConfigTemplate from 'ui/ConfigTemplate'; define(function (require) { - var _ = require('lodash'); - var ConfigTemplate = require('ui/ConfigTemplate'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js index e76a215d8e010..1c7ec6a286e91 100644 --- a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js @@ -1,6 +1,5 @@ import sinon from 'auto-release-sinon'; import ngMock from 'ngMock'; -var $ = require('jquery'); import expect from 'expect.js'; var constant = require('lodash').constant; var set = require('lodash').set; @@ -10,6 +9,7 @@ var indexBy = require('lodash').indexBy; require('ui/chrome'); require('../app_switcher'); import DomLocationProvider from 'ui/domLocation'; +import $ from 'jquery'; describe('appSwitcher directive', function () { var env; diff --git a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js index b880ebfbf37c6..c2c7d6f413f43 100644 --- a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js +++ b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { require('ui/collapsible_sidebar/collapsible_sidebar.less'); - var _ = require('lodash'); - var $ = require('jquery'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/compile_recursive_directive.js b/src/ui/public/compile_recursive_directive.js index 87220985823e7..6e18242f99b69 100644 --- a/src/ui/public/compile_recursive_directive.js +++ b/src/ui/public/compile_recursive_directive.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); /** * Angular can't render directives that render themselves recursively: diff --git a/src/ui/public/config/__tests__/config.js b/src/ui/public/config/__tests__/config.js index ad0cfc8401b08..63dd3b5dfff0d 100644 --- a/src/ui/public/config/__tests__/config.js +++ b/src/ui/public/config/__tests__/config.js @@ -1,9 +1,9 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('config component', function () { var $scope; var config; var defaults; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector, Private) { diff --git a/src/ui/public/config/_delayed_updater.js b/src/ui/public/config/_delayed_updater.js index ef8ce8798a1a4..0c67ea3a48c4f 100644 --- a/src/ui/public/config/_delayed_updater.js +++ b/src/ui/public/config/_delayed_updater.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { return function DelayedUpdaterFactory(Private, $rootScope, Promise, Notifier) { var notify = new Notifier(); - var _ = require('lodash'); - var angular = require('angular'); var vals = Private(require('ui/config/_vals')); diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js index 7b84b90bf00df..524494873f36d 100644 --- a/src/ui/public/config/config.js +++ b/src/ui/public/config/config.js @@ -1,3 +1,5 @@ +import angular from 'angular'; +import _ from 'lodash'; define(function (require) { var module = require('ui/modules').get('kibana/config', [ 'kibana/notify' @@ -11,8 +13,6 @@ define(function (require) { module.service('config', function (Private, Notifier, kbnVersion, kbnIndex, $rootScope, buildNum) { var config = this; - var angular = require('angular'); - var _ = require('lodash'); var defaults = Private(require('ui/config/defaults')); var DelayedUpdater = Private(require('ui/config/_delayed_updater')); var vals = Private(require('ui/config/_vals')); diff --git a/src/ui/public/config/defaults.js b/src/ui/public/config/defaults.js index 8cf9b5deb723a..5e29f32a29cf0 100644 --- a/src/ui/public/config/defaults.js +++ b/src/ui/public/config/defaults.js @@ -1,6 +1,6 @@ +import moment from 'moment-timezone'; +import _ from 'lodash'; define(function (require) { - var moment = require('moment-timezone'); - var _ = require('lodash'); return function configDefaultsProvider() { // wraped in provider so that a new instance is given to each app/test diff --git a/src/ui/public/courier/_redirect_when_missing.js b/src/ui/public/courier/_redirect_when_missing.js index b7d9d4770d34f..176b6a0331968 100644 --- a/src/ui/public/courier/_redirect_when_missing.js +++ b/src/ui/public/courier/_redirect_when_missing.js @@ -1,5 +1,5 @@ +import errors from 'ui/errors'; define(function (require) { - var errors = require('ui/errors'); return function RedirectWhenMissingFn($location, kbnUrl, Notifier, Promise) { var SavedObjectNotFound = errors.SavedObjectNotFound; diff --git a/src/ui/public/courier/_request_queue.js b/src/ui/public/courier/_request_queue.js index e6dcf78957c66..fbeff5bf96295 100644 --- a/src/ui/public/courier/_request_queue.js +++ b/src/ui/public/courier/_request_queue.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function PendingRequestList() { - var _ = require('lodash'); /** * Queue of pending requests, requests are removed as diff --git a/src/ui/public/courier/courier.js b/src/ui/public/courier/courier.js index a9caf469089d3..dafa739eccd9a 100644 --- a/src/ui/public/courier/courier.js +++ b/src/ui/public/courier/courier.js @@ -1,6 +1,6 @@ +import errors from 'ui/errors'; +import _ from 'lodash'; define(function (require) { - var errors = require('ui/errors'); - var _ = require('lodash'); require('ui/es'); require('ui/promises'); diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js index 022c32d503a0d..fa019daf0dbdf 100644 --- a/src/ui/public/courier/data_source/__tests__/decorate_query.js +++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js @@ -1,10 +1,10 @@ import moment from 'moment'; import expect from 'expect.js'; import ngMock from 'ngMock'; +import _ from 'lodash'; describe('Query decorator', function () { - var _ = require('lodash'); var config; var indexPattern; diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js index a3560f3f91fa9..f824519861d88 100644 --- a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js +++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js @@ -1,9 +1,9 @@ +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('SearchSource#normalizeSortRequest', function () { require('ui/private'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); var normalizeSortRequest; var indexPattern; diff --git a/src/ui/public/courier/data_source/_abstract.js b/src/ui/public/courier/data_source/_abstract.js index f66996048e1c4..d00d03b039fea 100644 --- a/src/ui/public/courier/data_source/_abstract.js +++ b/src/ui/public/courier/data_source/_abstract.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); return function SourceAbstractFactory(Private, Promise, PromiseEmitter) { var requestQueue = Private(require('ui/courier/_request_queue')); diff --git a/src/ui/public/courier/data_source/_decorate_query.js b/src/ui/public/courier/data_source/_decorate_query.js index 45038fe0f4480..0cc7374a5e74f 100644 --- a/src/ui/public/courier/data_source/_decorate_query.js +++ b/src/ui/public/courier/data_source/_decorate_query.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function DecorateQuery(config) { /** * Decorate queries with default parameters diff --git a/src/ui/public/courier/data_source/_doc_send_to_es.js b/src/ui/public/courier/data_source/_doc_send_to_es.js index 57b0dca60ea6c..5c76f69c4fef7 100644 --- a/src/ui/public/courier/data_source/_doc_send_to_es.js +++ b/src/ui/public/courier/data_source/_doc_send_to_es.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import errors from 'ui/errors'; define(function (require) { - var _ = require('lodash'); - var errors = require('ui/errors'); return function (Promise, Private, es) { var requestQueue = Private(require('ui/courier/_request_queue')); diff --git a/src/ui/public/courier/data_source/_normalize_sort_request.js b/src/ui/public/courier/data_source/_normalize_sort_request.js index 31030774fd7dc..a6d7f2066b181 100644 --- a/src/ui/public/courier/data_source/_normalize_sort_request.js +++ b/src/ui/public/courier/data_source/_normalize_sort_request.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function normalizeSortRequest(config) { var defaultSortOptions = config.get('sort:options'); diff --git a/src/ui/public/courier/data_source/doc_source.js b/src/ui/public/courier/data_source/doc_source.js index f6f32eeddf286..e5c793d71dc50 100644 --- a/src/ui/public/courier/data_source/doc_source.js +++ b/src/ui/public/courier/data_source/doc_source.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function DocSourceFactory(Private, Promise, es, sessionStorage) { var sendToEs = Private(require('ui/courier/data_source/_doc_send_to_es')); diff --git a/src/ui/public/courier/data_source/search_source.js b/src/ui/public/courier/data_source/search_source.js index 6deaa47f23952..8059de4368a34 100644 --- a/src/ui/public/courier/data_source/search_source.js +++ b/src/ui/public/courier/data_source/search_source.js @@ -1,12 +1,12 @@ +import _ from 'lodash'; +import rootSearchSource from 'ui/courier/data_source/_root_search_source'; define(function (require) { return function SearchSourceFactory(Promise, Private) { - var _ = require('lodash'); var SourceAbstract = Private(require('ui/courier/data_source/_abstract')); var SearchRequest = Private(require('ui/courier/fetch/request/search')); var SegmentedRequest = Private(require('ui/courier/fetch/request/segmented')); var searchStrategy = Private(require('ui/courier/fetch/strategy/search')); var normalizeSortRequest = Private(require('ui/courier/data_source/_normalize_sort_request')); - var rootSearchSource = require('ui/courier/data_source/_root_search_source'); _.class(SearchSource).inherits(SourceAbstract); function SearchSource(initialState) { diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js index 9f07a05f05994..50c92cf81941e 100644 --- a/src/ui/public/courier/fetch/__tests__/doc.js +++ b/src/ui/public/courier/fetch/__tests__/doc.js @@ -1,8 +1,8 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Courier DocFetchRequest class', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var storage; var source; diff --git a/src/ui/public/courier/fetch/__tests__/fetch_these.js b/src/ui/public/courier/fetch/__tests__/fetch_these.js index 823b2e7b69216..28fd8f32894a0 100644 --- a/src/ui/public/courier/fetch/__tests__/fetch_these.js +++ b/src/ui/public/courier/fetch/__tests__/fetch_these.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('ui/courier/fetch/_fetch_these', () => { - const _ = require('lodash'); - const sinon = require('auto-release-sinon'); - const expect = require('expect.js'); - const ngMock = require('ngMock'); let Promise; let $rootScope; diff --git a/src/ui/public/courier/fetch/_call_client.js b/src/ui/public/courier/fetch/_call_client.js index 1cec794512c33..3c02fc88f29e9 100644 --- a/src/ui/public/courier/fetch/_call_client.js +++ b/src/ui/public/courier/fetch/_call_client.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function CourierFetchCallClient(Private, Promise, es, esShardTimeout, sessionId) { - var _ = require('lodash'); var isRequest = Private(require('ui/courier/fetch/_is_request')); var mergeDuplicateRequests = Private(require('ui/courier/fetch/_merge_duplicate_requests')); diff --git a/src/ui/public/courier/fetch/_for_each_strategy.js b/src/ui/public/courier/fetch/_for_each_strategy.js index cc13fe2381249..6ee755f1c1ae3 100644 --- a/src/ui/public/courier/fetch/_for_each_strategy.js +++ b/src/ui/public/courier/fetch/_for_each_strategy.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function FetchForEachRequestStrategy(Private, Promise) { - var _ = require('lodash'); function forEachStrategy(requests, block) { block = Promise.method(block); diff --git a/src/ui/public/courier/fetch/fetch.js b/src/ui/public/courier/fetch/fetch.js index adf1871bb4253..e40b166f143f7 100644 --- a/src/ui/public/courier/fetch/fetch.js +++ b/src/ui/public/courier/fetch/fetch.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function fetchService(Private, Promise) { - var _ = require('lodash'); var requestQueue = Private(require('ui/courier/_request_queue')); var fetchThese = Private(require('ui/courier/fetch/_fetch_these')); diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js index 7edfdd69190a1..715ec27b3d272 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented.js @@ -1,7 +1,7 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('ui/courier/fetch/request/segmented', () => { - const sinon = require('auto-release-sinon'); - const expect = require('expect.js'); - const ngMock = require('ngMock'); let Promise; let $rootScope; diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js index 65057932a350a..07f9f2d919e59 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js @@ -1,7 +1,8 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; describe('ui/courier/fetch/request/segmented/_createQueue', () => { - const sinon = require('auto-release-sinon'); - const expect = require('expect.js'); - const ngMock = require('ngMock'); let Promise; let $rootScope; @@ -16,7 +17,6 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => { $rootScope = $injector.get('$rootScope'); SegmentedReq = Private(require('ui/courier/fetch/request/segmented')); - const StubbedSearchSourceProvider = require('fixtures/stubbed_search_source'); MockSource = class { constructor() { return $injector.invoke(StubbedSearchSourceProvider); diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js index 1e5131fbe248c..0ef97d933c10b 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js @@ -5,6 +5,7 @@ import sinon from 'auto-release-sinon'; import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn'; import NoDigestPromises from 'testUtils/noDigestPromises'; +import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; describe('Segmented Request Index Selection', function () { let Promise; @@ -22,7 +23,6 @@ describe('Segmented Request Index Selection', function () { $rootScope = $injector.get('$rootScope'); SegmentedReq = Private(require('ui/courier/fetch/request/segmented')); - const StubbedSearchSourceProvider = require('fixtures/stubbed_search_source'); MockSource = class { constructor() { return $injector.invoke(StubbedSearchSourceProvider); diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js index 68a153bde3292..91afdbaeb1907 100644 --- a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js +++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js @@ -5,6 +5,7 @@ import sinon from 'auto-release-sinon'; import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn'; import NoDigestPromises from 'testUtils/noDigestPromises'; +import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source'; describe('Segmented Request Size Picking', function () { let Promise; @@ -22,7 +23,6 @@ describe('Segmented Request Size Picking', function () { $rootScope = $injector.get('$rootScope'); SegmentedReq = Private(require('ui/courier/fetch/request/segmented')); - const StubbedSearchSourceProvider = require('fixtures/stubbed_search_source'); MockSource = class { constructor() { return $injector.invoke(StubbedSearchSourceProvider); diff --git a/src/ui/public/courier/fetch/request/_segmented_handle.js b/src/ui/public/courier/fetch/request/_segmented_handle.js index ad46cd350c4eb..5a7254dc472a1 100644 --- a/src/ui/public/courier/fetch/request/_segmented_handle.js +++ b/src/ui/public/courier/fetch/request/_segmented_handle.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function CourierSegmentedReqHandle(Private) { - var _ = require('lodash'); var Events = Private(require('ui/events')); diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js index b135fc2366ed2..763c4b817f659 100644 --- a/src/ui/public/courier/fetch/request/doc.js +++ b/src/ui/public/courier/fetch/request/doc.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function DocRequestProvider(Private) { - var _ = require('lodash'); var docStrategy = Private(require('ui/courier/fetch/strategy/doc')); var AbstractRequest = Private(require('ui/courier/fetch/request/request')); diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js index 30d72080fea0e..cb04a95930a15 100644 --- a/src/ui/public/courier/fetch/request/request.js +++ b/src/ui/public/courier/fetch/request/request.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import moment from 'moment'; +import errors from 'ui/errors'; define(function (require) { return function AbstractReqProvider(Private, Promise) { - var _ = require('lodash'); - var moment = require('moment'); - var errors = require('ui/errors'); var requestQueue = Private(require('ui/courier/_request_queue')); var requestErrorHandler = Private(require('ui/courier/fetch/request/_error_handler')); diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js index ad2eca53e9af0..58c463ed53d8c 100644 --- a/src/ui/public/courier/fetch/request/search.js +++ b/src/ui/public/courier/fetch/request/search.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function SearchReqProvider(Private) { - var _ = require('lodash'); var searchStrategy = Private(require('ui/courier/fetch/strategy/search')); var AbstractRequest = Private(require('ui/courier/fetch/request/request')); diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js index 13ace5fcc0238..b04caf0261b81 100644 --- a/src/ui/public/courier/fetch/request/segmented.js +++ b/src/ui/public/courier/fetch/request/segmented.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function CourierSegmentedReqProvider(es, Private, Promise, Notifier, timefilter, config) { - var _ = require('lodash'); var isNumber = require('lodash').isNumber; var SearchReq = Private(require('ui/courier/fetch/request/search')); var SegmentedHandle = Private(require('ui/courier/fetch/request/_segmented_handle')); diff --git a/src/ui/public/courier/fetch/strategy/__tests__/search.js b/src/ui/public/courier/fetch/strategy/__tests__/search.js index e3903eb1c4b9e..a27f17c7ddaae 100644 --- a/src/ui/public/courier/fetch/strategy/__tests__/search.js +++ b/src/ui/public/courier/fetch/strategy/__tests__/search.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('ui/courier/fetch/strategy/search', () => { - const _ = require('lodash'); - const sinon = require('auto-release-sinon'); - const expect = require('expect.js'); - const ngMock = require('ngMock'); let Promise; let $rootScope; diff --git a/src/ui/public/courier/fetch/strategy/search.js b/src/ui/public/courier/fetch/strategy/search.js index 6616c2931e4c5..90c01da795273 100644 --- a/src/ui/public/courier/fetch/strategy/search.js +++ b/src/ui/public/courier/fetch/strategy/search.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { return function FetchStrategyForSearch(Private, Promise, timefilter) { - var _ = require('lodash'); - var angular = require('angular'); var toJson = require('ui/utils/aggressive_parse').toJson; return { diff --git a/src/ui/public/courier/looper/_looper.js b/src/ui/public/courier/looper/_looper.js index 8a980ad10ef3d..ae980c7b2e88b 100644 --- a/src/ui/public/courier/looper/_looper.js +++ b/src/ui/public/courier/looper/_looper.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function LooperFactory($timeout, Notifier, Promise) { - var _ = require('lodash'); var notify = new Notifier(); function Looper(ms, fn) { diff --git a/src/ui/public/courier/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js index 439a805fd45f4..afdf534ccaf8d 100644 --- a/src/ui/public/courier/saved_object/saved_object.js +++ b/src/ui/public/courier/saved_object/saved_object.js @@ -1,9 +1,9 @@ +import angular from 'angular'; +import errors from 'ui/errors'; +import _ from 'lodash'; +import slugifyId from 'ui/utils/slugify_id'; define(function (require) { return function SavedObjectFactory(es, kbnIndex, Promise, Private, Notifier, safeConfirm, indexPatterns) { - var angular = require('angular'); - var errors = require('ui/errors'); - var _ = require('lodash'); - var slugifyId = require('ui/utils/slugify_id'); var DocSource = Private(require('ui/courier/data_source/doc_source')); var SearchSource = Private(require('ui/courier/data_source/search_source')); diff --git a/src/ui/public/debounce/debounce.js b/src/ui/public/debounce/debounce.js index 0f1fe8e092f9c..731223ebf05f3 100644 --- a/src/ui/public/debounce/debounce.js +++ b/src/ui/public/debounce/debounce.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; // Debounce service, angularized version of lodash debounce // borrowed heavily from https://github.com/shahata/angular-debounce define(function (require) { - var _ = require('lodash'); var module = require('ui/modules').get('kibana'); module.service('debounce', ['$timeout', function ($timeout) { diff --git a/src/ui/public/directives/__tests__/config.js b/src/ui/public/directives/__tests__/config.js index fe238060eeb35..da9513b97517b 100644 --- a/src/ui/public/directives/__tests__/config.js +++ b/src/ui/public/directives/__tests__/config.js @@ -1,7 +1,7 @@ import ngMock from 'ngMock'; -var $ = require('jquery'); var assign = require('lodash').assign; import expect from 'expect.js'; +import $ from 'jquery'; describe('Config Directive', function () { diff --git a/src/ui/public/directives/__tests__/confirm-click.js b/src/ui/public/directives/__tests__/confirm-click.js index d488909534697..d3d776cf4f85c 100644 --- a/src/ui/public/directives/__tests__/confirm-click.js +++ b/src/ui/public/directives/__tests__/confirm-click.js @@ -1,8 +1,8 @@ import angular from 'angular'; -var $ = require('jquery'); import sinon from 'sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; require('ui/directives/confirm_click'); require('plugins/kibana/discover/index'); diff --git a/src/ui/public/directives/__tests__/css_truncate.js b/src/ui/public/directives/__tests__/css_truncate.js index 94fcb9658bf75..32e52e0cacec5 100644 --- a/src/ui/public/directives/__tests__/css_truncate.js +++ b/src/ui/public/directives/__tests__/css_truncate.js @@ -1,7 +1,7 @@ import angular from 'angular'; -var $ = require('jquery'); import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; require('plugins/kibana/discover/index'); var $parentScope; diff --git a/src/ui/public/directives/__tests__/fixedScroll.js b/src/ui/public/directives/__tests__/fixedScroll.js index e93fd623cab25..3d7d4c9d3ac25 100644 --- a/src/ui/public/directives/__tests__/fixedScroll.js +++ b/src/ui/public/directives/__tests__/fixedScroll.js @@ -2,11 +2,11 @@ require('ui/fixedScroll'); import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; +import sinon from 'auto-release-sinon'; +import Promise from 'bluebird'; describe('FixedScroll directive', function () { - var $ = require('jquery'); - var sinon = require('auto-release-sinon'); - var Promise = require('bluebird'); var compile; var trash = []; diff --git a/src/ui/public/directives/__tests__/input_focus.js b/src/ui/public/directives/__tests__/input_focus.js index 88b8d3308a8bf..38d9719eb6624 100644 --- a/src/ui/public/directives/__tests__/input_focus.js +++ b/src/ui/public/directives/__tests__/input_focus.js @@ -1,7 +1,7 @@ import angular from 'angular'; -var $ = require('jquery'); import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; require('ui/directives/input_focus'); describe('Input focus directive', function () { diff --git a/src/ui/public/directives/__tests__/spinner.js b/src/ui/public/directives/__tests__/spinner.js index ce07c8f86d379..3f59befbda193 100644 --- a/src/ui/public/directives/__tests__/spinner.js +++ b/src/ui/public/directives/__tests__/spinner.js @@ -1,7 +1,7 @@ import angular from 'angular'; -var $ = require('jquery'); import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; require('plugins/kibana/discover/index'); diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js index d95ddb713fd71..27d46735385e9 100644 --- a/src/ui/public/directives/__tests__/timepicker.js +++ b/src/ui/public/directives/__tests__/timepicker.js @@ -2,9 +2,9 @@ import angular from 'angular'; import moment from 'moment'; import expect from 'expect.js'; import _ from 'lodash'; -var $ = require('jquery'); import sinon from 'auto-release-sinon'; import ngMock from 'ngMock'; +import $ from 'jquery'; require('plugins/kibana/visualize/index'); require('plugins/kibana/dashboard/index'); diff --git a/src/ui/public/directives/__tests__/truncate.js b/src/ui/public/directives/__tests__/truncate.js index 4a1764245e711..496b2b1b68c01 100644 --- a/src/ui/public/directives/__tests__/truncate.js +++ b/src/ui/public/directives/__tests__/truncate.js @@ -1,7 +1,7 @@ import angular from 'angular'; -var $ = require('jquery'); import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; require('plugins/kibana/discover/index'); diff --git a/src/ui/public/directives/click_focus.js b/src/ui/public/directives/click_focus.js index d996664e069f4..af29a47e24198 100644 --- a/src/ui/public/directives/click_focus.js +++ b/src/ui/public/directives/click_focus.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { var module = require('ui/modules').get('kibana'); - var _ = require('lodash'); - var $ = require('jquery'); module.directive('clickFocus', function () { return { diff --git a/src/ui/public/directives/config.js b/src/ui/public/directives/config.js index a8f69b28ca5e7..3961465fb777f 100644 --- a/src/ui/public/directives/config.js +++ b/src/ui/public/directives/config.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import ConfigTemplate from 'ui/ConfigTemplate'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); require('ui/watch_multi'); - var ConfigTemplate = require('ui/ConfigTemplate'); - var angular = require('angular'); var module = require('ui/modules').get('kibana'); require('ui/directives/input_focus'); diff --git a/src/ui/public/directives/css_truncate.js b/src/ui/public/directives/css_truncate.js index 1b6afcdd2d07e..4bae7242d42e7 100644 --- a/src/ui/public/directives/css_truncate.js +++ b/src/ui/public/directives/css_truncate.js @@ -1,7 +1,7 @@ +import $ from 'jquery'; +import _ from 'lodash'; define(function (require) { var module = require('ui/modules').get('kibana'); - var $ = require('jquery'); - var _ = require('lodash'); module.directive('cssTruncate', function ($timeout) { return { diff --git a/src/ui/public/directives/file_upload.js b/src/ui/public/directives/file_upload.js index c9cb4a9f669bc..6a76f82d37bfe 100644 --- a/src/ui/public/directives/file_upload.js +++ b/src/ui/public/directives/file_upload.js @@ -1,6 +1,6 @@ +import $ from 'jquery'; define(function (require) { var module = require('ui/modules').get('kibana'); - var $ = require('jquery'); module.directive('fileUpload', function ($parse) { return { diff --git a/src/ui/public/directives/infinite_scroll.js b/src/ui/public/directives/infinite_scroll.js index f079bc09729b2..eac4c9d2541a8 100644 --- a/src/ui/public/directives/infinite_scroll.js +++ b/src/ui/public/directives/infinite_scroll.js @@ -1,6 +1,6 @@ +import $ from 'jquery'; define(function (require) { var module = require('ui/modules').get('kibana'); - var $ = require('jquery'); module.directive('kbnInfiniteScroll', function () { return { diff --git a/src/ui/public/directives/info.js b/src/ui/public/directives/info.js index a9a69f8a1482d..0df7e7dbb9a80 100644 --- a/src/ui/public/directives/info.js +++ b/src/ui/public/directives/info.js @@ -1,5 +1,5 @@ +import html from 'ui/partials/info.html'; define(function (require) { - var html = require('ui/partials/info.html'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/directives/input_datetime.js b/src/ui/public/directives/input_datetime.js index c37aa31318cf9..137da08d9988c 100644 --- a/src/ui/public/directives/input_datetime.js +++ b/src/ui/public/directives/input_datetime.js @@ -1,8 +1,8 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { var module = require('ui/modules').get('kibana'); - var $ = require('jquery'); - var _ = require('lodash'); - var moment = require('moment'); module.directive('inputDatetime', function () { return { diff --git a/src/ui/public/directives/json_input.js b/src/ui/public/directives/json_input.js index a8351ed1c7fa4..7828bd38b1f15 100644 --- a/src/ui/public/directives/json_input.js +++ b/src/ui/public/directives/json_input.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/directives/paginate.js b/src/ui/public/directives/paginate.js index 0430a2ad5e03d..13e16769cb251 100644 --- a/src/ui/public/directives/paginate.js +++ b/src/ui/public/directives/paginate.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); var PER_PAGE_DEFAULT = 10; diff --git a/src/ui/public/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js index ff15fa456ed69..8a1ebf23222d7 100644 --- a/src/ui/public/directives/pretty_duration.js +++ b/src/ui/public/directives/pretty_duration.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import dateMath from 'ui/utils/dateMath'; +import moment from 'moment'; define(function (require) { var module = require('ui/modules').get('kibana'); - var _ = require('lodash'); - var dateMath = require('ui/utils/dateMath'); - var moment = require('moment'); require('ui/timepicker/quick_ranges'); require('ui/timepicker/time_units'); diff --git a/src/ui/public/directives/rows.js b/src/ui/public/directives/rows.js index dc29d33389083..5b1131a546600 100644 --- a/src/ui/public/directives/rows.js +++ b/src/ui/public/directives/rows.js @@ -1,8 +1,8 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import AggConfigResult from 'ui/Vis/AggConfigResult'; define(function (require) { - var $ = require('jquery'); - var _ = require('lodash'); var module = require('ui/modules').get('kibana'); - var AggConfigResult = require('ui/Vis/AggConfigResult'); module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private) { var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler')); diff --git a/src/ui/public/directives/saved_object_finder.js b/src/ui/public/directives/saved_object_finder.js index 9167cfaa38f1a..f9244d8b99ac7 100644 --- a/src/ui/public/directives/saved_object_finder.js +++ b/src/ui/public/directives/saved_object_finder.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import rison from 'ui/utils/rison'; +import keymap from 'ui/utils/key_map'; define(function (require) { var module = require('ui/modules').get('kibana'); - var _ = require('lodash'); - var rison = require('ui/utils/rison'); - var keymap = require('ui/utils/key_map'); module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Private) { diff --git a/src/ui/public/directives/truncated.js b/src/ui/public/directives/truncated.js index 7ae46defff414..16c639bcb16c3 100644 --- a/src/ui/public/directives/truncated.js +++ b/src/ui/public/directives/truncated.js @@ -1,6 +1,6 @@ +import $ from 'jquery'; define(function (require) { var module = require('ui/modules').get('kibana'); - var $ = require('jquery'); module.directive('kbnTruncated', function ($compile) { return { diff --git a/src/ui/public/directives/validate_cidr_mask.js b/src/ui/public/directives/validate_cidr_mask.js index 64295872a6377..79367f809ad5b 100644 --- a/src/ui/public/directives/validate_cidr_mask.js +++ b/src/ui/public/directives/validate_cidr_mask.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import CidrMask from 'ui/utils/CidrMask'; define(function (require) { - var _ = require('lodash'); - var CidrMask = require('ui/utils/CidrMask'); require('ui/modules').get('kibana').directive('validateCidrMask', function () { return { diff --git a/src/ui/public/directives/validate_date_math.js b/src/ui/public/directives/validate_date_math.js index 9ab572b59d60b..03baeaa862057 100644 --- a/src/ui/public/directives/validate_date_math.js +++ b/src/ui/public/directives/validate_date_math.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import dateMath from 'ui/utils/dateMath'; define(function (require) { - var _ = require('lodash'); - var dateMath = require('ui/utils/dateMath'); require('ui/modules').get('kibana').directive('validateDateMath', function () { return { diff --git a/src/ui/public/directives/validate_index_name.js b/src/ui/public/directives/validate_index_name.js index 6f5248a7c4c68..7291bee6846fb 100644 --- a/src/ui/public/directives/validate_index_name.js +++ b/src/ui/public/directives/validate_index_name.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; // See https://github.com/elastic/elasticsearch/issues/6736 define(function (require) { - var _ = require('lodash'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js index 6306adaa54ae7..04c2eaa39eab9 100644 --- a/src/ui/public/directives/validate_ip.js +++ b/src/ui/public/directives/validate_ip.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import Ipv4Address from 'ui/utils/Ipv4Address'; define(function (require) { - var _ = require('lodash'); - var Ipv4Address = require('ui/utils/Ipv4Address'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/directives/validate_json.js b/src/ui/public/directives/validate_json.js index 7c429745e4500..ff9eacd431f28 100644 --- a/src/ui/public/directives/validate_json.js +++ b/src/ui/public/directives/validate_json.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); var module = require('ui/modules').get('kibana'); diff --git a/src/ui/public/doc_table/__tests__/doc_table.js b/src/ui/public/doc_table/__tests__/doc_table.js index 6fd2a9500716f..80555ca2d25f9 100644 --- a/src/ui/public/doc_table/__tests__/doc_table.js +++ b/src/ui/public/doc_table/__tests__/doc_table.js @@ -1,10 +1,10 @@ import angular from 'angular'; import expect from 'expect.js'; -var $ = require('jquery'); import _ from 'lodash'; import sinon from 'auto-release-sinon'; import searchResponse from 'fixtures/search_response'; import ngMock from 'ngMock'; +import $ from 'jquery'; // Load the kibana app dependencies. require('ui/private'); diff --git a/src/ui/public/doc_table/__tests__/lib/rows_headers.js b/src/ui/public/doc_table/__tests__/lib/rows_headers.js index 7ec57cb072778..169ead608ef18 100644 --- a/src/ui/public/doc_table/__tests__/lib/rows_headers.js +++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js @@ -1,10 +1,10 @@ import angular from 'angular'; -var $ = require('jquery'); import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; import getFakeRow from 'fixtures/fake_row'; +import $ from 'jquery'; describe('Doc Table', function () { require('plugins/kibana/discover/index'); diff --git a/src/ui/public/doc_table/components/table_header.js b/src/ui/public/doc_table/components/table_header.js index 9f6de699c32c5..0e29917111783 100644 --- a/src/ui/public/doc_table/components/table_header.js +++ b/src/ui/public/doc_table/components/table_header.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import headerHtml from 'ui/doc_table/components/table_header.html'; define(function (require) { - var _ = require('lodash'); var module = require('ui/modules').get('app/discover'); require('ui/filters/short_dots'); module.directive('kbnTableHeader', function (shortDotsFilter) { - var headerHtml = require('ui/doc_table/components/table_header.html'); return { restrict: 'A', scope: { diff --git a/src/ui/public/doc_table/components/table_row.js b/src/ui/public/doc_table/components/table_row.js index a3acb0f33e922..51bc35dbd255b 100644 --- a/src/ui/public/doc_table/components/table_row.js +++ b/src/ui/public/doc_table/components/table_row.js @@ -1,7 +1,10 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import addWordBreaks from 'ui/utils/add_word_breaks'; +import noWhiteSpace from 'ui/utils/no_white_space'; +import openRowHtml from 'ui/doc_table/components/table_row/open.html'; +import detailsHtml from 'ui/doc_table/components/table_row/details.html'; define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var addWordBreaks = require('ui/utils/add_word_breaks'); var module = require('ui/modules').get('app/discover'); require('ui/highlight'); @@ -23,9 +26,6 @@ define(function (require) { * ``` */ module.directive('kbnTableRow', function ($compile) { - var noWhiteSpace = require('ui/utils/no_white_space'); - var openRowHtml = require('ui/doc_table/components/table_row/open.html'); - var detailsHtml = require('ui/doc_table/components/table_row/details.html'); var cellTemplate = _.template(noWhiteSpace(require('ui/doc_table/components/table_row/cell.html'))); var truncateByHeightTemplate = _.template(noWhiteSpace(require('ui/partials/truncate_by_height.html'))); diff --git a/src/ui/public/doc_table/doc_table.js b/src/ui/public/doc_table/doc_table.js index 4bebced3c9743..6b6c00ed3ace6 100644 --- a/src/ui/public/doc_table/doc_table.js +++ b/src/ui/public/doc_table/doc_table.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import html from 'ui/doc_table/doc_table.html'; +import getSort from 'ui/doc_table/lib/get_sort'; define(function (require) { - var _ = require('lodash'); - var html = require('ui/doc_table/doc_table.html'); - var getSort = require('ui/doc_table/lib/get_sort'); require('ui/doc_table/doc_table.less'); require('ui/directives/truncated'); diff --git a/src/ui/public/doc_table/lib/get_sort.js b/src/ui/public/doc_table/lib/get_sort.js index 14ad92645cd91..9a3c7795dc1aa 100644 --- a/src/ui/public/doc_table/lib/get_sort.js +++ b/src/ui/public/doc_table/lib/get_sort.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); /** * Take a sorting array and make it into an object diff --git a/src/ui/public/doc_title/__tests__/doc_title.js b/src/ui/public/doc_title/__tests__/doc_title.js index e24ae006d7aaa..a41cbace70ffe 100644 --- a/src/ui/public/doc_title/__tests__/doc_title.js +++ b/src/ui/public/doc_title/__tests__/doc_title.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('docTitle Service', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var initialDocTitle; var MAIN_TITLE = 'Kibana 4'; diff --git a/src/ui/public/doc_title/doc_title.js b/src/ui/public/doc_title/doc_title.js index 85e118f90d660..1ac41bedbe08a 100644 --- a/src/ui/public/doc_title/doc_title.js +++ b/src/ui/public/doc_title/doc_title.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import chrome from 'ui/chrome'; define(function (require) { - var _ = require('lodash'); - var chrome = require('ui/chrome'); require('ui/modules').get('kibana') .run(function ($rootScope, docTitle) { diff --git a/src/ui/public/doc_viewer/__tests__/doc_viewer.js b/src/ui/public/doc_viewer/__tests__/doc_viewer.js index 3313ec4d3bb18..cc99fee7fac21 100644 --- a/src/ui/public/doc_viewer/__tests__/doc_viewer.js +++ b/src/ui/public/doc_viewer/__tests__/doc_viewer.js @@ -1,9 +1,9 @@ import angular from 'angular'; -var $ = require('jquery'); import _ from 'lodash'; import sinon from 'auto-release-sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; var hit = { '_index': 'logstash-2014.09.09', '_type': 'apache', diff --git a/src/ui/public/doc_viewer/doc_viewer.js b/src/ui/public/doc_viewer/doc_viewer.js index d1359605c846b..591465b909fb0 100644 --- a/src/ui/public/doc_viewer/doc_viewer.js +++ b/src/ui/public/doc_viewer/doc_viewer.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import angular from 'angular'; +import html from 'ui/doc_viewer/doc_viewer.html'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); require('ace'); - var html = require('ui/doc_viewer/doc_viewer.html'); require('ui/doc_viewer/doc_viewer.less'); require('ui/modules').get('kibana') diff --git a/src/ui/public/elastic_textarea.js b/src/ui/public/elastic_textarea.js index 8ae6372b09c2e..d258023fb5236 100644 --- a/src/ui/public/elastic_textarea.js +++ b/src/ui/public/elastic_textarea.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); var NL_RE = /\n/g; var events = 'keydown keypress keyup change'; diff --git a/src/ui/public/errors.js b/src/ui/public/errors.js index ab7cb6c125552..e102adf0e90c9 100644 --- a/src/ui/public/errors.js +++ b/src/ui/public/errors.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); var canStack = (function () { var err = new Error(); diff --git a/src/ui/public/es.js b/src/ui/public/es.js index a3a44b7796663..e8a20ac31b7a1 100644 --- a/src/ui/public/es.js +++ b/src/ui/public/es.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { require('elasticsearch-browser/elasticsearch.angular.js'); - var _ = require('lodash'); var es; // share the client amoungst all apps require('ui/modules') diff --git a/src/ui/public/events.js b/src/ui/public/events.js index b0c91470d4ce7..3b5daa2ae512d 100644 --- a/src/ui/public/events.js +++ b/src/ui/public/events.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import Notifier from 'ui/notify/notifier'; +import SimpleEmitter from 'ui/utils/SimpleEmitter'; define(function (require) { - var _ = require('lodash'); - var Notifier = require('ui/notify/notifier'); return function EventsProvider(Private, Promise) { - var SimpleEmitter = require('ui/utils/SimpleEmitter'); var notify = new Notifier({ location: 'EventEmitter' }); _.class(Events).inherits(SimpleEmitter); diff --git a/src/ui/public/fancy_forms/KbnFormController.js b/src/ui/public/fancy_forms/KbnFormController.js index fea19be244844..1be26cc3efeb5 100644 --- a/src/ui/public/fancy_forms/KbnFormController.js +++ b/src/ui/public/fancy_forms/KbnFormController.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); /** * Extension of Angular's FormController class diff --git a/src/ui/public/fancy_forms/__tests__/fancy_forms.js b/src/ui/public/fancy_forms/__tests__/fancy_forms.js index bbc51202f8a61..c1dd31b2728c0 100644 --- a/src/ui/public/fancy_forms/__tests__/fancy_forms.js +++ b/src/ui/public/fancy_forms/__tests__/fancy_forms.js @@ -1,6 +1,6 @@ -var $ = require('jquery'); import ngMock from 'ngMock'; import expect from 'expect.js'; +import $ from 'jquery'; describe('fancy forms', function () { var $el; diff --git a/src/ui/public/fancy_forms/fancy_forms.js b/src/ui/public/fancy_forms/fancy_forms.js index 99a700ecd0b52..0ced0b9d41e40 100644 --- a/src/ui/public/fancy_forms/fancy_forms.js +++ b/src/ui/public/fancy_forms/fancy_forms.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import KbnFormController from 'ui/fancy_forms/KbnFormController'; define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var KbnFormController = require('ui/fancy_forms/KbnFormController'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js index 9ff77b928129b..9a4302ba4665e 100644 --- a/src/ui/public/field_editor/__tests__/field_editor.js +++ b/src/ui/public/field_editor/__tests__/field_editor.js @@ -1,7 +1,7 @@ +import $ from 'jquery'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('FieldEditor directive', function () { - var $ = require('jquery'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); var Field; var StringFormat; diff --git a/src/ui/public/field_editor/field_editor.js b/src/ui/public/field_editor/field_editor.js index f62ea74ef1e0a..28db7025a4e5b 100644 --- a/src/ui/public/field_editor/field_editor.js +++ b/src/ui/public/field_editor/field_editor.js @@ -1,3 +1,4 @@ +import _ from 'lodash'; define(function (require) { require('ui/field_format_editor'); @@ -7,7 +8,6 @@ define(function (require) { require('ui/modules') .get('kibana', ['colorpicker.module']) .directive('fieldEditor', function (Private, $sce) { - var _ = require('lodash'); var fieldFormats = Private(require('ui/registry/field_formats')); var Field = Private(require('ui/index_patterns/_field')); var scriptingInfo = $sce.trustAsHtml(require('ui/field_editor/scripting_info.html')); diff --git a/src/ui/public/field_format_editor/field_format_editor.js b/src/ui/public/field_format_editor/field_format_editor.js index 88e7fc4ad65cd..2f8efd0ae5b06 100644 --- a/src/ui/public/field_format_editor/field_format_editor.js +++ b/src/ui/public/field_format_editor/field_format_editor.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); require('ui/modules') .get('app/settings') diff --git a/src/ui/public/field_format_editor/samples/samples.js b/src/ui/public/field_format_editor/samples/samples.js index 08f6293a446e9..1a83be505803b 100644 --- a/src/ui/public/field_format_editor/samples/samples.js +++ b/src/ui/public/field_format_editor/samples/samples.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/filter_bar/__tests__/_addFilters.js b/src/ui/public/filter_bar/__tests__/_addFilters.js index 15b7a9491421b..8ec4096d1fd97 100644 --- a/src/ui/public/filter_bar/__tests__/_addFilters.js +++ b/src/ui/public/filter_bar/__tests__/_addFilters.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import MockState from 'fixtures/mock_state'; describe('add filters', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var MockState = require('fixtures/mock_state'); var storeNames = { app: 'appState', global: 'globalState' diff --git a/src/ui/public/filter_bar/__tests__/_getFilters.js b/src/ui/public/filter_bar/__tests__/_getFilters.js index 6b14c18f298da..0f7d81d703f03 100644 --- a/src/ui/public/filter_bar/__tests__/_getFilters.js +++ b/src/ui/public/filter_bar/__tests__/_getFilters.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; +import MockState from 'fixtures/mock_state'; describe('get filters', function () { - var _ = require('lodash'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); - var MockState = require('fixtures/mock_state'); var storeNames = { app: 'appState', global: 'globalState' diff --git a/src/ui/public/filter_bar/__tests__/_invertFilters.js b/src/ui/public/filter_bar/__tests__/_invertFilters.js index 3f3a5ba52d813..94616b61af548 100644 --- a/src/ui/public/filter_bar/__tests__/_invertFilters.js +++ b/src/ui/public/filter_bar/__tests__/_invertFilters.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import MockState from 'fixtures/mock_state'; describe('invert filters', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var MockState = require('fixtures/mock_state'); var storeNames = { app: 'appState', global: 'globalState' diff --git a/src/ui/public/filter_bar/__tests__/_pinFilters.js b/src/ui/public/filter_bar/__tests__/_pinFilters.js index dd45be09df790..48ff660c6933c 100644 --- a/src/ui/public/filter_bar/__tests__/_pinFilters.js +++ b/src/ui/public/filter_bar/__tests__/_pinFilters.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import MockState from 'fixtures/mock_state'; describe('pin filters', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var MockState = require('fixtures/mock_state'); var storeNames = { app: 'appState', global: 'globalState' diff --git a/src/ui/public/filter_bar/__tests__/_removeFilters.js b/src/ui/public/filter_bar/__tests__/_removeFilters.js index 672e02f702842..f5e035378d2c5 100644 --- a/src/ui/public/filter_bar/__tests__/_removeFilters.js +++ b/src/ui/public/filter_bar/__tests__/_removeFilters.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import MockState from 'fixtures/mock_state'; describe('remove filters', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var MockState = require('fixtures/mock_state'); var storeNames = { app: 'appState', global: 'globalState' diff --git a/src/ui/public/filter_bar/__tests__/_toggleFilters.js b/src/ui/public/filter_bar/__tests__/_toggleFilters.js index 0855ba00e5f39..5f20569869d02 100644 --- a/src/ui/public/filter_bar/__tests__/_toggleFilters.js +++ b/src/ui/public/filter_bar/__tests__/_toggleFilters.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import sinon from 'auto-release-sinon'; +import MockState from 'fixtures/mock_state'; describe('toggle filters', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var sinon = require('auto-release-sinon'); - var MockState = require('fixtures/mock_state'); var storeNames = { app: 'appState', global: 'globalState' diff --git a/src/ui/public/filter_bar/__tests__/_updateFilters.js b/src/ui/public/filter_bar/__tests__/_updateFilters.js index d7bec65389633..16d0d0acb9a96 100644 --- a/src/ui/public/filter_bar/__tests__/_updateFilters.js +++ b/src/ui/public/filter_bar/__tests__/_updateFilters.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import MockState from 'fixtures/mock_state'; describe('update filters', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var MockState = require('fixtures/mock_state'); var storeNames = { app: 'appState', global: 'globalState' diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js index a9707a0376503..edd951ae34df9 100644 --- a/src/ui/public/filter_bar/__tests__/filter_bar.js +++ b/src/ui/public/filter_bar/__tests__/filter_bar.js @@ -1,12 +1,12 @@ import angular from 'angular'; import _ from 'lodash'; -var $ = require('jquery'); import ngMock from 'ngMock'; import expect from 'expect.js'; import sinon from 'sinon'; require('ui/filter_bar'); import MockState from 'fixtures/mock_state'; +import $ from 'jquery'; describe('Filter Bar Directive', function () { var $rootScope; diff --git a/src/ui/public/filter_bar/__tests__/push_filter.js b/src/ui/public/filter_bar/__tests__/push_filter.js index 1bd2c689d217b..78abf3c62da6b 100644 --- a/src/ui/public/filter_bar/__tests__/push_filter.js +++ b/src/ui/public/filter_bar/__tests__/push_filter.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar pushFilter()', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var pushFilterFn; diff --git a/src/ui/public/filter_bar/filter_bar.js b/src/ui/public/filter_bar/filter_bar.js index 9d6fd4be6ddfa..674a17c92f56c 100644 --- a/src/ui/public/filter_bar/filter_bar.js +++ b/src/ui/public/filter_bar/filter_bar.js @@ -1,9 +1,10 @@ +import _ from 'lodash'; +import template from 'ui/filter_bar/filter_bar.html'; +import moment from 'moment'; +import angular from 'angular'; +import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filterAppliedAndUnwrap'; define(function (require) { - var _ = require('lodash'); var module = require('ui/modules').get('kibana'); - var template = require('ui/filter_bar/filter_bar.html'); - var moment = require('moment'); - var angular = require('angular'); require('ui/directives/json_input'); @@ -12,7 +13,6 @@ define(function (require) { var mapFlattenAndWrapFilters = Private(require('ui/filter_bar/lib/mapFlattenAndWrapFilters')); var extractTimeFilter = Private(require('ui/filter_bar/lib/extractTimeFilter')); var filterOutTimeBasedFilter = Private(require('ui/filter_bar/lib/filterOutTimeBasedFilter')); - var filterAppliedAndUnwrap = require('ui/filter_bar/lib/filterAppliedAndUnwrap'); var changeTimeFilter = Private(require('ui/filter_bar/lib/changeTimeFilter')); var queryFilter = Private(require('ui/filter_bar/query_filter')); var privateFilterFieldRegex = /(^\$|meta)/; diff --git a/src/ui/public/filter_bar/filter_bar_click_handler.js b/src/ui/public/filter_bar/filter_bar_click_handler.js index 59844f9207bf7..a45d04b3f38b8 100644 --- a/src/ui/public/filter_bar/filter_bar_click_handler.js +++ b/src/ui/public/filter_bar/filter_bar_click_handler.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import dedupFilters from './lib/dedupFilters'; +import uniqFilters from './lib/uniqFilters'; +import findByParam from 'ui/utils/find_by_param'; define(function (require) { - var _ = require('lodash'); - var dedupFilters = require('./lib/dedupFilters'); - var uniqFilters = require('./lib/uniqFilters'); - var findByParam = require('ui/utils/find_by_param'); return function (Notifier) { return function ($state) { diff --git a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js index 8f7245fd3790c..322cf163cb9d6 100644 --- a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js @@ -1,9 +1,9 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('extractTimeFilter()', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var extractTimeFilter; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js index 3b12ef06d9d44..c199777aa1e03 100644 --- a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js @@ -1,10 +1,10 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import sinon from 'auto-release-sinon'; describe('Filter Bar Directive', function () { describe('filterOutTimeBasedFilter()', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var sinon = require('auto-release-sinon'); var filterOutTimeBasedFilter; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js index db93d8d124872..17a51e432d7c3 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js @@ -1,9 +1,9 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import sinon from 'auto-release-sinon'; describe('Filter Bar Directive', function () { describe('mapAndFlattenFilters()', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var sinon = require('auto-release-sinon'); var mapAndFlattenFilters; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js b/src/ui/public/filter_bar/lib/__tests__/mapDefault.js index 83f603e83d5ed..6c50280ad17d4 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapDefault.js @@ -1,8 +1,8 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('mapDefault()', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapDefault; var $rootScope; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/filter_bar/lib/__tests__/mapExists.js b/src/ui/public/filter_bar/lib/__tests__/mapExists.js index f77774d7b154d..4363ec533ebc7 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapExists.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapExists.js @@ -1,8 +1,8 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('mapExists()', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapExists; var $rootScope; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js b/src/ui/public/filter_bar/lib/__tests__/mapFilter.js index 3bf771a8d0247..3d255b6a981be 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapFilter.js @@ -1,8 +1,8 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapFilter; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js index bfbb61c00a2a9..2d4d24f864e73 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js @@ -1,10 +1,10 @@ import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('mapFlattenAndWrapFilters()', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapFlattenAndWrapFilters; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js index 931ee06c09d87..1d4ac2920d4aa 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js @@ -1,9 +1,9 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('mapGeoBoundingBox()', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapGeoBoundingBox; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js b/src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js index d274a7bd95dac..0ff30bfa1f2e2 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js @@ -1,8 +1,8 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('ui/filter_bar/lib', function () { describe('mapMatchAll()', function () { - const expect = require('expect.js'); - const ngMock = require('ngMock'); let $rootScope; let mapMatchAll; let filter; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js b/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js index 57683d3c1276b..4747f8e2231c7 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('mapQueryString()', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapQueryString; var $rootScope; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/filter_bar/lib/__tests__/mapRange.js b/src/ui/public/filter_bar/lib/__tests__/mapRange.js index dba4b114cad03..02d794b35ee51 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapRange.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapRange.js @@ -1,9 +1,9 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('mapRange()', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapRange; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapScript.js b/src/ui/public/filter_bar/lib/__tests__/mapScript.js index 2c2876aa03883..c75ffef0c27ad 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapScript.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapScript.js @@ -1,9 +1,9 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('mapScript()', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapScript; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js b/src/ui/public/filter_bar/lib/__tests__/mapTerms.js index d3f2634c6bbd6..fa08092ccf8e9 100644 --- a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js +++ b/src/ui/public/filter_bar/lib/__tests__/mapTerms.js @@ -1,9 +1,9 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Filter Bar Directive', function () { describe('mapTerms()', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var mapTerms; var $rootScope; diff --git a/src/ui/public/filter_bar/lib/changeTimeFilter.js b/src/ui/public/filter_bar/lib/changeTimeFilter.js index d59f878a18063..b13d2062188a2 100644 --- a/src/ui/public/filter_bar/lib/changeTimeFilter.js +++ b/src/ui/public/filter_bar/lib/changeTimeFilter.js @@ -1,6 +1,6 @@ +import moment from 'moment'; +import _ from 'lodash'; define(function (require) { - var moment = require('moment'); - var _ = require('lodash'); return function changeTimeFilterProvider(timefilter) { return function (filter) { var key = _.keys(filter.range)[0]; diff --git a/src/ui/public/filter_bar/lib/compareFilters.js b/src/ui/public/filter_bar/lib/compareFilters.js index 8e29a236ae977..56f5c5c79b7d4 100644 --- a/src/ui/public/filter_bar/lib/compareFilters.js +++ b/src/ui/public/filter_bar/lib/compareFilters.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); var excludedAttributes; var comparators; diff --git a/src/ui/public/filter_bar/lib/dedupFilters.js b/src/ui/public/filter_bar/lib/dedupFilters.js index 35de867a9f3b6..b52869637b38a 100644 --- a/src/ui/public/filter_bar/lib/dedupFilters.js +++ b/src/ui/public/filter_bar/lib/dedupFilters.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import angular from 'angular'; +import compareFilters from 'ui/filter_bar/lib/compareFilters'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); - var compareFilters = require('ui/filter_bar/lib/compareFilters'); /** * Combine 2 filter collections, removing duplicates diff --git a/src/ui/public/filter_bar/lib/extractTimeFilter.js b/src/ui/public/filter_bar/lib/extractTimeFilter.js index 485df1ab61bbe..78716b28f3472 100644 --- a/src/ui/public/filter_bar/lib/extractTimeFilter.js +++ b/src/ui/public/filter_bar/lib/extractTimeFilter.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function extractTimeFilterProvider(courier, Promise) { return Promise.method(function (filters) { // Assume all the index patterns are the same since they will be added diff --git a/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js index 51c877d2181ba..d7249c96198a0 100644 --- a/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js +++ b/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function (filters) { return _.filter(filters, 'meta.apply'); }; diff --git a/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js index 998e17988fac0..71f1c51d26d6a 100644 --- a/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js +++ b/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function filterOutTimeBaseFilter(courier, Promise) { return Promise.method(function (filters) { var id = _.get(filters, '[0].meta.index'); diff --git a/src/ui/public/filter_bar/lib/generateMappingChain.js b/src/ui/public/filter_bar/lib/generateMappingChain.js index 092a14e21f4fc..1de99e39c6caf 100644 --- a/src/ui/public/filter_bar/lib/generateMappingChain.js +++ b/src/ui/public/filter_bar/lib/generateMappingChain.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function generateMappingChainProvider(Promise) { var noop = function () { diff --git a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js index 1214e204c648d..fafa72bb9c7c0 100644 --- a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js +++ b/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function mapAndFlattenFiltersProvider(Private, Promise) { var mapFilter = Private(require('ui/filter_bar/lib/mapFilter')); return function (filters) { diff --git a/src/ui/public/filter_bar/lib/mapDefault.js b/src/ui/public/filter_bar/lib/mapDefault.js index 2b93eb54c770c..921490d93d0f1 100644 --- a/src/ui/public/filter_bar/lib/mapDefault.js +++ b/src/ui/public/filter_bar/lib/mapDefault.js @@ -1,7 +1,7 @@ +import angular from 'angular'; +import _ from 'lodash'; define(function (require) { return function mapDefaultProvider(Promise) { - var angular = require('angular'); - var _ = require('lodash'); var metaProperty = /(^\$|meta)/; diff --git a/src/ui/public/filter_bar/lib/mapFilter.js b/src/ui/public/filter_bar/lib/mapFilter.js index 8261909ed67a7..4e75d85dc422e 100644 --- a/src/ui/public/filter_bar/lib/mapFilter.js +++ b/src/ui/public/filter_bar/lib/mapFilter.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function mapFilterProvider(Promise, Private) { var generateMappingChain = Private(require('./generateMappingChain')); diff --git a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js index 4eeec597d2806..4cb5d619251c8 100644 --- a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js +++ b/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function mapFlattenAndWrapFilters(Private) { var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters')); return function (filters) { diff --git a/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js index 9687c928c93c8..0accb8bbafba6 100644 --- a/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js +++ b/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function mapGeoBoundBoxProvider(Promise, courier) { return function (filter) { var key; diff --git a/src/ui/public/filter_bar/lib/mapTerms.js b/src/ui/public/filter_bar/lib/mapTerms.js index 313dda7ac3c99..39d49b2ea3f45 100644 --- a/src/ui/public/filter_bar/lib/mapTerms.js +++ b/src/ui/public/filter_bar/lib/mapTerms.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function mapTermsProvider(Promise, courier) { return function (filter) { var key; diff --git a/src/ui/public/filter_bar/lib/onlyDisabled.js b/src/ui/public/filter_bar/lib/onlyDisabled.js index 76078741bd556..6809851aae2cb 100644 --- a/src/ui/public/filter_bar/lib/onlyDisabled.js +++ b/src/ui/public/filter_bar/lib/onlyDisabled.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); var pluckDisabled = function (filter) { return _.get(filter, 'meta.disabled'); diff --git a/src/ui/public/filter_bar/lib/onlyStateChanged.js b/src/ui/public/filter_bar/lib/onlyStateChanged.js index 777a4327eae68..6ad0e5a2995bb 100644 --- a/src/ui/public/filter_bar/lib/onlyStateChanged.js +++ b/src/ui/public/filter_bar/lib/onlyStateChanged.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import compareFilters from 'ui/filter_bar/lib/compareFilters'; define(function (require) { - var _ = require('lodash'); - var compareFilters = require('ui/filter_bar/lib/compareFilters'); var compareOptions = { disabled: true, negate: true }; /** diff --git a/src/ui/public/filter_bar/lib/uniqFilters.js b/src/ui/public/filter_bar/lib/uniqFilters.js index 66023b9ecd203..d38bca1b236e2 100644 --- a/src/ui/public/filter_bar/lib/uniqFilters.js +++ b/src/ui/public/filter_bar/lib/uniqFilters.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import dedupFilters from 'ui/filter_bar/lib/dedupFilters'; define(function (require) { - var _ = require('lodash'); - var dedupFilters = require('ui/filter_bar/lib/dedupFilters'); /** * Remove duplicate filters from an array of filters diff --git a/src/ui/public/filter_bar/push_filter.js b/src/ui/public/filter_bar/push_filter.js index 9e664b910a001..eb9f82d944688 100644 --- a/src/ui/public/filter_bar/push_filter.js +++ b/src/ui/public/filter_bar/push_filter.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function () { return function ($state) { diff --git a/src/ui/public/filter_bar/query_filter.js b/src/ui/public/filter_bar/query_filter.js index 488591eb23773..e7de171600670 100644 --- a/src/ui/public/filter_bar/query_filter.js +++ b/src/ui/public/filter_bar/query_filter.js @@ -1,14 +1,14 @@ +import _ from 'lodash'; +import onlyDisabled from 'ui/filter_bar/lib/onlyDisabled'; +import onlyStateChanged from 'ui/filter_bar/lib/onlyStateChanged'; +import uniqFilters from 'ui/filter_bar/lib/uniqFilters'; +import compareFilters from 'ui/filter_bar/lib/compareFilters'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); return function (Private, $rootScope, getAppState, globalState, config) { var EventEmitter = Private(require('ui/events')); - var onlyDisabled = require('ui/filter_bar/lib/onlyDisabled'); - var onlyStateChanged = require('ui/filter_bar/lib/onlyStateChanged'); - var uniqFilters = require('ui/filter_bar/lib/uniqFilters'); - var compareFilters = require('ui/filter_bar/lib/compareFilters'); var mapAndFlattenFilters = Private(require('ui/filter_bar/lib/mapAndFlattenFilters')); - var angular = require('angular'); var queryFilter = new EventEmitter(); diff --git a/src/ui/public/filter_manager/filter_manager.js b/src/ui/public/filter_manager/filter_manager.js index 497fc49983ac3..d6c3fc5097318 100644 --- a/src/ui/public/filter_manager/filter_manager.js +++ b/src/ui/public/filter_manager/filter_manager.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; // Adds a filter to a passed state define(function (require) { return function (Private) { - var _ = require('lodash'); var queryFilter = Private(require('ui/filter_bar/query_filter')); var filterManager = {}; diff --git a/src/ui/public/filter_manager/lib/phrase.js b/src/ui/public/filter_manager/lib/phrase.js index 98fcabca07bcb..8a5699ebaad9d 100644 --- a/src/ui/public/filter_manager/lib/phrase.js +++ b/src/ui/public/filter_manager/lib/phrase.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function buildPhraseFilter(field, value, indexPattern) { var filter = { meta: { index: indexPattern.id} }; diff --git a/src/ui/public/filter_manager/lib/query.js b/src/ui/public/filter_manager/lib/query.js index c32cb8c117975..ed2e1711a33af 100644 --- a/src/ui/public/filter_manager/lib/query.js +++ b/src/ui/public/filter_manager/lib/query.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function buildQueryFilter(query, index) { return { query: query, diff --git a/src/ui/public/filter_manager/lib/range.js b/src/ui/public/filter_manager/lib/range.js index 4d374a51d3208..033bd4dad9ed7 100644 --- a/src/ui/public/filter_manager/lib/range.js +++ b/src/ui/public/filter_manager/lib/range.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - const _ = require('lodash'); const OPERANDS_IN_RANGE = 2; return function buildRangeFilter(field, params, indexPattern, formattedValue) { diff --git a/src/ui/public/filters/_prop_filter.js b/src/ui/public/filters/_prop_filter.js index 6423c55f025de..bcba1a2078526 100644 --- a/src/ui/public/filters/_prop_filter.js +++ b/src/ui/public/filters/_prop_filter.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); /** * Filters out a list by a given filter. This is currently used to impelment: diff --git a/src/ui/public/filters/commaList.js b/src/ui/public/filters/commaList.js index 7967ce1eb3668..ec2759d54b8a3 100644 --- a/src/ui/public/filters/commaList.js +++ b/src/ui/public/filters/commaList.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/filters/field_type.js b/src/ui/public/filters/field_type.js index c1a9cda407992..cc748f615dac3 100644 --- a/src/ui/public/filters/field_type.js +++ b/src/ui/public/filters/field_type.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import propFilter from 'ui/filters/_prop_filter'; // Gets all fields of a given type. // You may also pass "*" to get all types // Or an array of types to get all fields of that type define(function (require) { - var _ = require('lodash'); - var propFilter = require('ui/filters/_prop_filter'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/filters/match_any.js b/src/ui/public/filters/match_any.js index 2bc196543c0ad..e3ce87bf84ed7 100644 --- a/src/ui/public/filters/match_any.js +++ b/src/ui/public/filters/match_any.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; // Gets all fields of a given type. // You may also pass "*" to get all types // Or an array of types to get all fields of that type define(function (require) { - var _ = require('lodash'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/filters/moment.js b/src/ui/public/filters/moment.js index 4dc1afa2cc722..8d35df103d164 100644 --- a/src/ui/public/filters/moment.js +++ b/src/ui/public/filters/moment.js @@ -1,6 +1,6 @@ +import moment from 'moment'; +import _ from 'lodash'; define(function (require) { - var moment = require('moment'); - var _ = require('lodash'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/filters/rison.js b/src/ui/public/filters/rison.js index 764382ea879c2..20b459fe5d4b5 100644 --- a/src/ui/public/filters/rison.js +++ b/src/ui/public/filters/rison.js @@ -1,5 +1,5 @@ +import rison from 'ui/utils/rison'; define(function (require) { - var rison = require('ui/utils/rison'); var module = require('ui/modules').get('kibana'); module.filter('rison', function () { diff --git a/src/ui/public/filters/short_dots.js b/src/ui/public/filters/short_dots.js index 0496dd64c33e7..837bcd5583ac6 100644 --- a/src/ui/public/filters/short_dots.js +++ b/src/ui/public/filters/short_dots.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; // Shorts dot notated strings // eg: foo.bar.baz becomes f.b.baz // 'foo.bar.baz'.replace(/(.+?\.)/g,function(v) {return v[0]+'.';}); define(function (require) { - var _ = require('lodash'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/filters/trust_as_html.js b/src/ui/public/filters/trust_as_html.js index 2b2700e2301f3..24161dfc4f9ff 100644 --- a/src/ui/public/filters/trust_as_html.js +++ b/src/ui/public/filters/trust_as_html.js @@ -1,5 +1,5 @@ +import angular from 'angular'; define(function (require) { - var angular = require('angular'); var module = require('ui/modules').get('kibana'); // Simple filter to allow using ng-bind-html without explicitly calling $sce.trustAsHtml in a controller diff --git a/src/ui/public/filters/unique.js b/src/ui/public/filters/unique.js index ec3a4d171f448..1ef9d0f437aa1 100644 --- a/src/ui/public/filters/unique.js +++ b/src/ui/public/filters/unique.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; // Filters out all duplicate items in an array define(function (require) { - var _ = require('lodash'); require('ui/modules') .get('kibana') diff --git a/src/ui/public/fixedScroll.js b/src/ui/public/fixedScroll.js index ad2a7f85e15d8..c4ce542778a76 100644 --- a/src/ui/public/fixedScroll.js +++ b/src/ui/public/fixedScroll.js @@ -1,6 +1,6 @@ +import $ from 'jquery'; +import _ from 'lodash'; define(function (require) { - var $ = require('jquery'); - var _ = require('lodash'); var SCROLLER_HEIGHT = 20; diff --git a/src/ui/public/highlight/__tests__/highlight.js b/src/ui/public/highlight/__tests__/highlight.js index fff63f1e33325..90bb5547ff3a1 100644 --- a/src/ui/public/highlight/__tests__/highlight.js +++ b/src/ui/public/highlight/__tests__/highlight.js @@ -1,8 +1,8 @@ +import angular from 'angular'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Highlight', function () { - var angular = require('angular'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); require('ui/highlight'); var filter; diff --git a/src/ui/public/highlight/highlight.js b/src/ui/public/highlight/highlight.js index 6953f2e9a460c..6d6de00eefc21 100644 --- a/src/ui/public/highlight/highlight.js +++ b/src/ui/public/highlight/highlight.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { require('ui/highlight/highlight_tags'); - var _ = require('lodash'); - var angular = require('angular'); var module = require('ui/modules').get('kibana'); module.filter('highlight', function (highlightTags) { diff --git a/src/ui/public/index_patterns/__tests__/_FieldFormat.js b/src/ui/public/index_patterns/__tests__/_FieldFormat.js index 6863573b8ec1a..cbad45f52fe14 100644 --- a/src/ui/public/index_patterns/__tests__/_FieldFormat.js +++ b/src/ui/public/index_patterns/__tests__/_FieldFormat.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('FieldFormat class', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var FieldFormat; var TestFormat; diff --git a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js index 1c18a8f7f942f..20fbc597b5a8f 100644 --- a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js +++ b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; describe('type normalizer (castMappingType)', function () { - var _ = require('lodash'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); var fn; var fields; diff --git a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js index 96f814df4312d..26aa91a74c9a0 100644 --- a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js +++ b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('get computed fields', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var indexPattern; diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js index 4e79a5902167f..ee8b961932676 100644 --- a/src/ui/public/index_patterns/__tests__/_index_pattern.js +++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; +import Promise from 'bluebird'; +import errors from 'ui/errors'; +import IndexedArray from 'ui/IndexedArray'; describe('index pattern', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); - var Promise = require('bluebird'); - var errors = require('ui/errors'); - var IndexedArray = require('ui/IndexedArray'); var IndexPattern; var mapper; var mappingSetup; diff --git a/src/ui/public/index_patterns/__tests__/_map_field.js b/src/ui/public/index_patterns/__tests__/_map_field.js index 190fdcca49dc6..82dc2317eaaf8 100644 --- a/src/ui/public/index_patterns/__tests__/_map_field.js +++ b/src/ui/public/index_patterns/__tests__/_map_field.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('field mapping normalizer (mapField)', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var fn; var fields; diff --git a/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js b/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js index 7450de671725d..b65ce865f12bf 100644 --- a/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js +++ b/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; describe('Index pattern to wildcard', function () { var fn = require('ui/index_patterns/_pattern_to_wildcard')(); - var expect = require('expect.js'); it('should be a function', function () { diff --git a/src/ui/public/index_patterns/__tests__/calculate_indices.js b/src/ui/public/index_patterns/__tests__/calculate_indices.js index 286e5fc022618..f2aef026a28fb 100644 --- a/src/ui/public/index_patterns/__tests__/calculate_indices.js +++ b/src/ui/public/index_patterns/__tests__/calculate_indices.js @@ -1,10 +1,10 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import moment from 'moment'; describe('ui/index_patterns/_calculate_indices', () => { - const _ = require('lodash'); const pluck = require('lodash').pluck; - const sinon = require('auto-release-sinon'); - const expect = require('expect.js'); - const ngMock = require('ngMock'); - const moment = require('moment'); let Promise; let $rootScope; diff --git a/src/ui/public/index_patterns/__tests__/flatten_hit.js b/src/ui/public/index_patterns/__tests__/flatten_hit.js index d6ff0d80eba1c..1aae31d49b158 100644 --- a/src/ui/public/index_patterns/__tests__/flatten_hit.js +++ b/src/ui/public/index_patterns/__tests__/flatten_hit.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('IndexPattern#flattenHit()', function () { - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var flattenHit; var config; diff --git a/src/ui/public/index_patterns/__tests__/intervals.js b/src/ui/public/index_patterns/__tests__/intervals.js index e938785249fe7..1e0f6da2e31cc 100644 --- a/src/ui/public/index_patterns/__tests__/intervals.js +++ b/src/ui/public/index_patterns/__tests__/intervals.js @@ -1,10 +1,10 @@ var pluck = require('lodash').pluck; import moment from 'moment'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Index Patterns', function () { describe('interval.toIndexList()', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); var intervals; beforeEach(ngMock.module('kibana')); diff --git a/src/ui/public/index_patterns/_calculate_indices.js b/src/ui/public/index_patterns/_calculate_indices.js index 07643a81b9201..07b8ddfaddcd4 100644 --- a/src/ui/public/index_patterns/_calculate_indices.js +++ b/src/ui/public/index_patterns/_calculate_indices.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { - const _ = require('lodash'); - const moment = require('moment'); // gets parsed value if given arg is a moment object function timeValue(val) { diff --git a/src/ui/public/index_patterns/_cast_mapping_type.js b/src/ui/public/index_patterns/_cast_mapping_type.js index 5a4e8c0020dc6..7cb5b51d8d466 100644 --- a/src/ui/public/index_patterns/_cast_mapping_type.js +++ b/src/ui/public/index_patterns/_cast_mapping_type.js @@ -1,6 +1,6 @@ +import IndexedArray from 'ui/IndexedArray'; define(function (require) { return function CastMappingTypeFn() { - var IndexedArray = require('ui/IndexedArray'); castMappingType.types = new IndexedArray({ index: ['name'], diff --git a/src/ui/public/index_patterns/_ensure_some.js b/src/ui/public/index_patterns/_ensure_some.js index 0dd55d21bbe67..44a8c085308ad 100644 --- a/src/ui/public/index_patterns/_ensure_some.js +++ b/src/ui/public/index_patterns/_ensure_some.js @@ -1,6 +1,6 @@ +import errors from 'ui/errors'; define(function (require) { return function EnsureSomeIndexPatternsFn(Private, Notifier, $location, kbnUrl) { - var errors = require('ui/errors'); var notify = new Notifier(); return function ensureSomeIndexPatterns() { diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js index caabb8a1d08ca..6e89a0a41e821 100644 --- a/src/ui/public/index_patterns/_field.js +++ b/src/ui/public/index_patterns/_field.js @@ -1,10 +1,10 @@ +import ObjDefine from 'ui/utils/ObjDefine'; define(function (require) { return function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) { var notify = new Notifier({ location: 'IndexPattern Field' }); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); var fieldTypes = Private(require('ui/index_patterns/_field_types')); var fieldFormats = Private(require('ui/registry/field_formats')); - var ObjDefine = require('ui/utils/ObjDefine'); function Field(indexPattern, spec) { // unwrap old instances of Field diff --git a/src/ui/public/index_patterns/_field_format/FieldFormat.js b/src/ui/public/index_patterns/_field_format/FieldFormat.js index c107e763b197c..9ff4946f32803 100644 --- a/src/ui/public/index_patterns/_field_format/FieldFormat.js +++ b/src/ui/public/index_patterns/_field_format/FieldFormat.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function FieldFormatClassProvider(config, $rootScope, Private) { - var _ = require('lodash'); var contentTypes = Private(require('ui/index_patterns/_field_format/contentTypes')); function FieldFormat(params) { diff --git a/src/ui/public/index_patterns/_field_format/contentTypes.js b/src/ui/public/index_patterns/_field_format/contentTypes.js index 510f70f96ccfc..daf5d9a23368d 100644 --- a/src/ui/public/index_patterns/_field_format/contentTypes.js +++ b/src/ui/public/index_patterns/_field_format/contentTypes.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { return function contentTypesProvider(highlightFilter) { - var _ = require('lodash'); - var angular = require('angular'); require('ui/highlight'); var types = { diff --git a/src/ui/public/index_patterns/_field_list.js b/src/ui/public/index_patterns/_field_list.js index b4fe34e0568b4..beb8b02e83cc5 100644 --- a/src/ui/public/index_patterns/_field_list.js +++ b/src/ui/public/index_patterns/_field_list.js @@ -1,8 +1,8 @@ +import IndexedArray from 'ui/IndexedArray'; +import _ from 'lodash'; define(function (require) { return function FieldListProvider(Private) { var Field = Private(require('ui/index_patterns/_field')); - var IndexedArray = require('ui/IndexedArray'); - var _ = require('lodash'); _.class(FieldList).inherits(IndexedArray); function FieldList(indexPattern, specs) { diff --git a/src/ui/public/index_patterns/_field_types.js b/src/ui/public/index_patterns/_field_types.js index 8d8b927a5be08..4acd08dd1c021 100644 --- a/src/ui/public/index_patterns/_field_types.js +++ b/src/ui/public/index_patterns/_field_types.js @@ -1,6 +1,6 @@ +import IndexedArray from 'ui/IndexedArray'; define(function (require) { return function IndexPatternFieldTypes() { - var IndexedArray = require('ui/IndexedArray'); return new IndexedArray({ index: ['name'], diff --git a/src/ui/public/index_patterns/_flatten_hit.js b/src/ui/public/index_patterns/_flatten_hit.js index 5aea6cbbfac14..7424c199d6e47 100644 --- a/src/ui/public/index_patterns/_flatten_hit.js +++ b/src/ui/public/index_patterns/_flatten_hit.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; // Takes a hit, merges it with any stored/scripted fields, and with the metaFields // returns a flattened version define(function (require) { return function FlattenHitProvider(config, $rootScope) { - var _ = require('lodash'); var metaFields = config.get('metaFields'); $rootScope.$on('change:config.metaFields', function () { diff --git a/src/ui/public/index_patterns/_format_hit.js b/src/ui/public/index_patterns/_format_hit.js index 21e41c9c368e3..6cf0b688d9c9e 100644 --- a/src/ui/public/index_patterns/_format_hit.js +++ b/src/ui/public/index_patterns/_format_hit.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; // Takes a hit, merges it with any stored/scripted fields, and with the metaFields // returns a formated version define(function (require) { - var _ = require('lodash'); return function (indexPattern, defaultFormat) { diff --git a/src/ui/public/index_patterns/_get_computed_fields.js b/src/ui/public/index_patterns/_get_computed_fields.js index 4d2019b931b89..d15a2abc0a302 100644 --- a/src/ui/public/index_patterns/_get_computed_fields.js +++ b/src/ui/public/index_patterns/_get_computed_fields.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; // Takes a hit, merges it with any stored/scripted fields, and with the metaFields // returns a flattened version define(function (require) { - var _ = require('lodash'); return function () { var self = this; var scriptFields = {}; diff --git a/src/ui/public/index_patterns/_get_ids.js b/src/ui/public/index_patterns/_get_ids.js index 751344fba1b44..81c224f0be7c2 100644 --- a/src/ui/public/index_patterns/_get_ids.js +++ b/src/ui/public/index_patterns/_get_ids.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function GetIndexPatternIdsFn(es, kbnIndex) { - var _ = require('lodash'); // many places may require the id list, so we will cache it seperately // didn't incorportate with the indexPattern cache to prevent id collisions. diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js index d99f67ff607b5..abd481733c4f3 100644 --- a/src/ui/public/index_patterns/_index_pattern.js +++ b/src/ui/public/index_patterns/_index_pattern.js @@ -1,20 +1,20 @@ +import _ from 'lodash'; +import errors from 'ui/errors'; +import angular from 'angular'; +import getComputedFields from 'ui/index_patterns/_get_computed_fields'; +import formatHit from 'ui/index_patterns/_format_hit'; define(function (require) { return function IndexPatternFactory(Private, timefilter, Notifier, config, kbnIndex, Promise, $rootScope, safeConfirm) { - var _ = require('lodash'); - var errors = require('ui/errors'); - var angular = require('angular'); var fieldformats = Private(require('ui/registry/field_formats')); var getIds = Private(require('ui/index_patterns/_get_ids')); var mapper = Private(require('ui/index_patterns/_mapper')); var intervals = Private(require('ui/index_patterns/_intervals')); - var getComputedFields = require('ui/index_patterns/_get_computed_fields'); var DocSource = Private(require('ui/courier/data_source/doc_source')); var mappingSetup = Private(require('ui/utils/mapping_setup')); var FieldList = Private(require('ui/index_patterns/_field_list')); var flattenHit = Private(require('ui/index_patterns/_flatten_hit')); - var formatHit = require('ui/index_patterns/_format_hit'); var calculateIndices = Private(require('ui/index_patterns/_calculate_indices')); var patternCache = Private(require('ui/index_patterns/_pattern_cache')); diff --git a/src/ui/public/index_patterns/_intervals.js b/src/ui/public/index_patterns/_intervals.js index c449a7d8890a7..24d34b12f59c0 100644 --- a/src/ui/public/index_patterns/_intervals.js +++ b/src/ui/public/index_patterns/_intervals.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import moment from 'moment'; +import IndexedArray from 'ui/IndexedArray'; define(function (require) { return function IndexNameIntervalsService(timefilter) { - var _ = require('lodash'); - var moment = require('moment'); - var IndexedArray = require('ui/IndexedArray'); var intervals = new IndexedArray({ index: ['name'], diff --git a/src/ui/public/index_patterns/_local_cache.js b/src/ui/public/index_patterns/_local_cache.js index 462e0205b1815..8776b6acf77e6 100644 --- a/src/ui/public/index_patterns/_local_cache.js +++ b/src/ui/public/index_patterns/_local_cache.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); return function LocalCacheFactory() { function LocalCache(opts) { diff --git a/src/ui/public/index_patterns/_map_field.js b/src/ui/public/index_patterns/_map_field.js index 47313d57c521f..ad0e815353070 100644 --- a/src/ui/public/index_patterns/_map_field.js +++ b/src/ui/public/index_patterns/_map_field.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function MapFieldFn(Private, config) { - var _ = require('lodash'); var castMappingType = Private(require('ui/index_patterns/_cast_mapping_type')); /** diff --git a/src/ui/public/index_patterns/_mapper.js b/src/ui/public/index_patterns/_mapper.js index bb41117ca2c00..0b29a6bde600b 100644 --- a/src/ui/public/index_patterns/_mapper.js +++ b/src/ui/public/index_patterns/_mapper.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { return function MapperService(Private, Promise, es, config, kbnIndex) { - var _ = require('lodash'); - var moment = require('moment'); var IndexPatternMissingIndices = require('ui/errors').IndexPatternMissingIndices; var transformMappingIntoFields = Private(require('ui/index_patterns/_transform_mapping_into_fields')); diff --git a/src/ui/public/index_patterns/_pattern_cache.js b/src/ui/public/index_patterns/_pattern_cache.js index 3cc57c08368e9..b1758443a257b 100644 --- a/src/ui/public/index_patterns/_pattern_cache.js +++ b/src/ui/public/index_patterns/_pattern_cache.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function PatternCache() { - var _ = require('lodash'); var vals = {}; diff --git a/src/ui/public/index_patterns/_transform_mapping_into_fields.js b/src/ui/public/index_patterns/_transform_mapping_into_fields.js index eb850650510f1..e32bc51efa14b 100644 --- a/src/ui/public/index_patterns/_transform_mapping_into_fields.js +++ b/src/ui/public/index_patterns/_transform_mapping_into_fields.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function transformMappingIntoFields(Private, kbnIndex, config) { - var _ = require('lodash'); var mapField = Private(require('ui/index_patterns/_map_field')); diff --git a/src/ui/public/index_patterns/index_patterns.js b/src/ui/public/index_patterns/index_patterns.js index 95771a16ab853..32fc6ae9ff765 100644 --- a/src/ui/public/index_patterns/index_patterns.js +++ b/src/ui/public/index_patterns/index_patterns.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import errors from 'ui/errors'; define(function (require) { var module = require('ui/modules').get('kibana/index_patterns'); require('ui/filters/short_dots'); function IndexPatternsProvider(es, Notifier, Private, Promise, kbnIndex) { var self = this; - var _ = require('lodash'); - var errors = require('ui/errors'); var IndexPattern = Private(require('ui/index_patterns/_index_pattern')); var patternCache = Private(require('ui/index_patterns/_pattern_cache')); diff --git a/src/ui/public/jquery/__tests__/findTestSubject.js b/src/ui/public/jquery/__tests__/findTestSubject.js index 672ad0ddbe187..0bc06bca17358 100644 --- a/src/ui/public/jquery/__tests__/findTestSubject.js +++ b/src/ui/public/jquery/__tests__/findTestSubject.js @@ -1,5 +1,5 @@ -var $ = require('jquery'); import expect from 'expect.js'; +import $ from 'jquery'; function $make(subject) { return $('
').attr('data-test-subj', subject); diff --git a/src/ui/public/listen/__tests__/listen.js b/src/ui/public/listen/__tests__/listen.js index 56fe2205bdb7c..f13336f139d21 100644 --- a/src/ui/public/listen/__tests__/listen.js +++ b/src/ui/public/listen/__tests__/listen.js @@ -1,8 +1,8 @@ +import sinon from 'auto-release-sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('listen component', function () { - var sinon = require('auto-release-sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var $rootScope; var Events; diff --git a/src/ui/public/listen/listen.js b/src/ui/public/listen/listen.js index 3ed67ccf84f66..ead9fa0f30f28 100644 --- a/src/ui/public/listen/listen.js +++ b/src/ui/public/listen/listen.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); require('ui/modules').get('kibana') .run(function ($rootScope) { diff --git a/src/ui/public/metadata.js b/src/ui/public/metadata.js index 215adb51eaa29..5b2793f4d983f 100644 --- a/src/ui/public/metadata.js +++ b/src/ui/public/metadata.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; // singleton for immutable copy of window.__KBN__ define(function (require) { - const _ = require('lodash'); if (!_.has(window, '__KBN__')) { throw new Error('window.__KBN__ must be set for metadata'); diff --git a/src/ui/public/modules.js b/src/ui/public/modules.js index 3cef8b28ed528..89a03205d39ff 100644 --- a/src/ui/public/modules.js +++ b/src/ui/public/modules.js @@ -1,3 +1,5 @@ +import angular from 'angular'; +import _ from 'lodash'; /** * This module is used by Kibana to create and reuse angular modules. Angular modules * can only be created once and need to have their dependencies at creation. This is @@ -46,9 +48,7 @@ * */ define(function (require) { - var angular = require('angular'); var existingModules = {}; - var _ = require('lodash'); var links = []; /** diff --git a/src/ui/public/navbar/navbar.js b/src/ui/public/navbar/navbar.js index fcad00d48ae67..62382212b9a7f 100644 --- a/src/ui/public/navbar/navbar.js +++ b/src/ui/public/navbar/navbar.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -const $ = require('jquery'); +import $ from 'jquery'; const navbar = require('ui/modules').get('kibana/navbar'); require('ui/render_directive'); diff --git a/src/ui/public/notify/__tests__/lib/_format_es_msg.js b/src/ui/public/notify/__tests__/lib/_format_es_msg.js index 6a2668332692d..2a9a2cae4526a 100644 --- a/src/ui/public/notify/__tests__/lib/_format_es_msg.js +++ b/src/ui/public/notify/__tests__/lib/_format_es_msg.js @@ -1,6 +1,6 @@ +import formatESMsg from 'ui/notify/lib/_format_es_msg'; +import expect from 'expect.js'; describe('formatESMsg', function () { - var formatESMsg = require('ui/notify/lib/_format_es_msg'); - var expect = require('expect.js'); it('should return undefined if passed a basic error', function () { var err = new Error('This is a normal error'); diff --git a/src/ui/public/notify/__tests__/lib/_format_msg.js b/src/ui/public/notify/__tests__/lib/_format_msg.js index 8961509db5acc..393a44f2ddbd8 100644 --- a/src/ui/public/notify/__tests__/lib/_format_msg.js +++ b/src/ui/public/notify/__tests__/lib/_format_msg.js @@ -1,6 +1,6 @@ +import formatMsg from 'ui/notify/lib/_format_msg'; +import expect from 'expect.js'; describe('formatMsg', function () { - var formatMsg = require('ui/notify/lib/_format_msg'); - var expect = require('expect.js'); it('should prepend the second argument to result', function () { var actual = formatMsg('error message', 'unit_test'); diff --git a/src/ui/public/notify/__tests__/notifier.js b/src/ui/public/notify/__tests__/notifier.js index 5bb9a155bb978..a7febe7c5b93b 100644 --- a/src/ui/public/notify/__tests__/notifier.js +++ b/src/ui/public/notify/__tests__/notifier.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import ngMock from 'ngMock'; +import expect from 'expect.js'; +import Notifier from 'ui/notify/notifier'; describe('Notifier', function () { - var _ = require('lodash'); - var ngMock = require('ngMock'); - var expect = require('expect.js'); - var Notifier = require('ui/notify/notifier'); var message = 'Oh, the humanity!'; var notifier; diff --git a/src/ui/public/notify/directives.js b/src/ui/public/notify/directives.js index 62681163211e7..21c81d2354388 100644 --- a/src/ui/public/notify/directives.js +++ b/src/ui/public/notify/directives.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { var notify = require('ui/modules').get('kibana/notify'); - var _ = require('lodash'); notify.directive('kbnNotifications', function () { return { diff --git a/src/ui/public/notify/errors.js b/src/ui/public/notify/errors.js index f5d9ded164fca..449f47c4cb288 100644 --- a/src/ui/public/notify/errors.js +++ b/src/ui/public/notify/errors.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { var errors = {}; - var _ = require('lodash'); var canStack = (function () { var err = new Error(); diff --git a/src/ui/public/notify/lib/_format_es_msg.js b/src/ui/public/notify/lib/_format_es_msg.js index a389a27852521..cdd30049464ab 100644 --- a/src/ui/public/notify/lib/_format_es_msg.js +++ b/src/ui/public/notify/lib/_format_es_msg.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); /** * Utilize the extended error information returned from elasticsearch diff --git a/src/ui/public/notify/lib/_format_msg.js b/src/ui/public/notify/lib/_format_msg.js index 2331d01a76597..eff653f498f48 100644 --- a/src/ui/public/notify/lib/_format_msg.js +++ b/src/ui/public/notify/lib/_format_msg.js @@ -1,7 +1,7 @@ +import _ from 'lodash'; +import formatESMsg from 'ui/notify/lib/_format_es_msg'; define(function (require) { - var _ = require('lodash'); var has = _.has; - var formatESMsg = require('ui/notify/lib/_format_es_msg'); /** * Formats the error message from an error object, extended elasticsearch diff --git a/src/ui/public/notify/notifier.js b/src/ui/public/notify/notifier.js index f21a695eb77ca..b93642cb64324 100644 --- a/src/ui/public/notify/notifier.js +++ b/src/ui/public/notify/notifier.js @@ -1,11 +1,12 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import metadata from 'ui/metadata'; +import formatMsg from 'ui/notify/lib/_format_msg'; +import fatalSplashScreen from 'ui/notify/partials/fatal_splash_screen.html'; /* eslint no-console: 0 */ define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var metadata = require('ui/metadata'); - var formatMsg = require('ui/notify/lib/_format_msg'); var notifs = []; var setTO = setTimeout; @@ -14,7 +15,6 @@ define(function (require) { var buildNum = metadata.buildNum; var consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console); - var fatalSplashScreen = require('ui/notify/partials/fatal_splash_screen.html'); var log = _.bindKey(console, 'log'); diff --git a/src/ui/public/notify/notify.js b/src/ui/public/notify/notify.js index 4b51fcc39e239..4cdaa194bdb63 100644 --- a/src/ui/public/notify/notify.js +++ b/src/ui/public/notify/notify.js @@ -1,10 +1,10 @@ +import _ from 'lodash'; +import $ from 'jquery'; +import modules from 'ui/modules'; +import errors from 'ui/notify/errors'; +import Notifier from 'ui/notify/notifier'; define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var modules = require('ui/modules'); var module = modules.get('kibana/notify'); - var errors = require('ui/notify/errors'); - var Notifier = require('ui/notify/notifier'); var rootNotifier = new Notifier(); require('ui/notify/directives'); diff --git a/src/ui/public/number_list/number_list.js b/src/ui/public/number_list/number_list.js index 0b6e1b97053c9..9608ad525cb39 100644 --- a/src/ui/public/number_list/number_list.js +++ b/src/ui/public/number_list/number_list.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import parseRange from 'ui/utils/range'; define(function (require) { - var _ = require('lodash'); - var parseRange = require('ui/utils/range'); require('ui/number_list/number_list_input'); require('ui/modules') diff --git a/src/ui/public/number_list/number_list_input.js b/src/ui/public/number_list/number_list_input.js index 9c3aa1936d59a..67ef1a36421b7 100644 --- a/src/ui/public/number_list/number_list_input.js +++ b/src/ui/public/number_list/number_list_input.js @@ -1,7 +1,7 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import keyMap from 'ui/utils/key_map'; define(function (require) { - var $ = require('jquery'); - var _ = require('lodash'); - var keyMap = require('ui/utils/key_map'); var INVALID = {}; // invalid flag var FLOATABLE = /^[\d\.e\-\+]+$/i; diff --git a/src/ui/public/paginated_table/__tests__/index.js b/src/ui/public/paginated_table/__tests__/index.js index 6750af2ae4ea5..1f31b8b5e67a7 100644 --- a/src/ui/public/paginated_table/__tests__/index.js +++ b/src/ui/public/paginated_table/__tests__/index.js @@ -1,10 +1,10 @@ require('ui/paginated_table'); import _ from 'lodash'; -var $ = require('jquery'); import sinon from 'sinon'; import expect from 'expect.js'; import ngMock from 'ngMock'; +import $ from 'jquery'; describe('paginated table', function () { var $el; diff --git a/src/ui/public/paginated_table/paginated_table.js b/src/ui/public/paginated_table/paginated_table.js index e90c958db2e8e..d9c7745b6c7a5 100644 --- a/src/ui/public/paginated_table/paginated_table.js +++ b/src/ui/public/paginated_table/paginated_table.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; define(function (require) { require('ui/modules') .get('kibana') .directive('paginatedTable', function ($filter) { - var _ = require('lodash'); var orderBy = $filter('orderBy'); return { diff --git a/src/ui/public/parse_query/lib/from_user.js b/src/ui/public/parse_query/lib/from_user.js index 0eb2e32d93efd..54b9e5045df7c 100644 --- a/src/ui/public/parse_query/lib/from_user.js +++ b/src/ui/public/parse_query/lib/from_user.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return function GetQueryFromUser(es, Private) { var decorateQuery = Private(require('ui/courier/data_source/_decorate_query')); diff --git a/src/ui/public/parse_query/lib/to_user.js b/src/ui/public/parse_query/lib/to_user.js index 736718a5d0d01..ddb5dac81c21f 100644 --- a/src/ui/public/parse_query/lib/to_user.js +++ b/src/ui/public/parse_query/lib/to_user.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import angular from 'angular'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); /** * Take text from the model and present it to the user as a string diff --git a/src/ui/public/parse_query/parse_query.js b/src/ui/public/parse_query/parse_query.js index b14384e507ff1..97ca8fc9ce453 100644 --- a/src/ui/public/parse_query/parse_query.js +++ b/src/ui/public/parse_query/parse_query.js @@ -1,9 +1,9 @@ +import toUser from 'ui/parse_query/lib/to_user'; define(function (require) { require('ui/modules') .get('kibana') .directive('parseQuery', function (Private) { var fromUser = Private(require('ui/parse_query/lib/from_user')); - var toUser = require('ui/parse_query/lib/to_user'); return { restrict: 'A', diff --git a/src/ui/public/persisted_log/persisted_log.js b/src/ui/public/persisted_log/persisted_log.js index dfcb3c793c4a7..2529e3c5e61be 100644 --- a/src/ui/public/persisted_log/persisted_log.js +++ b/src/ui/public/persisted_log/persisted_log.js @@ -1,6 +1,6 @@ +import modules from 'ui/modules'; +import _ from 'lodash'; define(function (require) { - var modules = require('ui/modules'); - var _ = require('lodash'); modules.get('kibana/persisted_log') .factory('PersistedLog', function ($window, localStorage) { diff --git a/src/ui/public/persisted_state/persisted_state.js b/src/ui/public/persisted_state/persisted_state.js index cf4f2bbda9360..075aaa4c3eba6 100644 --- a/src/ui/public/persisted_state/persisted_state.js +++ b/src/ui/public/persisted_state/persisted_state.js @@ -1,11 +1,11 @@ +import _ from 'lodash'; +import toPath from 'lodash/internal/toPath'; +import errors from 'ui/errors'; +import SimpleEmitter from 'ui/utils/SimpleEmitter'; define(function (require) { - var _ = require('lodash'); - var toPath = require('lodash/internal/toPath'); - var errors = require('ui/errors'); return function (Private) { var Events = Private(require('ui/events')); - var SimpleEmitter = require('ui/utils/SimpleEmitter'); function validateParent(parent, path) { if (path.length <= 0) { diff --git a/src/ui/public/private/__tests__/private.js b/src/ui/public/private/__tests__/private.js index 8563f1ff6f420..2f5244b430407 100644 --- a/src/ui/public/private/__tests__/private.js +++ b/src/ui/public/private/__tests__/private.js @@ -1,9 +1,9 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Private module loader', function () { var Private; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function ($injector) { diff --git a/src/ui/public/private/private.js b/src/ui/public/private/private.js index 548d79dac2041..faa99643e0a7c 100644 --- a/src/ui/public/private/private.js +++ b/src/ui/public/private/private.js @@ -1,3 +1,4 @@ +import _ from 'lodash'; define(function (require) { /** * # `Private()` @@ -86,7 +87,6 @@ define(function (require) { */ - var _ = require('lodash'); var nextId = _.partial(_.uniqueId, 'privateProvider#'); function name(fn) { diff --git a/src/ui/public/promises/promises.js b/src/ui/public/promises/promises.js index 8189f7445945e..9e367fbb270e7 100644 --- a/src/ui/public/promises/promises.js +++ b/src/ui/public/promises/promises.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); var module = require('ui/modules').get('kibana'); diff --git a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js index da013d6132b9e..256bb523ae4b7 100644 --- a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js +++ b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js @@ -1,10 +1,10 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import expect from 'expect.js'; +import sinon from 'auto-release-sinon'; +import ngMock from 'ngMock'; describe('Reflow watcher', function () { require('angular'); - var $ = require('jquery'); - var _ = require('lodash'); - var expect = require('expect.js'); - var sinon = require('auto-release-sinon'); - var ngMock = require('ngMock'); var $body = $(document.body); var $window = $(window); diff --git a/src/ui/public/reflow_watcher/reflow_watcher.js b/src/ui/public/reflow_watcher/reflow_watcher.js index d6aad9a2649cb..c8b8c4919270c 100644 --- a/src/ui/public/reflow_watcher/reflow_watcher.js +++ b/src/ui/public/reflow_watcher/reflow_watcher.js @@ -1,8 +1,8 @@ +import angular from 'angular'; +import $ from 'jquery'; +import _ from 'lodash'; define(function (require) { return function ReflowWatcherService(Private, $rootScope, $http) { - var angular = require('angular'); - var $ = require('jquery'); - var _ = require('lodash'); var EventEmitter = Private(require('ui/events')); var $body = $(document.body); diff --git a/src/ui/public/registry/__tests__/index.js b/src/ui/public/registry/__tests__/index.js index c33369195ff59..2f05c03894fc2 100644 --- a/src/ui/public/registry/__tests__/index.js +++ b/src/ui/public/registry/__tests__/index.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import sinon from 'auto-release-sinon'; +import registry from 'ui/registry/_registry'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Registry', function () { - var _ = require('lodash'); - var sinon = require('auto-release-sinon'); - var registry = require('ui/registry/_registry'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var Private; var IndexedArray; diff --git a/src/ui/public/registry/_registry.js b/src/ui/public/registry/_registry.js index 4530e93249afe..b68ccfd187253 100644 --- a/src/ui/public/registry/_registry.js +++ b/src/ui/public/registry/_registry.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import IndexedArray from 'ui/IndexedArray'; define(function (require) { - var _ = require('lodash'); - var IndexedArray = require('ui/IndexedArray'); var notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor'); /** diff --git a/src/ui/public/registry/field_formats.js b/src/ui/public/registry/field_formats.js index 3de51d4924d20..7878b69b8f6fa 100644 --- a/src/ui/public/registry/field_formats.js +++ b/src/ui/public/registry/field_formats.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); return require('ui/registry/_registry')({ name: 'fieldFormats', diff --git a/src/ui/public/render_directive/render_directive.js b/src/ui/public/render_directive/render_directive.js index 257ac1de67bf1..d60a4de1b8994 100644 --- a/src/ui/public/render_directive/render_directive.js +++ b/src/ui/public/render_directive/render_directive.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -const $ = require('jquery'); +import $ from 'jquery'; const module = require('ui/modules').get('kibana/render_directive'); module.directive('renderDirective', function () { diff --git a/src/ui/public/routes/WorkQueue.js b/src/ui/public/routes/WorkQueue.js index 79536fbd23218..49b7c30274846 100644 --- a/src/ui/public/routes/WorkQueue.js +++ b/src/ui/public/routes/WorkQueue.js @@ -1,5 +1,5 @@ +import _ from 'lodash'; define(function (require) { - var _ = require('lodash'); function WorkQueue() { var q = this; diff --git a/src/ui/public/routes/wrapRouteWithPrep.js b/src/ui/public/routes/wrapRouteWithPrep.js index e92b50018e872..d386e8b62b0d6 100644 --- a/src/ui/public/routes/wrapRouteWithPrep.js +++ b/src/ui/public/routes/wrapRouteWithPrep.js @@ -1,9 +1,9 @@ +import angular from 'angular'; +import _ from 'lodash'; +import WorkQueue from 'ui/routes/WorkQueue'; +import errors from 'ui/errors'; define(function (require) { - var angular = require('angular'); - var _ = require('lodash'); - var WorkQueue = require('ui/routes/WorkQueue'); - var errors = require('ui/errors'); function wrapRouteWithPrep(route, setup) { if (!route.resolve && route.redirectTo) return; diff --git a/src/ui/public/safe_confirm/__tests__/safe_confirm.js b/src/ui/public/safe_confirm/__tests__/safe_confirm.js index 8952cec32f9b4..55cdc6bf48a56 100644 --- a/src/ui/public/safe_confirm/__tests__/safe_confirm.js +++ b/src/ui/public/safe_confirm/__tests__/safe_confirm.js @@ -1,7 +1,7 @@ +import sinon from 'sinon'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('ui/safe_confirm', function () { - var sinon = require('sinon'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var $rootScope; var $window; diff --git a/src/ui/public/state_management/_state_sync.js b/src/ui/public/state_management/_state_sync.js index 7c4925eb17cae..ad229eab03c4e 100644 --- a/src/ui/public/state_management/_state_sync.js +++ b/src/ui/public/state_management/_state_sync.js @@ -1,8 +1,8 @@ +import angular from 'angular'; +import _ from 'lodash'; +import rison from 'ui/utils/rison'; define(function (require) { - var angular = require('angular'); - var _ = require('lodash'); - var rison = require('ui/utils/rison'); // invokable/private angular dep return function ($location) { diff --git a/src/ui/public/state_management/app_state.js b/src/ui/public/state_management/app_state.js index a3b3317b1c3b4..baec43826097c 100644 --- a/src/ui/public/state_management/app_state.js +++ b/src/ui/public/state_management/app_state.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import modules from 'ui/modules'; define(function (require) { - var _ = require('lodash'); - var modules = require('ui/modules'); var urlParam = '_a'; function AppStateProvider(Private, $rootScope, getAppState) { diff --git a/src/ui/public/state_management/global_state.js b/src/ui/public/state_management/global_state.js index 6f74135ea4e8d..f46da91a06ce9 100644 --- a/src/ui/public/state_management/global_state.js +++ b/src/ui/public/state_management/global_state.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; +import angular from 'angular'; +import qs from 'ui/utils/query_string'; +import rison from 'ui/utils/rison'; define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); - var qs = require('ui/utils/query_string'); - var rison = require('ui/utils/rison'); var module = require('ui/modules').get('kibana/global_state'); diff --git a/src/ui/public/state_management/state.js b/src/ui/public/state_management/state.js index 64e202d6e41ba..60cabd548af02 100644 --- a/src/ui/public/state_management/state.js +++ b/src/ui/public/state_management/state.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import rison from 'ui/utils/rison'; +import applyDiff from 'ui/utils/diff_object'; +import qs from 'ui/utils/query_string'; define(function (require) { - var _ = require('lodash'); - var rison = require('ui/utils/rison'); - var applyDiff = require('ui/utils/diff_object'); - var qs = require('ui/utils/query_string'); return function StateProvider(Notifier, Private, $rootScope, $location) { var Events = Private(require('ui/events')); diff --git a/src/ui/public/storage/storage.js b/src/ui/public/storage/storage.js index 7207c66ea182a..28fa44ca37f0f 100644 --- a/src/ui/public/storage/storage.js +++ b/src/ui/public/storage/storage.js @@ -1,6 +1,6 @@ +import modules from 'ui/modules'; +import angular from 'angular'; define(function (require) { - var modules = require('ui/modules'); - var angular = require('angular'); function Storage(store) { var self = this; diff --git a/src/ui/public/stringify/__tests__/_color.js b/src/ui/public/stringify/__tests__/_color.js index b8093ab75a3c6..bce4430d11cd8 100644 --- a/src/ui/public/stringify/__tests__/_color.js +++ b/src/ui/public/stringify/__tests__/_color.js @@ -1,8 +1,8 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Color Format', function () { var fieldFormats; var ColorFormat; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/stringify/__tests__/_date.js b/src/ui/public/stringify/__tests__/_date.js index 40f3380df52da..da77785464dfd 100644 --- a/src/ui/public/stringify/__tests__/_date.js +++ b/src/ui/public/stringify/__tests__/_date.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; +import moment from 'moment-timezone'; describe('Date Format', function () { - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var moment = require('moment-timezone'); var fieldFormats; var settings; var convert; diff --git a/src/ui/public/stringify/__tests__/_ip.js b/src/ui/public/stringify/__tests__/_ip.js index b8964bca664ff..b94f0243a0bc6 100644 --- a/src/ui/public/stringify/__tests__/_ip.js +++ b/src/ui/public/stringify/__tests__/_ip.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('IP Address Format', function () { var fieldFormats; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/stringify/__tests__/_source.js b/src/ui/public/stringify/__tests__/_source.js index 41c989258487a..80ddbd36be3a7 100644 --- a/src/ui/public/stringify/__tests__/_source.js +++ b/src/ui/public/stringify/__tests__/_source.js @@ -1,8 +1,8 @@ +import $ from 'jquery'; +import _ from 'lodash'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('_source formatting', function () { - var $ = require('jquery'); - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var fieldFormats; diff --git a/src/ui/public/stringify/__tests__/_string.js b/src/ui/public/stringify/__tests__/_string.js index c2a7a2276b6d7..733cff112888b 100644 --- a/src/ui/public/stringify/__tests__/_string.js +++ b/src/ui/public/stringify/__tests__/_string.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('String Format', function () { var fieldFormats; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/stringify/__tests__/_truncate.js b/src/ui/public/stringify/__tests__/_truncate.js index b51c5a8d8f431..6d0f7b6a49884 100644 --- a/src/ui/public/stringify/__tests__/_truncate.js +++ b/src/ui/public/stringify/__tests__/_truncate.js @@ -1,7 +1,7 @@ +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('String Truncate Format', function () { var fieldFormats; - var expect = require('expect.js'); - var ngMock = require('ngMock'); beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private) { diff --git a/src/ui/public/stringify/__tests__/_url.js b/src/ui/public/stringify/__tests__/_url.js index f9b0943f6b45d..348e87bb5eb2c 100644 --- a/src/ui/public/stringify/__tests__/_url.js +++ b/src/ui/public/stringify/__tests__/_url.js @@ -1,7 +1,7 @@ +import $ from 'jquery'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('Url Format', function () { - var $ = require('jquery'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var fieldFormats; diff --git a/src/ui/public/stringify/register.js b/src/ui/public/stringify/register.js index 7eddb1dd92783..ec431f85a9812 100644 --- a/src/ui/public/stringify/register.js +++ b/src/ui/public/stringify/register.js @@ -1,5 +1,5 @@ +import fieldFormats from 'ui/registry/field_formats'; define(function (require) { - var fieldFormats = require('ui/registry/field_formats'); fieldFormats.register(require('ui/stringify/types/Url')); fieldFormats.register(require('ui/stringify/types/Bytes')); fieldFormats.register(require('ui/stringify/types/Date')); diff --git a/src/ui/public/stringify/types/Color.js b/src/ui/public/stringify/types/Color.js index 7578d6218c2e2..500cc341ff56d 100644 --- a/src/ui/public/stringify/types/Color.js +++ b/src/ui/public/stringify/types/Color.js @@ -1,8 +1,8 @@ +import _ from 'lodash'; define(function (require) { return function _StringProvider(Private) { require('ui/stringify/editors/color.less'); - const _ = require('lodash'); const FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); const DEFAULT_COLOR = { range: `${Number.NEGATIVE_INFINITY}:${Number.POSITIVE_INFINITY}`, diff --git a/src/ui/public/stringify/types/Date.js b/src/ui/public/stringify/types/Date.js index bdd3ee463fc06..a619a6cba3dc1 100644 --- a/src/ui/public/stringify/types/Date.js +++ b/src/ui/public/stringify/types/Date.js @@ -1,9 +1,9 @@ +import _ from 'lodash'; +import moment from 'moment'; define(function (require) { return function DateTimeFormatProvider(Private) { - var _ = require('lodash'); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); var BoundToConfigObj = Private(require('ui/bound_to_config_obj')); - var moment = require('moment'); require('ui/field_format_editor/pattern/pattern'); diff --git a/src/ui/public/stringify/types/Ip.js b/src/ui/public/stringify/types/Ip.js index 29dbc6333afa0..5c7cdf0bdda46 100644 --- a/src/ui/public/stringify/types/Ip.js +++ b/src/ui/public/stringify/types/Ip.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function IpFormatProvider(Private) { - var _ = require('lodash'); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); _.class(Ip).inherits(FieldFormat); diff --git a/src/ui/public/stringify/types/Percent.js b/src/ui/public/stringify/types/Percent.js index 093899fba6c77..de1f83a55a762 100644 --- a/src/ui/public/stringify/types/Percent.js +++ b/src/ui/public/stringify/types/Percent.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function NumberFormatProvider(Private) { - var _ = require('lodash'); var BoundToConfigObj = Private(require('ui/bound_to_config_obj')); var Numeral = Private(require('ui/stringify/types/_Numeral')); diff --git a/src/ui/public/stringify/types/Source.js b/src/ui/public/stringify/types/Source.js index 20d778ec350fa..850134a598aaf 100644 --- a/src/ui/public/stringify/types/Source.js +++ b/src/ui/public/stringify/types/Source.js @@ -1,10 +1,10 @@ +import _ from 'lodash'; +import noWhiteSpace from 'ui/utils/no_white_space'; +import angular from 'angular'; define(function (require) { return function _SourceProvider(Private, shortDotsFilter) { - var _ = require('lodash'); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); - var noWhiteSpace = require('ui/utils/no_white_space'); var template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html'))); - var angular = require('angular'); _.class(Source).inherits(FieldFormat); function Source(params) { diff --git a/src/ui/public/stringify/types/String.js b/src/ui/public/stringify/types/String.js index 1d587474046f0..2d03e09f2223b 100644 --- a/src/ui/public/stringify/types/String.js +++ b/src/ui/public/stringify/types/String.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function _StringProvider(Private) { - var _ = require('lodash'); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); require('ui/field_format_editor/samples/samples'); diff --git a/src/ui/public/stringify/types/Url.js b/src/ui/public/stringify/types/Url.js index 53b29c00cbc36..e1d6c0ddbd1ec 100644 --- a/src/ui/public/stringify/types/Url.js +++ b/src/ui/public/stringify/types/Url.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function UrlFormatProvider(Private, highlightFilter) { - var _ = require('lodash'); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); diff --git a/src/ui/public/stringify/types/_Numeral.js b/src/ui/public/stringify/types/_Numeral.js index 6c55a4616c5c3..faaeacc2dec10 100644 --- a/src/ui/public/stringify/types/_Numeral.js +++ b/src/ui/public/stringify/types/_Numeral.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function AbstractNumeralFormatProvider(Private) { - var _ = require('lodash'); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); var BoundToConfigObj = Private(require('ui/bound_to_config_obj')); var numeral = require('numeral')(); diff --git a/src/ui/public/stringify/types/truncate.js b/src/ui/public/stringify/types/truncate.js index a461fadb7f863..ca42ce25ab3e5 100644 --- a/src/ui/public/stringify/types/truncate.js +++ b/src/ui/public/stringify/types/truncate.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; define(function (require) { return function TruncateFormatProvider(Private) { - var _ = require('lodash'); var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); var omission = '...'; diff --git a/src/ui/public/styleCompile/__tests__/styleCompile.js b/src/ui/public/styleCompile/__tests__/styleCompile.js index 0b51ff35c9d67..80d9c64291f71 100644 --- a/src/ui/public/styleCompile/__tests__/styleCompile.js +++ b/src/ui/public/styleCompile/__tests__/styleCompile.js @@ -1,7 +1,7 @@ +import $ from 'jquery'; +import expect from 'expect.js'; +import ngMock from 'ngMock'; describe('styleCompile directive', function () { - var $ = require('jquery'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); var config; var $rootScope; diff --git a/src/ui/public/styleCompile/styleCompile.js b/src/ui/public/styleCompile/styleCompile.js index f318ec8e4b7c8..724d2908b171f 100644 --- a/src/ui/public/styleCompile/styleCompile.js +++ b/src/ui/public/styleCompile/styleCompile.js @@ -1,6 +1,6 @@ +import _ from 'lodash'; +import $ from 'jquery'; define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); var $style = $('