Commit eb4e71e2 by Daniel Lee

plugins: expose more util and flot dependencies

Also, fix for coremodules export. Have to add the __esModule
attribute to fool SystemJS.
parent c215f0b5
...@@ -12,6 +12,9 @@ import {coreModule, appEvents, contextSrv} from 'app/core/core'; ...@@ -12,6 +12,9 @@ import {coreModule, appEvents, contextSrv} from 'app/core/core';
import {Observable} from 'rxjs/Observable'; import {Observable} from 'rxjs/Observable';
import {Subject} from 'rxjs/Subject'; import {Subject} from 'rxjs/Subject';
import * as datemath from 'app/core/utils/datemath'; import * as datemath from 'app/core/utils/datemath';
import * as fileExport from 'app/core/utils/file_export';
import * as flatten from 'app/core/utils/flatten';
import * as ticks from 'app/core/utils/ticks';
import builtInPlugins from './buit_in_plugins'; import builtInPlugins from './buit_in_plugins';
import d3 from 'vendor/d3/d3'; import d3 from 'vendor/d3/d3';
...@@ -54,19 +57,24 @@ exposeToPlugin('rxjs/Observable', Observable); ...@@ -54,19 +57,24 @@ exposeToPlugin('rxjs/Observable', Observable);
exposeToPlugin('d3', d3); exposeToPlugin('d3', d3);
exposeToPlugin('app/plugins/sdk', sdk); exposeToPlugin('app/plugins/sdk', sdk);
exposeToPlugin('app/core/utils/datemath', datemath); exposeToPlugin('app/core/utils/datemath', datemath);
exposeToPlugin('app/core/utils/file_export', fileExport);
exposeToPlugin('app/core/utils/flatten', flatten);
exposeToPlugin('app/core/utils/kbn', kbn); exposeToPlugin('app/core/utils/kbn', kbn);
exposeToPlugin('app/core/utils/ticks', ticks);
exposeToPlugin('app/core/config', config); exposeToPlugin('app/core/config', config);
exposeToPlugin('app/core/time_series', TimeSeries); exposeToPlugin('app/core/time_series', TimeSeries);
exposeToPlugin('app/core/time_series2', TimeSeries); exposeToPlugin('app/core/time_series2', TimeSeries);
exposeToPlugin('app/core/table_model', TableModel); exposeToPlugin('app/core/table_model', TableModel);
exposeToPlugin('app/core/app_events', appEvents); exposeToPlugin('app/core/app_events', appEvents);
exposeToPlugin('app/core/core_module', coreModule); exposeToPlugin('app/core/core_module', coreModule);
exposeToPlugin('app/core/core_module', coreModule);
exposeToPlugin('app/core/core', { exposeToPlugin('app/core/core', {
coreModule: coreModule, coreModule: coreModule,
appEvents: appEvents, appEvents: appEvents,
contextSrv: contextSrv, contextSrv: contextSrv,
__esModule: true
}); });
import 'vendor/flot/jquery.flot'; import 'vendor/flot/jquery.flot';
...@@ -79,7 +87,11 @@ import 'vendor/flot/jquery.flot.fillbelow'; ...@@ -79,7 +87,11 @@ import 'vendor/flot/jquery.flot.fillbelow';
import 'vendor/flot/jquery.flot.crosshair'; import 'vendor/flot/jquery.flot.crosshair';
import 'vendor/flot/jquery.flot.dashes'; import 'vendor/flot/jquery.flot.dashes';
for (let flotDep of ['jquery.flot', 'jquery.flot.pie', 'jquery.flot.time']) { const flotDeps = [
'jquery.flot', 'jquery.flot.pie', 'jquery.flot.time', 'jquery.flot.fillbelow', 'jquery.flot.crosshair',
'jquery.flot.stack', 'jquery.flot.selection', 'jquery.flot.stackpercent', 'jquery.flot.events'
];
for (let flotDep of flotDeps) {
exposeToPlugin(flotDep, {fakeDep: 1}); exposeToPlugin(flotDep, {fakeDep: 1});
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment