Commit 73295ab3 by Torkel Ödegaard

tech: upgrade of systemjs to 0.20.x working

parent 8950f570
......@@ -50,7 +50,7 @@
"phantomjs-prebuilt": "^2.1.15",
"rxjs": "^5.4.3",
"sass-lint": "^1.10.2",
"systemjs": "0.19.41"
"systemjs": "0.20.19"
},
"scripts": {
"build": "./node_modules/grunt-cli/bin/grunt",
......
declare var CloudWatchDatasource: any;
export {CloudWatchDatasource};
export default CloudWatchDatasource;
......@@ -471,7 +471,5 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
}
return {
CloudWatchDatasource: CloudWatchDatasource
};
return CloudWatchDatasource;
});
import './query_parameter_ctrl';
import {CloudWatchDatasource} from './datasource';
import CloudWatchDatasource from './datasource';
import {CloudWatchQueryCtrl} from './query_ctrl';
import {CloudWatchConfigCtrl} from './config_ctrl';
......
......@@ -2,7 +2,7 @@ import "../datasource";
import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
import moment from 'moment';
import helpers from 'test/specs/helpers';
import {CloudWatchDatasource} from "../datasource";
import CloudWatchDatasource from "../datasource";
import CloudWatchAnnotationQuery from '../annotation_query';
describe('CloudWatchAnnotationQuery', function() {
......
......@@ -2,7 +2,7 @@
import "../datasource";
import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
import helpers from 'test/specs/helpers';
import {CloudWatchDatasource} from "../datasource";
import CloudWatchDatasource from "../datasource";
describe('CloudWatchDatasource', function() {
var ctx = new helpers.ServiceTestContext();
......
declare var OpenTsDatasource: any;
export {OpenTsDatasource};
export default OpenTsDatasource;
......@@ -472,7 +472,5 @@ function (angular, _, dateMath) {
}
}
return {
OpenTsDatasource: OpenTsDatasource
};
return OpenTsDatasource;
});
import {OpenTsDatasource} from './datasource';
import OpenTsDatasource from './datasource';
import {OpenTsQueryCtrl} from './query_ctrl';
import {OpenTsConfigCtrl} from './config_ctrl';
......
import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
import helpers from 'test/specs/helpers';
import {OpenTsDatasource} from "../datasource";
import OpenTsDatasource from "../datasource";
describe('opentsdb', function() {
var ctx = new helpers.ServiceTestContext();
......
......@@ -4448,11 +4448,9 @@ systemjs-builder@^0.16.10:
traceur "0.0.105"
uglify-js "^2.6.1"
systemjs@0.19.41:
version "0.19.41"
resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.19.41.tgz#835d2c0f10bf403b551fedc875f84bb44a02c4eb"
dependencies:
when "^3.7.5"
systemjs@0.20.19:
version "0.20.19"
resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.20.19.tgz#c2b9e79c19f4bea53a19b1ed3f974ffb463be949"
systemjs@^0.19.46:
version "0.19.47"
......
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