Browse Source

tech: upgrade of systemjs to 0.20.x working

Torkel Ödegaard 8 years ago
parent
commit
73295ab3ed

+ 1 - 1
package.json

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

+ 1 - 1
public/app/plugins/datasource/cloudwatch/datasource.d.ts

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

+ 1 - 3
public/app/plugins/datasource/cloudwatch/datasource.js

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

+ 1 - 1
public/app/plugins/datasource/cloudwatch/module.ts

@@ -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';
 

+ 1 - 1
public/app/plugins/datasource/cloudwatch/specs/annotation_query_specs.ts

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

+ 1 - 1
public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts

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

+ 1 - 1
public/app/plugins/datasource/opentsdb/datasource.d.ts

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

+ 1 - 3
public/app/plugins/datasource/opentsdb/datasource.js

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

+ 1 - 1
public/app/plugins/datasource/opentsdb/module.ts

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

+ 1 - 1
public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts

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

+ 3 - 5
yarn.lock

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