mirror of
https://github.com/grafana/grafana.git
synced 2025-01-07 22:53:56 -06:00
tech(systemjs): work on systemjs builder
This commit is contained in:
parent
0dd7fb7361
commit
93e424de4c
@ -57,7 +57,6 @@
|
||||
"rjs-build-analysis": "0.0.3",
|
||||
"rxjs": "5.0.0-beta.0",
|
||||
"systemjs": "0.19.6",
|
||||
"tslint": "^2.5.0-beta",
|
||||
"zone.js": "0.5.10"
|
||||
},
|
||||
"engines": {
|
||||
@ -76,6 +75,7 @@
|
||||
"lodash": "^2.4.1",
|
||||
"sinon": "1.16.1",
|
||||
"systemjs-builder": "^0.14.15",
|
||||
"tslint": "^3.2.0",
|
||||
"typescript": "^1.7.5"
|
||||
}
|
||||
}
|
||||
|
@ -17,7 +17,7 @@ import bootstrap = require('bootstrap');
|
||||
import kbn = require('app/core/utils/kbn');
|
||||
import config = require('app/core/config');
|
||||
|
||||
// import {Component} from 'vendor/npm/angular2/core';
|
||||
// import {Component} from 'angular2/core';
|
||||
// console.log(Component);
|
||||
|
||||
export class GrafanaApp {
|
||||
|
@ -69,6 +69,7 @@
|
||||
|
||||
<script>
|
||||
System.import('app/app').then(function(app) {
|
||||
console.log(app)
|
||||
app.init();
|
||||
}).catch(function(err) {
|
||||
console.log('Loading app module failed: ', err);
|
||||
|
@ -12,7 +12,7 @@ module.exports = function(grunt) {
|
||||
console.log('Starting systemjs-builder');
|
||||
|
||||
builder
|
||||
.bundle('app/app', 'public_gen/app/app.js')
|
||||
.bundle('app/app + app/features/all', 'public_gen/app/app.js')
|
||||
.then(function() {
|
||||
console.log('Build complete');
|
||||
done();
|
||||
|
Loading…
Reference in New Issue
Block a user