opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 14:12:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

tech(systemjs): work on systemjs builder

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-12-18 15:59:27 +01:00
parent 0dd7fb7361
commit 93e424de4c
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -57,7 +57,6 @@
"rjs-build-analysis": "0.0.3", "rjs-build-analysis": "0.0.3",
"rxjs": "5.0.0-beta.0", "rxjs": "5.0.0-beta.0",
"systemjs": "0.19.6", "systemjs": "0.19.6",
"tslint": "^2.5.0-beta",
"zone.js": "0.5.10" "zone.js": "0.5.10"
}, },
"engines": { "engines": {
@ -76,6 +75,7 @@
"lodash": "^2.4.1", "lodash": "^2.4.1",
"sinon": "1.16.1", "sinon": "1.16.1",
"systemjs-builder": "^0.14.15", "systemjs-builder": "^0.14.15",
"tslint": "^3.2.0",
"typescript": "^1.7.5" "typescript": "^1.7.5"
} }
} }

2
public/app/grafana_app.ts
View File

@ -17,7 +17,7 @@ import bootstrap = require('bootstrap');
import kbn = require('app/core/utils/kbn'); import kbn = require('app/core/utils/kbn');
import config = require('app/core/config'); import config = require('app/core/config');
// import {Component} from 'vendor/npm/angular2/core'; // import {Component} from 'angular2/core';
// console.log(Component); // console.log(Component);
export class GrafanaApp { export class GrafanaApp {

1
public/views/index.html
View File

@ -69,6 +69,7 @@
<script> <script>
System.import('app/app').then(function(app) { System.import('app/app').then(function(app) {
console.log(app)
app.init(); app.init();
}).catch(function(err) { }).catch(function(err) {
console.log('Loading app module failed: ', err); console.log('Loading app module failed: ', err);

2
tasks/systemjs_task.js
View File

@ -12,7 +12,7 @@ module.exports = function(grunt) {
console.log('Starting systemjs-builder'); console.log('Starting systemjs-builder');
builder builder
.bundle('app/app', 'public_gen/app/app.js') .bundle('app/app + app/features/all', 'public_gen/app/app.js')
.then(function() { .then(function() {
console.log('Build complete'); console.log('Build complete');
done(); done();