initial webpack build, #632

src/datasource-zabbix/datasource.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import * as dateMath from 'app/core/utils/datemath';
+import * as dateMath from 'grafana/app/core/utils/datemath';
 import * as utils from './utils';
 import * as migrations from './migrations';
 import * as metricFunctions from './metricFunctions';

src/datasource-zabbix/module.js

@@ -1,4 +1,3 @@
-import { loadPluginCss } from 'app/plugins/sdk';
 import { ZabbixDatasource } from './datasource';
 import { ZabbixQueryController } from './query.controller';
 import { ZabbixDSConfigController } from './config.controller';
@@ -6,11 +5,6 @@ import './zabbixAlerting.service.js';
 import './add-metric-function.directive';
 import './metric-function-editor.directive';
 
-loadPluginCss({
-  dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css',
-  light: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.light.css'
-});
-
 class ZabbixQueryOptionsController {}
 ZabbixQueryOptionsController.templateUrl = 'datasource-zabbix/partials/query.options.html';
 

src/datasource-zabbix/query.controller.js

@@ -1,4 +1,4 @@
-import { QueryCtrl } from 'app/plugins/sdk';
+import { QueryCtrl } from 'grafana/app/plugins/sdk';
 import _ from 'lodash';
 import * as c from './constants';
 import * as utils from './utils';

src/datasource-zabbix/responseHandler.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import TableModel from 'app/core/table_model';
+import TableModel from 'grafana/app/core/table_model';
 import * as c from './constants';
 
 /**

src/module.js

@@ -1,5 +1,8 @@
+import './sass/grafana-zabbix.dark.scss';
+import './sass/grafana-zabbix.light.scss';
+
 import {ZabbixAppConfigCtrl} from './components/config';
-import {loadPluginCss} from 'app/plugins/sdk';
+import {loadPluginCss} from 'grafana/app/plugins/sdk';
 
 loadPluginCss({
   dark: 'plugins/alexanderzobnin-zabbix-app/css/grafana-zabbix.dark.css',

src/panel-triggers/ack-tooltip.directive.js

@@ -1,16 +1,17 @@
-import angular from 'angular';
 import $ from 'jquery';
+import angular from 'angular';
+import Drop from 'tether-drop';
 
-System.config({
-  paths: {
-    tether: System.getConfig().baseURL + "plugins/alexanderzobnin-zabbix-app/vendor/npm/tether.min.js"
-  }
-});
+// System.config({
+//   paths: {
+//     tether: System.getConfig().baseURL + "plugins/alexanderzobnin-zabbix-app/vendor/npm/tether.min.js"
+//   }
+// });
 
-let Drop;
-System.amdRequire(["plugins/alexanderzobnin-zabbix-app/vendor/npm/drop.min.js"], (drop) => {
-  Drop = drop;
-});
+// let Drop;
+// System.amdRequire(["plugins/alexanderzobnin-zabbix-app/vendor/npm/drop.min.js"], (drop) => {
+//   Drop = drop;
+// });
 
 /** @ngInject */
 angular

src/panel-triggers/module.js

@@ -12,7 +12,7 @@
  */
 
 import {TriggerPanelCtrl} from './triggers_panel_ctrl';
-import {loadPluginCss} from 'app/plugins/sdk';
+import {loadPluginCss} from 'grafana/app/plugins/sdk';
 import './datasource-selector.directive';
 import './ack-tooltip.directive';
 

src/panel-triggers/triggers_panel_ctrl.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import $ from 'jquery';
 import moment from 'moment';
 import * as utils from '../datasource-zabbix/utils';
-import {PanelCtrl} from 'app/plugins/sdk';
+import {PanelCtrl} from 'grafana/app/plugins/sdk';
 import {triggerPanelOptionsTab} from './options_tab';
 import {triggerPanelTriggersTab} from './triggers_tab';
 import {migratePanelSchema, CURRENT_SCHEMA_VERSION} from './migrations';