X Tutup
Skip to content

Commit 6acc997

Browse files
btfordalexeagle
authored andcommitted
build(router): refactor angular1 router build script
1 parent 99e6500 commit 6acc997

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

gulpfile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,11 @@ gulp.task('!test.unit.router/karma-run', function(done) {
627627
});
628628
});
629629

630-
gulp.task('buildRouter.dev', function() { buildRouter(); });
630+
gulp.task('buildRouter.dev', function() {
631+
var modulesSrcDir = __dirname + '/modules';
632+
var distDir = __dirname + '/dist';
633+
buildRouter(modulesSrcDir, distDir);
634+
});
631635

632636
gulp.task('test.unit.dart', function(done) {
633637
printModulesWarning();

modules/angular1_router/build.js

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,22 @@ var files = [
2121

2222
var PRELUDE = '(function(){\n';
2323
var POSTLUDE = '\n}());\n';
24-
var FACADES = fs.readFileSync(__dirname + '/lib/facades.es5', 'utf8');
25-
var DIRECTIVES = fs.readFileSync(__dirname + '/src/ng_outlet.ts', 'utf8');
26-
var moduleTemplate = fs.readFileSync(__dirname + '/src/module_template.js', 'utf8');
2724

28-
function main() {
29-
var dir = __dirname + '/../angular2/src/router/';
25+
function main(modulesDirectory) {
26+
27+
var angular1RouterModuleDirectory = modulesDirectory + '/angular1_router';
28+
29+
var facades = fs.readFileSync(angular1RouterModuleDirectory + '/lib/facades.es5', 'utf8');
30+
var directives = fs.readFileSync(angular1RouterModuleDirectory + '/src/ng_outlet.ts', 'utf8');
31+
var moduleTemplate = fs.readFileSync(angular1RouterModuleDirectory + '/src/module_template.js', 'utf8');
32+
33+
var dir = modulesDirectory + '/angular2/src/router/';
3034
var sharedCode = files.reduce(function (prev, file) {
3135
return prev + transform(fs.readFileSync(dir + file, 'utf8'));
3236
}, '');
3337

34-
var out = moduleTemplate.replace('//{{FACADES}}', FACADES).replace('//{{SHARED_CODE}}', sharedCode);
35-
return PRELUDE + transform(DIRECTIVES) + out + POSTLUDE;
38+
var out = moduleTemplate.replace('//{{FACADES}}', facades).replace('//{{SHARED_CODE}}', sharedCode);
39+
return PRELUDE + transform(directives) + out + POSTLUDE;
3640
}
3741

3842
/*
@@ -62,10 +66,9 @@ function isFacadeModule(modulePath) {
6266
modulePath === 'angular2/src/core/reflection/reflection';
6367
}
6468

65-
module.exports = function () {
66-
var dist = __dirname + '/../../dist';
67-
if (!fs.existsSync(dist)) {
68-
fs.mkdirSync(dist);
69+
module.exports = function (modulesDirectory, outputDirectory) {
70+
if (!fs.existsSync(outputDirectory)) {
71+
fs.mkdirSync(outputDirectory);
6972
}
70-
fs.writeFileSync(dist + '/angular_1_router.js', main());
73+
fs.writeFileSync(outputDirectory + '/angular_1_router.js', main(modulesDirectory));
7174
};

0 commit comments

Comments
 (0)
X Tutup