Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-22 23:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(build): concat all src files into app.js and transpile them as SystemJS

Browse Source 
Closes #33
This commit is contained in:
rodyhaddad 2015-07-31 00:59:31 +03:00
parent d89595b60d
commit f2d1ec3f7c
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addon/ng2/blueprints/ng2/files/src/index.html
View File

@ -10,6 +10,7 @@
</head> </head>
<body> <body>
<<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app> <<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
<script src="app.js"></script>
<script> <script>
System.import('<%= htmlComponentName %>'); System.import('<%= htmlComponentName %>');
</script> </script>

13
lib/broccoli/angular2-app.js vendored
View File

@ -3,6 +3,7 @@ var configReplace = require('./broccoli-config-replace');
var mergeTrees = require('broccoli-merge-trees'); var mergeTrees = require('broccoli-merge-trees');
var Funnel = require('broccoli-funnel'); var Funnel = require('broccoli-funnel');
var Project = require('ember-cli/lib//models/project'); var Project = require('ember-cli/lib//models/project');
var Concat = require('broccoli-concat');
module.exports = Angular2App; module.exports = Angular2App;
@ -25,7 +26,7 @@ Angular2App.prototype.toTree = function () {
sourceMap: true, sourceMap: true,
sourceRoot: '.', sourceRoot: '.',
target: 'ES5', target: 'ES5',
module: 'commonjs' module: 4 /* System */
}); });
var jsTree = new Funnel(sourceTree, { var jsTree = new Funnel(sourceTree, {
@ -43,7 +44,15 @@ Angular2App.prototype.toTree = function () {
allowEmpty: true allowEmpty: true
}); });
return mergeTrees([tsTree, jsTree, cssTree, htmlTree, this.index()], { overwrite: true }); var appJs = new Concat(mergeTrees([tsTree, jsTree]), {
inputFiles: [
'*.js',
'**/*.js'
],
outputFile: '/app.js'
});
return mergeTrees([appJs, cssTree, htmlTree, this.index()], { overwrite: true });
}; };
/** /**

14
lib/broccoli/broccoli-typescript.js
View File

@ -33,6 +33,11 @@ var DiffingTSCompiler = (function () {
this.tsServiceHost = new CustomLanguageServiceHost(this.tsOpts, this.rootFilePaths, this.fileRegistry, this.inputPath); this.tsServiceHost = new CustomLanguageServiceHost(this.tsOpts, this.rootFilePaths, this.fileRegistry, this.inputPath);
this.tsService = ts.createLanguageService(this.tsServiceHost, ts.createDocumentRegistry()); this.tsService = ts.createLanguageService(this.tsServiceHost, ts.createDocumentRegistry());
} }
DiffingTSCompiler.prototype.addSystemJsModule = function (name, content) {
name = name.split('.tmp').pop().substring(1);
name = name.substring(0, name.length - 3);
return content.replace('System.register(', 'System.register("' + name + '", ');
};
DiffingTSCompiler.prototype.rebuild = function (treeDiff) { DiffingTSCompiler.prototype.rebuild = function (treeDiff) {
var _this = this; var _this = this;
var pathsToEmit = []; var pathsToEmit = [];
@ -61,7 +66,7 @@ var DiffingTSCompiler = (function () {
} }
else { else {
pathsToEmit.forEach(function (tsFilePath) { pathsToEmit.forEach(function (tsFilePath) {
var output = _this.tsService.getEmitOutput(tsFilePath); var output = _this.tsService.getEmitOutput(tsFilePath); // System.register
if (output.emitSkipped) { if (output.emitSkipped) {
var errorFound = _this.collectErrors(tsFilePath); var errorFound = _this.collectErrors(tsFilePath);
if (errorFound) { if (errorFound) {
@ -73,7 +78,8 @@ var DiffingTSCompiler = (function () {
output.outputFiles.forEach(function (o) { output.outputFiles.forEach(function (o) {
var destDirPath = path.dirname(o.name); var destDirPath = path.dirname(o.name);
fse.mkdirsSync(destDirPath); fse.mkdirsSync(destDirPath);
fs.writeFileSync(o.name, o.text, FS_OPTS); //console.log(o.name, o.text)
fs.writeFileSync(o.name, _this.addSystemJsModule(o.name, o.text), FS_OPTS);
}); });
} }
}); });
@ -108,10 +114,12 @@ var DiffingTSCompiler = (function () {
} }
}; };
DiffingTSCompiler.prototype.doFullBuild = function () { DiffingTSCompiler.prototype.doFullBuild = function () {
var _this = this;
var program = this.tsService.getProgram(); var program = this.tsService.getProgram();
var emitResult = program.emit(undefined, function (absoluteFilePath, fileContent) { var emitResult = program.emit(undefined, function (absoluteFilePath, fileContent) {
//console.log('absoluteFilePath', absoluteFilePath, fileContent);
fse.mkdirsSync(path.dirname(absoluteFilePath)); fse.mkdirsSync(path.dirname(absoluteFilePath));
fs.writeFileSync(absoluteFilePath, fileContent, FS_OPTS); fs.writeFileSync(absoluteFilePath, _this.addSystemJsModule(absoluteFilePath, fileContent), FS_OPTS);
}); });
if (emitResult.emitSkipped) { if (emitResult.emitSkipped) {
var allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics); var allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);

2
package.json
View File

@ -35,7 +35,7 @@
"resolve": "^1.0.0", "resolve": "^1.0.0",
"silent-error": "^1.0.0", "silent-error": "^1.0.0",
"symlink-or-copy": "^1.0.1", "symlink-or-copy": "^1.0.1",
"typescript": "^1.5.0-beta" "typescript": "^1.5.3"
}, },
"ember-addon": { "ember-addon": {
"paths": [ "paths": [