From 27835f373e581430aab7763eb08075fb308c8353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 4 Jan 2018 10:12:02 +0100 Subject: [PATCH] cleanup: removed unused typescript typings import --- public/app/app.ts | 2 ++ public/app/core/components/gf_page.ts | 2 -- public/app/core/components/help/help.ts | 2 -- public/app/core/components/info_popover.ts | 2 -- public/app/core/components/org_switcher.ts | 2 -- public/app/core/components/query_part/query_part.ts | 2 -- .../core/components/query_part/query_part_editor.ts | 2 -- public/app/core/components/switch.ts | 2 -- public/app/core/controllers/signup_ctrl.ts | 2 -- public/app/core/directives/array_join.ts | 2 -- public/app/core/directives/diff-view.ts | 2 -- public/app/core/directives/give_focus.ts | 2 -- public/app/core/filters/filters.ts | 2 -- public/app/core/services/alert_srv.ts | 2 -- public/app/core/services/backend_srv.ts | 2 -- public/app/core/services/dynamic_directive_srv.ts | 2 -- public/app/core/services/popover_srv.ts | 2 -- public/app/core/services/util_srv.ts | 2 -- public/app/core/utils/css_loader.ts | 2 -- public/app/core/utils/datemath.ts | 2 -- public/app/core/utils/emitter.ts | 2 +- public/app/core/utils/rangeutil.ts | 2 -- public/app/features/alerting/alert_tab_ctrl.ts | 2 -- .../app/features/alerting/notification_edit_ctrl.ts | 2 -- .../app/features/alerting/notifications_list_ctrl.ts | 2 -- public/app/features/dashboard/acl/acl.ts | 2 -- public/app/features/dashboard/ad_hoc_filters.ts | 2 -- public/app/features/dashboard/alerting_srv.ts | 2 -- public/app/features/dashboard/save_modal.ts | 2 -- public/app/features/dashboard/submenu/submenu.ts | 2 -- public/app/features/dashboard/time_srv.ts | 2 -- .../app/features/dashboard/unsaved_changes_modal.ts | 2 -- public/app/features/dashboard/upload.ts | 2 -- public/app/features/org/prefs_control.ts | 2 -- public/app/features/org/teams_ctrl.ts | 2 -- public/app/features/panel/panel_editor_tab.ts | 2 -- public/app/features/panel/panel_header.ts | 2 -- public/app/features/panel/query_ctrl.ts | 2 -- public/app/features/panel/query_editor_row.ts | 2 -- public/app/features/panel/query_troubleshooter.ts | 2 -- public/app/features/playlist/playlist_search.ts | 2 -- public/app/features/playlist/playlist_srv.ts | 2 -- public/app/features/playlist/playlists_ctrl.ts | 2 -- .../app/features/plugins/import_list/import_list.ts | 2 -- public/app/features/plugins/plugin_edit_ctrl.ts | 2 -- public/app/features/plugins/row_ctrl.ts | 2 -- public/app/features/snapshot/snapshot_ctrl.ts | 2 -- public/app/features/templating/constant_variable.ts | 2 -- public/app/features/templating/custom_variable.ts | 2 -- public/app/features/templating/datasource_variable.ts | 2 -- public/app/features/templating/interval_variable.ts | 2 -- public/app/features/templating/variable_srv.ts | 2 -- public/app/headers/common.d.ts | 11 ----------- public/app/plugins/app/testdata/module.ts | 2 -- .../app/plugins/datasource/cloudwatch/config_ctrl.ts | 2 -- .../app/plugins/datasource/cloudwatch/query_ctrl.ts | 2 -- .../plugins/datasource/elasticsearch/datasource.ts | 2 -- .../datasource/elasticsearch/elastic_response.ts | 2 -- .../plugins/datasource/elasticsearch/query_ctrl.ts | 2 -- .../app/plugins/datasource/elasticsearch/query_def.ts | 2 -- .../app/plugins/datasource/grafana-live/datasource.ts | 2 -- public/app/plugins/datasource/grafana-live/module.ts | 2 -- public/app/plugins/datasource/graphite/config_ctrl.ts | 2 -- public/app/plugins/datasource/graphite/datasource.ts | 2 -- public/app/plugins/datasource/graphite/lexer.ts | 2 -- .../app/plugins/datasource/influxdb/influx_query.ts | 2 -- public/app/plugins/datasource/influxdb/query_part.ts | 2 -- public/app/plugins/datasource/mixed/datasource.ts | 2 -- public/app/plugins/datasource/mixed/module.ts | 2 -- public/app/plugins/datasource/mysql/datasource.ts | 2 -- public/app/plugins/datasource/mysql/module.ts | 2 -- public/app/plugins/datasource/mysql/query_ctrl.ts | 2 -- .../app/plugins/datasource/mysql/response_parser.ts | 2 -- public/app/plugins/datasource/opentsdb/config_ctrl.ts | 2 -- public/app/plugins/datasource/opentsdb/query_ctrl.ts | 2 -- public/app/plugins/datasource/postgres/datasource.ts | 2 -- public/app/plugins/datasource/postgres/module.ts | 2 -- public/app/plugins/datasource/postgres/query_ctrl.ts | 2 -- .../plugins/datasource/postgres/response_parser.ts | 2 -- public/app/plugins/datasource/prometheus/completer.ts | 2 -- public/app/plugins/panel/alertlist/module.ts | 2 -- public/app/plugins/panel/gettingstarted/module.ts | 2 -- public/app/plugins/panel/graph/axes_editor.ts | 2 -- public/app/plugins/panel/graph/module.ts | 2 -- .../app/plugins/panel/graph/specs/graph_ctrl_specs.ts | 2 -- public/app/plugins/panel/graph/specs/graph_specs.ts | 2 -- .../panel/graph/specs/threshold_manager_specs.ts | 2 -- public/app/plugins/panel/graph/specs/tooltip_specs.ts | 2 -- public/app/plugins/panel/graph/thresholds_form.ts | 2 -- public/app/plugins/panel/heatmap/axes_editor.ts | 2 -- public/app/plugins/panel/heatmap/display_editor.ts | 2 -- .../plugins/panel/heatmap/specs/heatmap_ctrl_specs.ts | 2 -- .../app/plugins/panel/heatmap/specs/renderer_specs.ts | 2 -- public/app/plugins/panel/table/column_options.ts | 2 -- public/app/plugins/panel/table/editor.ts | 2 -- public/app/plugins/panel/table/module.ts | 2 -- public/app/plugins/panel/text/module.ts | 11 ++++------- 97 files changed, 7 insertions(+), 205 deletions(-) delete mode 100644 public/app/headers/common.d.ts diff --git a/public/app/app.ts b/public/app/app.ts index 6caa178bc83..9ac76b8ec91 100644 --- a/public/app/app.ts +++ b/public/app/app.ts @@ -29,6 +29,8 @@ _.move = function(array, fromIndex, toIndex) { import { coreModule, registerAngularDirectives } from './core/core'; import { setupAngularRoutes } from './routes/routes'; +declare var System: any; + export class GrafanaApp { registerFunctions: any; ngModuleDependencies: any[]; diff --git a/public/app/core/components/gf_page.ts b/public/app/core/components/gf_page.ts index 5df3bd89715..ad0770940ec 100644 --- a/public/app/core/components/gf_page.ts +++ b/public/app/core/components/gf_page.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; const template = ` diff --git a/public/app/core/components/help/help.ts b/public/app/core/components/help/help.ts index a594b95bb4d..0676b4dae99 100644 --- a/public/app/core/components/help/help.ts +++ b/public/app/core/components/help/help.ts @@ -1,5 +1,3 @@ -/// - import coreModule from '../../core_module'; import appEvents from 'app/core/app_events'; diff --git a/public/app/core/components/info_popover.ts b/public/app/core/components/info_popover.ts index 2701c7b6983..59332a6f716 100644 --- a/public/app/core/components/info_popover.ts +++ b/public/app/core/components/info_popover.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import coreModule from 'app/core/core_module'; import Drop from 'tether-drop'; diff --git a/public/app/core/components/org_switcher.ts b/public/app/core/components/org_switcher.ts index e2bd1be7928..d6efeb51779 100644 --- a/public/app/core/components/org_switcher.ts +++ b/public/app/core/components/org_switcher.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; import { contextSrv } from 'app/core/services/context_srv'; diff --git a/public/app/core/components/query_part/query_part.ts b/public/app/core/components/query_part/query_part.ts index 033e2e450a2..93f28cbc04f 100644 --- a/public/app/core/components/query_part/query_part.ts +++ b/public/app/core/components/query_part/query_part.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; export class QueryPartDef { diff --git a/public/app/core/components/query_part/query_part_editor.ts b/public/app/core/components/query_part/query_part_editor.ts index 400892fe5f8..138da186238 100644 --- a/public/app/core/components/query_part/query_part_editor.ts +++ b/public/app/core/components/query_part/query_part_editor.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import $ from 'jquery'; import coreModule from 'app/core/core_module'; diff --git a/public/app/core/components/switch.ts b/public/app/core/components/switch.ts index 3203a42cd70..d2de09216cc 100644 --- a/public/app/core/components/switch.ts +++ b/public/app/core/components/switch.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; var template = ` diff --git a/public/app/core/controllers/signup_ctrl.ts b/public/app/core/controllers/signup_ctrl.ts index 3b4fd6a4a9e..1f47912931e 100644 --- a/public/app/core/controllers/signup_ctrl.ts +++ b/public/app/core/controllers/signup_ctrl.ts @@ -1,5 +1,3 @@ -/// - import config from 'app/core/config'; import coreModule from '../core_module'; diff --git a/public/app/core/directives/array_join.ts b/public/app/core/directives/array_join.ts index 1bf1c6a9f53..f3416f43576 100644 --- a/public/app/core/directives/array_join.ts +++ b/public/app/core/directives/array_join.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import coreModule from '../core_module'; diff --git a/public/app/core/directives/diff-view.ts b/public/app/core/directives/diff-view.ts index 2770a09a00b..84cb597e543 100644 --- a/public/app/core/directives/diff-view.ts +++ b/public/app/core/directives/diff-view.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import coreModule from '../core_module'; diff --git a/public/app/core/directives/give_focus.ts b/public/app/core/directives/give_focus.ts index 41767d55c0f..32e7205f84b 100644 --- a/public/app/core/directives/give_focus.ts +++ b/public/app/core/directives/give_focus.ts @@ -1,5 +1,3 @@ -/// - import coreModule from '../core_module'; coreModule.directive('giveFocus', function() { diff --git a/public/app/core/filters/filters.ts b/public/app/core/filters/filters.ts index 1556e0a94f5..c6aea32d38d 100644 --- a/public/app/core/filters/filters.ts +++ b/public/app/core/filters/filters.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import angular from 'angular'; import moment from 'moment'; diff --git a/public/app/core/services/alert_srv.ts b/public/app/core/services/alert_srv.ts index ea15077b960..35e8e39804f 100644 --- a/public/app/core/services/alert_srv.ts +++ b/public/app/core/services/alert_srv.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import _ from 'lodash'; import coreModule from 'app/core/core_module'; diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts index 5d582116d8e..3204db0ce5d 100644 --- a/public/app/core/services/backend_srv.ts +++ b/public/app/core/services/backend_srv.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import coreModule from 'app/core/core_module'; import appEvents from 'app/core/app_events'; diff --git a/public/app/core/services/dynamic_directive_srv.ts b/public/app/core/services/dynamic_directive_srv.ts index cfcc70516b6..086843b6f9a 100644 --- a/public/app/core/services/dynamic_directive_srv.ts +++ b/public/app/core/services/dynamic_directive_srv.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import coreModule from '../core_module'; diff --git a/public/app/core/services/popover_srv.ts b/public/app/core/services/popover_srv.ts index 7c1708b15a7..113e1e5fae7 100644 --- a/public/app/core/services/popover_srv.ts +++ b/public/app/core/services/popover_srv.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import coreModule from 'app/core/core_module'; import Drop from 'tether-drop'; diff --git a/public/app/core/services/util_srv.ts b/public/app/core/services/util_srv.ts index 2a7dbe3a684..52c934ee9ee 100644 --- a/public/app/core/services/util_srv.ts +++ b/public/app/core/services/util_srv.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; import appEvents from 'app/core/app_events'; diff --git a/public/app/core/utils/css_loader.ts b/public/app/core/utils/css_loader.ts index 4ff03ec3c97..42f59a9c27c 100644 --- a/public/app/core/utils/css_loader.ts +++ b/public/app/core/utils/css_loader.ts @@ -1,5 +1,3 @@ -/// - var waitSeconds = 100; var head = document.getElementsByTagName('head')[0]; diff --git a/public/app/core/utils/datemath.ts b/public/app/core/utils/datemath.ts index b892d49f2d8..340591e5d9c 100644 --- a/public/app/core/utils/datemath.ts +++ b/public/app/core/utils/datemath.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import moment from 'moment'; diff --git a/public/app/core/utils/emitter.ts b/public/app/core/utils/emitter.ts index 3ac19e57a6a..ae2489810a1 100644 --- a/public/app/core/utils/emitter.ts +++ b/public/app/core/utils/emitter.ts @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from 'eventemitter3'; export class Emitter { emitter: any; diff --git a/public/app/core/utils/rangeutil.ts b/public/app/core/utils/rangeutil.ts index d772d2b6c3e..95cfe42f0b8 100644 --- a/public/app/core/utils/rangeutil.ts +++ b/public/app/core/utils/rangeutil.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import moment from 'moment'; import * as dateMath from './datemath'; diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index 9073647fe61..29498f5d92b 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import { ThresholdMapper } from './threshold_mapper'; import { QueryPart } from 'app/core/components/query_part/query_part'; diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts index e0ac8359506..5cada3035a4 100644 --- a/public/app/features/alerting/notification_edit_ctrl.ts +++ b/public/app/features/alerting/notification_edit_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import { appEvents, coreModule } from 'app/core/core'; diff --git a/public/app/features/alerting/notifications_list_ctrl.ts b/public/app/features/alerting/notifications_list_ctrl.ts index c22f5d61b1a..1113ebd7ceb 100644 --- a/public/app/features/alerting/notifications_list_ctrl.ts +++ b/public/app/features/alerting/notifications_list_ctrl.ts @@ -1,5 +1,3 @@ -/// - import { coreModule } from 'app/core/core'; export class AlertNotificationsListCtrl { diff --git a/public/app/features/dashboard/acl/acl.ts b/public/app/features/dashboard/acl/acl.ts index f1f9b83dd5c..d65a41a28fe 100644 --- a/public/app/features/dashboard/acl/acl.ts +++ b/public/app/features/dashboard/acl/acl.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; import _ from 'lodash'; diff --git a/public/app/features/dashboard/ad_hoc_filters.ts b/public/app/features/dashboard/ad_hoc_filters.ts index 34f28b28b56..ee57db23675 100644 --- a/public/app/features/dashboard/ad_hoc_filters.ts +++ b/public/app/features/dashboard/ad_hoc_filters.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import angular from 'angular'; import coreModule from 'app/core/core_module'; diff --git a/public/app/features/dashboard/alerting_srv.ts b/public/app/features/dashboard/alerting_srv.ts index 6d0148b1391..446c3218f79 100644 --- a/public/app/features/dashboard/alerting_srv.ts +++ b/public/app/features/dashboard/alerting_srv.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; export class AlertingSrv { diff --git a/public/app/features/dashboard/save_modal.ts b/public/app/features/dashboard/save_modal.ts index 5b1730c0135..33165758555 100644 --- a/public/app/features/dashboard/save_modal.ts +++ b/public/app/features/dashboard/save_modal.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; const template = ` diff --git a/public/app/features/dashboard/submenu/submenu.ts b/public/app/features/dashboard/submenu/submenu.ts index 0d4f2462bda..ecf9616cf75 100644 --- a/public/app/features/dashboard/submenu/submenu.ts +++ b/public/app/features/dashboard/submenu/submenu.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import _ from 'lodash'; diff --git a/public/app/features/dashboard/time_srv.ts b/public/app/features/dashboard/time_srv.ts index e8339a06769..3f7b5836653 100644 --- a/public/app/features/dashboard/time_srv.ts +++ b/public/app/features/dashboard/time_srv.ts @@ -1,5 +1,3 @@ -/// - import moment from 'moment'; import _ from 'lodash'; import coreModule from 'app/core/core_module'; diff --git a/public/app/features/dashboard/unsaved_changes_modal.ts b/public/app/features/dashboard/unsaved_changes_modal.ts index fa327e036c1..cb83a1baa0c 100644 --- a/public/app/features/dashboard/unsaved_changes_modal.ts +++ b/public/app/features/dashboard/unsaved_changes_modal.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; const template = ` diff --git a/public/app/features/dashboard/upload.ts b/public/app/features/dashboard/upload.ts index 563ddfd490a..63941c89379 100644 --- a/public/app/features/dashboard/upload.ts +++ b/public/app/features/dashboard/upload.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; var template = ` diff --git a/public/app/features/org/prefs_control.ts b/public/app/features/org/prefs_control.ts index c21d495a004..76428b74a8f 100644 --- a/public/app/features/org/prefs_control.ts +++ b/public/app/features/org/prefs_control.ts @@ -1,5 +1,3 @@ -/// - import config from 'app/core/config'; import coreModule from 'app/core/core_module'; diff --git a/public/app/features/org/teams_ctrl.ts b/public/app/features/org/teams_ctrl.ts index ea7c706a46f..29317e73d3b 100644 --- a/public/app/features/org/teams_ctrl.ts +++ b/public/app/features/org/teams_ctrl.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; import appEvents from 'app/core/app_events'; diff --git a/public/app/features/panel/panel_editor_tab.ts b/public/app/features/panel/panel_editor_tab.ts index fb74abaf1f4..89eaba88299 100644 --- a/public/app/features/panel/panel_editor_tab.ts +++ b/public/app/features/panel/panel_editor_tab.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; var directiveModule = angular.module('grafana.directives'); diff --git a/public/app/features/panel/panel_header.ts b/public/app/features/panel/panel_header.ts index ca6ed68b648..f65be321207 100644 --- a/public/app/features/panel/panel_header.ts +++ b/public/app/features/panel/panel_header.ts @@ -1,5 +1,3 @@ -/// - import $ from 'jquery'; import { coreModule } from 'app/core/core'; diff --git a/public/app/features/panel/query_ctrl.ts b/public/app/features/panel/query_ctrl.ts index 4b9d8e0d07a..371d2852659 100644 --- a/public/app/features/panel/query_ctrl.ts +++ b/public/app/features/panel/query_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; export class QueryCtrl { diff --git a/public/app/features/panel/query_editor_row.ts b/public/app/features/panel/query_editor_row.ts index bfc2de2451b..00220f83aa7 100644 --- a/public/app/features/panel/query_editor_row.ts +++ b/public/app/features/panel/query_editor_row.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; var module = angular.module('grafana.directives'); diff --git a/public/app/features/panel/query_troubleshooter.ts b/public/app/features/panel/query_troubleshooter.ts index 2db730560fd..537bfa79cdd 100644 --- a/public/app/features/panel/query_troubleshooter.ts +++ b/public/app/features/panel/query_troubleshooter.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import appEvents from 'app/core/app_events'; import { coreModule, JsonExplorer } from 'app/core/core'; diff --git a/public/app/features/playlist/playlist_search.ts b/public/app/features/playlist/playlist_search.ts index 898dfbd2937..3b80cfdf640 100644 --- a/public/app/features/playlist/playlist_search.ts +++ b/public/app/features/playlist/playlist_search.ts @@ -1,5 +1,3 @@ -/// - import coreModule from '../../core/core_module'; export class PlaylistSearchCtrl { diff --git a/public/app/features/playlist/playlist_srv.ts b/public/app/features/playlist/playlist_srv.ts index 8e61fdf1f15..9b5d67a4f6f 100644 --- a/public/app/features/playlist/playlist_srv.ts +++ b/public/app/features/playlist/playlist_srv.ts @@ -1,5 +1,3 @@ -/// - import coreModule from '../../core/core_module'; import kbn from 'app/core/utils/kbn'; import appEvents from 'app/core/app_events'; diff --git a/public/app/features/playlist/playlists_ctrl.ts b/public/app/features/playlist/playlists_ctrl.ts index c18f8e7ee46..bc7e2bb1440 100644 --- a/public/app/features/playlist/playlists_ctrl.ts +++ b/public/app/features/playlist/playlists_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import coreModule from '../../core/core_module'; diff --git a/public/app/features/plugins/import_list/import_list.ts b/public/app/features/plugins/import_list/import_list.ts index 92fc89e0996..f3c1168124d 100644 --- a/public/app/features/plugins/import_list/import_list.ts +++ b/public/app/features/plugins/import_list/import_list.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import coreModule from 'app/core/core_module'; import appEvents from 'app/core/app_events'; diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts index 37a4db82d51..1f610f51688 100644 --- a/public/app/features/plugins/plugin_edit_ctrl.ts +++ b/public/app/features/plugins/plugin_edit_ctrl.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import _ from 'lodash'; import Remarkable from 'remarkable'; diff --git a/public/app/features/plugins/row_ctrl.ts b/public/app/features/plugins/row_ctrl.ts index 998bd81c141..90fc0d07e38 100644 --- a/public/app/features/plugins/row_ctrl.ts +++ b/public/app/features/plugins/row_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; export class DashboardRowCtrl { diff --git a/public/app/features/snapshot/snapshot_ctrl.ts b/public/app/features/snapshot/snapshot_ctrl.ts index 7969707a529..1edeafe0f6f 100644 --- a/public/app/features/snapshot/snapshot_ctrl.ts +++ b/public/app/features/snapshot/snapshot_ctrl.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import _ from 'lodash'; diff --git a/public/app/features/templating/constant_variable.ts b/public/app/features/templating/constant_variable.ts index 5523619c347..f2fb4294537 100644 --- a/public/app/features/templating/constant_variable.ts +++ b/public/app/features/templating/constant_variable.ts @@ -1,5 +1,3 @@ -/// - import { Variable, assignModelProperties, variableTypes } from './variable'; export class ConstantVariable implements Variable { diff --git a/public/app/features/templating/custom_variable.ts b/public/app/features/templating/custom_variable.ts index 12dfac43a71..c15178f6644 100644 --- a/public/app/features/templating/custom_variable.ts +++ b/public/app/features/templating/custom_variable.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import { Variable, assignModelProperties, variableTypes } from './variable'; diff --git a/public/app/features/templating/datasource_variable.ts b/public/app/features/templating/datasource_variable.ts index b3b35c281b3..0c5b226c372 100644 --- a/public/app/features/templating/datasource_variable.ts +++ b/public/app/features/templating/datasource_variable.ts @@ -1,5 +1,3 @@ -/// - import kbn from 'app/core/utils/kbn'; import { Variable, containsVariable, assignModelProperties, variableTypes } from './variable'; diff --git a/public/app/features/templating/interval_variable.ts b/public/app/features/templating/interval_variable.ts index 30583a8154b..3faac316f98 100644 --- a/public/app/features/templating/interval_variable.ts +++ b/public/app/features/templating/interval_variable.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import kbn from 'app/core/utils/kbn'; import { Variable, assignModelProperties, variableTypes } from './variable'; diff --git a/public/app/features/templating/variable_srv.ts b/public/app/features/templating/variable_srv.ts index 217d568a34f..fb882516e85 100644 --- a/public/app/features/templating/variable_srv.ts +++ b/public/app/features/templating/variable_srv.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import _ from 'lodash'; import coreModule from 'app/core/core_module'; diff --git a/public/app/headers/common.d.ts b/public/app/headers/common.d.ts deleted file mode 100644 index a774a4d50e9..00000000000 --- a/public/app/headers/common.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -declare var System: any; - -declare module 'eventemitter3' { - var config: any; - export default config; -} - -declare module 'gemini-scrollbar' { - var d3: any; - export default d3; -} diff --git a/public/app/plugins/app/testdata/module.ts b/public/app/plugins/app/testdata/module.ts index cc695040d5f..812aba20464 100644 --- a/public/app/plugins/app/testdata/module.ts +++ b/public/app/plugins/app/testdata/module.ts @@ -1,5 +1,3 @@ -/// - export class ConfigCtrl { static template = ''; diff --git a/public/app/plugins/datasource/cloudwatch/config_ctrl.ts b/public/app/plugins/datasource/cloudwatch/config_ctrl.ts index f1494623266..ff0d39944ca 100644 --- a/public/app/plugins/datasource/cloudwatch/config_ctrl.ts +++ b/public/app/plugins/datasource/cloudwatch/config_ctrl.ts @@ -1,5 +1,3 @@ -/// - export class CloudWatchConfigCtrl { static templateUrl = 'partials/config.html'; current: any; diff --git a/public/app/plugins/datasource/cloudwatch/query_ctrl.ts b/public/app/plugins/datasource/cloudwatch/query_ctrl.ts index 297afbe486f..0d250935445 100644 --- a/public/app/plugins/datasource/cloudwatch/query_ctrl.ts +++ b/public/app/plugins/datasource/cloudwatch/query_ctrl.ts @@ -1,5 +1,3 @@ -/// - import './query_parameter_ctrl'; import { QueryCtrl } from 'app/plugins/sdk'; diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts index 62c8f176407..1c9f46867f9 100644 --- a/public/app/plugins/datasource/elasticsearch/datasource.ts +++ b/public/app/plugins/datasource/elasticsearch/datasource.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import _ from 'lodash'; import moment from 'moment'; diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.ts b/public/app/plugins/datasource/elasticsearch/elastic_response.ts index 0c103f046da..6b18572caf7 100644 --- a/public/app/plugins/datasource/elasticsearch/elastic_response.ts +++ b/public/app/plugins/datasource/elasticsearch/elastic_response.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import * as queryDef from './query_def'; import TableModel from 'app/core/table_model'; diff --git a/public/app/plugins/datasource/elasticsearch/query_ctrl.ts b/public/app/plugins/datasource/elasticsearch/query_ctrl.ts index 450824605dd..9364d03899a 100644 --- a/public/app/plugins/datasource/elasticsearch/query_ctrl.ts +++ b/public/app/plugins/datasource/elasticsearch/query_ctrl.ts @@ -1,5 +1,3 @@ -/// - import './bucket_agg'; import './metric_agg'; diff --git a/public/app/plugins/datasource/elasticsearch/query_def.ts b/public/app/plugins/datasource/elasticsearch/query_def.ts index 8e9d6e5c717..bd4f9b1817e 100644 --- a/public/app/plugins/datasource/elasticsearch/query_def.ts +++ b/public/app/plugins/datasource/elasticsearch/query_def.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; export const metricAggTypes = [ diff --git a/public/app/plugins/datasource/grafana-live/datasource.ts b/public/app/plugins/datasource/grafana-live/datasource.ts index dcf2ec0d21c..5cba43dd2f9 100644 --- a/public/app/plugins/datasource/grafana-live/datasource.ts +++ b/public/app/plugins/datasource/grafana-live/datasource.ts @@ -1,5 +1,3 @@ -/// - import { liveSrv } from 'app/core/core'; class DataObservable { diff --git a/public/app/plugins/datasource/grafana-live/module.ts b/public/app/plugins/datasource/grafana-live/module.ts index 81e65253efb..d75680a494b 100644 --- a/public/app/plugins/datasource/grafana-live/module.ts +++ b/public/app/plugins/datasource/grafana-live/module.ts @@ -1,5 +1,3 @@ -/// - import { GrafanaStreamDS } from './datasource'; import { QueryCtrl } from 'app/plugins/sdk'; diff --git a/public/app/plugins/datasource/graphite/config_ctrl.ts b/public/app/plugins/datasource/graphite/config_ctrl.ts index daa318e1693..16a25bacbe5 100644 --- a/public/app/plugins/datasource/graphite/config_ctrl.ts +++ b/public/app/plugins/datasource/graphite/config_ctrl.ts @@ -1,5 +1,3 @@ -/// - export class GraphiteConfigCtrl { static templateUrl = 'public/app/plugins/datasource/graphite/partials/config.html'; datasourceSrv: any; diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts index e8750999936..38133f801d8 100644 --- a/public/app/plugins/datasource/graphite/datasource.ts +++ b/public/app/plugins/datasource/graphite/datasource.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import * as dateMath from 'app/core/utils/datemath'; import { isVersionGtOrEq, SemVersion } from 'app/core/utils/version'; diff --git a/public/app/plugins/datasource/graphite/lexer.ts b/public/app/plugins/datasource/graphite/lexer.ts index 7c813b6b7f7..744ce2fcc3f 100644 --- a/public/app/plugins/datasource/graphite/lexer.ts +++ b/public/app/plugins/datasource/graphite/lexer.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; // This is auto generated from the unicode tables. diff --git a/public/app/plugins/datasource/influxdb/influx_query.ts b/public/app/plugins/datasource/influxdb/influx_query.ts index 0e3d6312afe..656647b4413 100644 --- a/public/app/plugins/datasource/influxdb/influx_query.ts +++ b/public/app/plugins/datasource/influxdb/influx_query.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import queryPart from './query_part'; import kbn from 'app/core/utils/kbn'; diff --git a/public/app/plugins/datasource/influxdb/query_part.ts b/public/app/plugins/datasource/influxdb/query_part.ts index adf8855d5c6..ce5588abe53 100644 --- a/public/app/plugins/datasource/influxdb/query_part.ts +++ b/public/app/plugins/datasource/influxdb/query_part.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import { QueryPartDef, QueryPart, functionRenderer, suffixRenderer } from 'app/core/components/query_part/query_part'; diff --git a/public/app/plugins/datasource/mixed/datasource.ts b/public/app/plugins/datasource/mixed/datasource.ts index 559eeb0aa6e..f12f93f14ad 100644 --- a/public/app/plugins/datasource/mixed/datasource.ts +++ b/public/app/plugins/datasource/mixed/datasource.ts @@ -1,5 +1,3 @@ -/// - import angular from 'angular'; import _ from 'lodash'; diff --git a/public/app/plugins/datasource/mixed/module.ts b/public/app/plugins/datasource/mixed/module.ts index 624aefc0998..6ae72be9a45 100644 --- a/public/app/plugins/datasource/mixed/module.ts +++ b/public/app/plugins/datasource/mixed/module.ts @@ -1,4 +1,2 @@ -/// - import { MixedDatasource } from './datasource'; export { MixedDatasource, MixedDatasource as Datasource }; diff --git a/public/app/plugins/datasource/mysql/datasource.ts b/public/app/plugins/datasource/mysql/datasource.ts index 9894cc8623c..42fcf7b4564 100644 --- a/public/app/plugins/datasource/mysql/datasource.ts +++ b/public/app/plugins/datasource/mysql/datasource.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import ResponseParser from './response_parser'; diff --git a/public/app/plugins/datasource/mysql/module.ts b/public/app/plugins/datasource/mysql/module.ts index b5c56181889..bb5b5bd9056 100644 --- a/public/app/plugins/datasource/mysql/module.ts +++ b/public/app/plugins/datasource/mysql/module.ts @@ -1,5 +1,3 @@ -/// - import { MysqlDatasource } from './datasource'; import { MysqlQueryCtrl } from './query_ctrl'; diff --git a/public/app/plugins/datasource/mysql/query_ctrl.ts b/public/app/plugins/datasource/mysql/query_ctrl.ts index cdc8e16a687..4961ce9e653 100644 --- a/public/app/plugins/datasource/mysql/query_ctrl.ts +++ b/public/app/plugins/datasource/mysql/query_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import { QueryCtrl } from 'app/plugins/sdk'; diff --git a/public/app/plugins/datasource/mysql/response_parser.ts b/public/app/plugins/datasource/mysql/response_parser.ts index 6689ec72b9b..3db2dfe6ac3 100644 --- a/public/app/plugins/datasource/mysql/response_parser.ts +++ b/public/app/plugins/datasource/mysql/response_parser.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; export default class ResponseParser { diff --git a/public/app/plugins/datasource/opentsdb/config_ctrl.ts b/public/app/plugins/datasource/opentsdb/config_ctrl.ts index 24fc7a2a420..2276c0e4a14 100644 --- a/public/app/plugins/datasource/opentsdb/config_ctrl.ts +++ b/public/app/plugins/datasource/opentsdb/config_ctrl.ts @@ -1,5 +1,3 @@ -/// - export class OpenTsConfigCtrl { static templateUrl = 'public/app/plugins/datasource/opentsdb/partials/config.html'; current: any; diff --git a/public/app/plugins/datasource/opentsdb/query_ctrl.ts b/public/app/plugins/datasource/opentsdb/query_ctrl.ts index 628bdd9f0ce..5808571e820 100644 --- a/public/app/plugins/datasource/opentsdb/query_ctrl.ts +++ b/public/app/plugins/datasource/opentsdb/query_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import kbn from 'app/core/utils/kbn'; import { QueryCtrl } from 'app/plugins/sdk'; diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts index dd39da5d18d..8eee389d1a5 100644 --- a/public/app/plugins/datasource/postgres/datasource.ts +++ b/public/app/plugins/datasource/postgres/datasource.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import ResponseParser from './response_parser'; diff --git a/public/app/plugins/datasource/postgres/module.ts b/public/app/plugins/datasource/postgres/module.ts index 2ff50dd06b9..acd23318b6d 100644 --- a/public/app/plugins/datasource/postgres/module.ts +++ b/public/app/plugins/datasource/postgres/module.ts @@ -1,5 +1,3 @@ -/// - import { PostgresDatasource } from './datasource'; import { PostgresQueryCtrl } from './query_ctrl'; diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts index 6f928a1755c..7afd0cf7253 100644 --- a/public/app/plugins/datasource/postgres/query_ctrl.ts +++ b/public/app/plugins/datasource/postgres/query_ctrl.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import { QueryCtrl } from 'app/plugins/sdk'; diff --git a/public/app/plugins/datasource/postgres/response_parser.ts b/public/app/plugins/datasource/postgres/response_parser.ts index d78f406541a..620aba5fa7e 100644 --- a/public/app/plugins/datasource/postgres/response_parser.ts +++ b/public/app/plugins/datasource/postgres/response_parser.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; export default class ResponseParser { diff --git a/public/app/plugins/datasource/prometheus/completer.ts b/public/app/plugins/datasource/prometheus/completer.ts index 32e2c4aa0f4..81c3786a932 100644 --- a/public/app/plugins/datasource/prometheus/completer.ts +++ b/public/app/plugins/datasource/prometheus/completer.ts @@ -1,5 +1,3 @@ -/// - import { PrometheusDatasource } from './datasource'; import _ from 'lodash'; diff --git a/public/app/plugins/panel/alertlist/module.ts b/public/app/plugins/panel/alertlist/module.ts index 45cbcc7c0d3..1b18c4183a7 100644 --- a/public/app/plugins/panel/alertlist/module.ts +++ b/public/app/plugins/panel/alertlist/module.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import moment from 'moment'; import alertDef from '../../../features/alerting/alert_def'; diff --git a/public/app/plugins/panel/gettingstarted/module.ts b/public/app/plugins/panel/gettingstarted/module.ts index 1155cb98209..cfb7016625f 100644 --- a/public/app/plugins/panel/gettingstarted/module.ts +++ b/public/app/plugins/panel/gettingstarted/module.ts @@ -1,5 +1,3 @@ -/// - import { PanelCtrl } from 'app/plugins/sdk'; import { contextSrv } from 'app/core/core'; diff --git a/public/app/plugins/panel/graph/axes_editor.ts b/public/app/plugins/panel/graph/axes_editor.ts index d4aa0e8b486..cf870c18b49 100644 --- a/public/app/plugins/panel/graph/axes_editor.ts +++ b/public/app/plugins/panel/graph/axes_editor.ts @@ -1,5 +1,3 @@ -/// - import kbn from 'app/core/utils/kbn'; export class AxesEditorCtrl { diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index bf804180248..59e72124c74 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -1,5 +1,3 @@ -/// - import './graph'; import './legend'; import './series_overrides_ctrl'; diff --git a/public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts b/public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts index e3380cb86c7..d5cefb345cf 100644 --- a/public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts +++ b/public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts @@ -1,5 +1,3 @@ -/// - import { describe, beforeEach, it, expect, angularMocks } from '../../../../../test/lib/common'; import moment from 'moment'; diff --git a/public/app/plugins/panel/graph/specs/graph_specs.ts b/public/app/plugins/panel/graph/specs/graph_specs.ts index 29206c0f49c..176bb65b806 100644 --- a/public/app/plugins/panel/graph/specs/graph_specs.ts +++ b/public/app/plugins/panel/graph/specs/graph_specs.ts @@ -1,5 +1,3 @@ -/// - import { describe, beforeEach, it, sinon, expect, angularMocks } from '../../../../../test/lib/common'; import '../module'; diff --git a/public/app/plugins/panel/graph/specs/threshold_manager_specs.ts b/public/app/plugins/panel/graph/specs/threshold_manager_specs.ts index d4ef105190b..ec219642401 100644 --- a/public/app/plugins/panel/graph/specs/threshold_manager_specs.ts +++ b/public/app/plugins/panel/graph/specs/threshold_manager_specs.ts @@ -1,5 +1,3 @@ -/// - import { describe, it, expect } from '../../../../../test/lib/common'; import { ThresholdManager } from '../threshold_manager'; diff --git a/public/app/plugins/panel/graph/specs/tooltip_specs.ts b/public/app/plugins/panel/graph/specs/tooltip_specs.ts index 960f5fbfc80..c12697eadac 100644 --- a/public/app/plugins/panel/graph/specs/tooltip_specs.ts +++ b/public/app/plugins/panel/graph/specs/tooltip_specs.ts @@ -1,5 +1,3 @@ -/// - import { describe, beforeEach, it, sinon, expect } from '../../../../../test/lib/common'; import $ from 'jquery'; diff --git a/public/app/plugins/panel/graph/thresholds_form.ts b/public/app/plugins/panel/graph/thresholds_form.ts index bd6911bd4e3..48b2112e4bc 100644 --- a/public/app/plugins/panel/graph/thresholds_form.ts +++ b/public/app/plugins/panel/graph/thresholds_form.ts @@ -1,5 +1,3 @@ -/// - import coreModule from 'app/core/core_module'; export class ThresholdFormCtrl { diff --git a/public/app/plugins/panel/heatmap/axes_editor.ts b/public/app/plugins/panel/heatmap/axes_editor.ts index ed213b31acb..05ed63e0289 100644 --- a/public/app/plugins/panel/heatmap/axes_editor.ts +++ b/public/app/plugins/panel/heatmap/axes_editor.ts @@ -1,5 +1,3 @@ -/// - import kbn from 'app/core/utils/kbn'; export class AxesEditorCtrl { diff --git a/public/app/plugins/panel/heatmap/display_editor.ts b/public/app/plugins/panel/heatmap/display_editor.ts index 775017b00da..b30c77a1733 100644 --- a/public/app/plugins/panel/heatmap/display_editor.ts +++ b/public/app/plugins/panel/heatmap/display_editor.ts @@ -1,5 +1,3 @@ -/// - export class HeatmapDisplayEditorCtrl { panel: any; panelCtrl: any; diff --git a/public/app/plugins/panel/heatmap/specs/heatmap_ctrl_specs.ts b/public/app/plugins/panel/heatmap/specs/heatmap_ctrl_specs.ts index af076836a18..98055ccf52d 100644 --- a/public/app/plugins/panel/heatmap/specs/heatmap_ctrl_specs.ts +++ b/public/app/plugins/panel/heatmap/specs/heatmap_ctrl_specs.ts @@ -1,5 +1,3 @@ -/// - import { describe, beforeEach, it, expect, angularMocks } from '../../../../../test/lib/common'; import moment from 'moment'; diff --git a/public/app/plugins/panel/heatmap/specs/renderer_specs.ts b/public/app/plugins/panel/heatmap/specs/renderer_specs.ts index 29c5398a03b..6c1a94c96eb 100644 --- a/public/app/plugins/panel/heatmap/specs/renderer_specs.ts +++ b/public/app/plugins/panel/heatmap/specs/renderer_specs.ts @@ -1,5 +1,3 @@ -/// - import { describe, beforeEach, it, sinon, expect, angularMocks } from '../../../../../test/lib/common'; import '../module'; diff --git a/public/app/plugins/panel/table/column_options.ts b/public/app/plugins/panel/table/column_options.ts index 04b27c610d2..9facfbeac9c 100644 --- a/public/app/plugins/panel/table/column_options.ts +++ b/public/app/plugins/panel/table/column_options.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import kbn from 'app/core/utils/kbn'; diff --git a/public/app/plugins/panel/table/editor.ts b/public/app/plugins/panel/table/editor.ts index 027bf6cc918..7358f10bca0 100644 --- a/public/app/plugins/panel/table/editor.ts +++ b/public/app/plugins/panel/table/editor.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import { transformers } from './transformers'; diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts index 46f3088bcd8..27eab205f09 100644 --- a/public/app/plugins/panel/table/module.ts +++ b/public/app/plugins/panel/table/module.ts @@ -1,5 +1,3 @@ -/// - import _ from 'lodash'; import $ from 'jquery'; import { MetricsPanelCtrl } from 'app/plugins/sdk'; diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts index ffdeb82546d..c7e75678c16 100644 --- a/public/app/plugins/panel/text/module.ts +++ b/public/app/plugins/panel/text/module.ts @@ -1,7 +1,6 @@ -/// - import _ from 'lodash'; import { PanelCtrl } from 'app/plugins/sdk'; +import Remarkable from 'remarkable'; export class TextPanelCtrl extends PanelCtrl { static templateUrl = `public/app/plugins/panel/text/module.html`; @@ -66,11 +65,9 @@ export class TextPanelCtrl extends PanelCtrl { renderMarkdown(content) { if (!this.remarkable) { - return System.import('remarkable').then(Remarkable => { - this.remarkable = new Remarkable(); - this.$scope.$apply(() => { - this.updateContent(this.remarkable.render(content)); - }); + this.remarkable = new Remarkable(); + this.$scope.$apply(() => { + this.updateContent(this.remarkable.render(content)); }); }