IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

tech: upgrade of systemjs to 0.20.x working

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-09-28 14:08:59 +02:00
parent 8950f57050
commit 73295ab3ed
11 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

2
public/app/plugins/datasource/cloudwatch/datasource.d.ts vendored
View File

@ -1,3 +1,3 @@
declare var CloudWatchDatasource: any;
export {CloudWatchDatasource};
export default CloudWatchDatasource;

4
public/app/plugins/datasource/cloudwatch/datasource.js
View File

@ -471,7 +471,5 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
}
return {
CloudWatchDatasource: CloudWatchDatasource
};
return CloudWatchDatasource;
});

2
public/app/plugins/datasource/cloudwatch/module.ts
View File

@ -1,6 +1,6 @@
import './query_parameter_ctrl';
import {CloudWatchDatasource} from './datasource';
import CloudWatchDatasource from './datasource';
import {CloudWatchQueryCtrl} from './query_ctrl';
import {CloudWatchConfigCtrl} from './config_ctrl';

2
public/app/plugins/datasource/cloudwatch/specs/annotation_query_specs.ts
View File

@ -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
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
View File

@ -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();

2
public/app/plugins/datasource/opentsdb/datasource.d.ts vendored
View File

@ -1,3 +1,3 @@
declare var OpenTsDatasource: any;
export {OpenTsDatasource};
export default OpenTsDatasource;

4
public/app/plugins/datasource/opentsdb/datasource.js
View File

@ -472,7 +472,5 @@ function (angular, _, dateMath) {
}
}
return {
OpenTsDatasource: OpenTsDatasource
};
return OpenTsDatasource;
});

2
public/app/plugins/datasource/opentsdb/module.ts
View File

@ -1,4 +1,4 @@
import {OpenTsDatasource} from './datasource';
import OpenTsDatasource from './datasource';
import {OpenTsQueryCtrl} from './query_ctrl';
import {OpenTsConfigCtrl} from './config_ctrl';

2
public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
View File

@ -1,6 +1,6 @@
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();

8
yarn.lock
View File

@ -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"