Skip to content

Commit 88a5b8d

Browse files
committed
chore(transform): move transform module to modules_dart
The build/pure-packages.dart gulp task has also been updated to move the files into the angular2 tree. Closes angular#3729
1 parent 92da543 commit 88a5b8d

File tree

245 files changed

+16
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+16
-3
lines changed

gulpfile.js

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -820,15 +820,25 @@ gulp.task('test.typings', ['!pre.test.typings'], function() {
820820
//
821821
// This task also fixes relative `dependency_overrides` paths in `pubspec.yaml`
822822
// files.
823+
//
824+
// This task is expected to be run after build/tree.dart
823825
gulp.task('build/pure-packages.dart', function() {
824826
var through2 = require('through2');
825827
var yaml = require('js-yaml');
826828
var originalPrefix = '../../dist/dart/';
827829

828-
return gulp
830+
var transformStream = gulp
831+
.src([
832+
'modules_dart/transform/**/*',
833+
'!modules_dart/transform/pubspec.yaml'
834+
])
835+
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2')));
836+
837+
var moveStream = gulp
829838
.src([
830839
'modules_dart/**/*.dart',
831840
'modules_dart/**/pubspec.yaml',
841+
'!modules_dart/transform/**'
832842
])
833843
.pipe(through2.obj(function(file, enc, done) {
834844
if (file.path.endsWith('pubspec.yaml')) {
@@ -864,17 +874,20 @@ gulp.task('build/pure-packages.dart', function() {
864874
this.push(file);
865875
done();
866876
}))
867-
.pipe(gulp.dest('dist/dart'));
877+
.pipe(gulp.dest(CONFIG.dest.dart));
878+
879+
880+
return merge2(transformStream, moveStream);
868881
});
869882

870883
// Builds all Dart packages, but does not compile them
871884
gulp.task('build/packages.dart', function(done) {
872885
runSequence(
873886
'build/tree.dart',
887+
'build/pure-packages.dart',
874888
// Run after 'build/tree.dart' because broccoli clears the dist/dart folder
875889
'!build/pubget.angular2.dart',
876890
'!build/change_detect.dart',
877-
'build/pure-packages.dart',
878891
sequenceComplete(done));
879892
});
880893

0 commit comments

Comments
 (0)