diff --git a/gulpfile.js b/gulpfile.js index cd58360082..96a91c95b1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -627,7 +627,11 @@ gulp.task('!test.unit.router/karma-run', function(done) { }); }); -gulp.task('buildRouter.dev', function() { buildRouter(); }); +gulp.task('buildRouter.dev', function() { + var modulesSrcDir = __dirname + '/modules'; + var distDir = __dirname + '/dist'; + buildRouter(modulesSrcDir, distDir); +}); gulp.task('test.unit.dart', function(done) { printModulesWarning(); diff --git a/modules/angular1_router/build.js b/modules/angular1_router/build.js index 5d5065bd86..6a8b242852 100644 --- a/modules/angular1_router/build.js +++ b/modules/angular1_router/build.js @@ -21,18 +21,22 @@ var files = [ var PRELUDE = '(function(){\n'; var POSTLUDE = '\n}());\n'; -var FACADES = fs.readFileSync(__dirname + '/lib/facades.es5', 'utf8'); -var DIRECTIVES = fs.readFileSync(__dirname + '/src/ng_outlet.ts', 'utf8'); -var moduleTemplate = fs.readFileSync(__dirname + '/src/module_template.js', 'utf8'); -function main() { - var dir = __dirname + '/../angular2/src/router/'; +function main(modulesDirectory) { + + var angular1RouterModuleDirectory = modulesDirectory + '/angular1_router'; + + var facades = fs.readFileSync(angular1RouterModuleDirectory + '/lib/facades.es5', 'utf8'); + var directives = fs.readFileSync(angular1RouterModuleDirectory + '/src/ng_outlet.ts', 'utf8'); + var moduleTemplate = fs.readFileSync(angular1RouterModuleDirectory + '/src/module_template.js', 'utf8'); + + var dir = modulesDirectory + '/angular2/src/router/'; var sharedCode = files.reduce(function (prev, file) { return prev + transform(fs.readFileSync(dir + file, 'utf8')); }, ''); - var out = moduleTemplate.replace('//{{FACADES}}', FACADES).replace('//{{SHARED_CODE}}', sharedCode); - return PRELUDE + transform(DIRECTIVES) + out + POSTLUDE; + var out = moduleTemplate.replace('//{{FACADES}}', facades).replace('//{{SHARED_CODE}}', sharedCode); + return PRELUDE + transform(directives) + out + POSTLUDE; } /* @@ -62,10 +66,9 @@ function isFacadeModule(modulePath) { modulePath === 'angular2/src/core/reflection/reflection'; } -module.exports = function () { - var dist = __dirname + '/../../dist'; - if (!fs.existsSync(dist)) { - fs.mkdirSync(dist); +module.exports = function (modulesDirectory, outputDirectory) { + if (!fs.existsSync(outputDirectory)) { + fs.mkdirSync(outputDirectory); } - fs.writeFileSync(dist + '/angular_1_router.js', main()); + fs.writeFileSync(outputDirectory + '/angular_1_router.js', main(modulesDirectory)); };