Skip to content

Commit bb50cda

Browse files
rkirovtbosch
rkirov
authored and
tbosch
committed
chore(gulp): moves bundles to dist/js/bundles
- renames bundle.js.deps to bundles.js. - makes all other bundle tasks private. Closes angular#3286
1 parent 05c4fb2 commit bb50cda

2 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎gulpfile.js‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ var bundleConfig = {
895895
};
896896

897897
// production build
898-
gulp.task('bundle.js.prod', ['build.js.prod'], function() {
898+
gulp.task('!bundle.js.prod', ['build.js.prod'], function() {
899899
return bundler.bundle(
900900
bundleConfig,
901901
'angular2/angular2',
@@ -906,7 +906,7 @@ gulp.task('bundle.js.prod', ['build.js.prod'], function() {
906906
});
907907

908908
// minified production build
909-
gulp.task('bundle.js.min', ['build.js.prod'], function() {
909+
gulp.task('!bundle.js.min', ['build.js.prod'], function() {
910910
return bundler.bundle(
911911
bundleConfig,
912912
'angular2/angular2',
@@ -918,7 +918,7 @@ gulp.task('bundle.js.min', ['build.js.prod'], function() {
918918
});
919919

920920
// development build
921-
gulp.task('bundle.js.dev', ['build.js.dev'], function() {
921+
gulp.task('!bundle.js.dev', ['build.js.dev'], function() {
922922
var devBundleConfig = merge(true, bundleConfig);
923923
devBundleConfig.paths =
924924
merge(true, devBundleConfig.paths, {
@@ -931,7 +931,7 @@ gulp.task('bundle.js.dev', ['build.js.dev'], function() {
931931
{ sourceMaps: true });
932932
});
933933

934-
gulp.task('router.bundle.js.dev', ['build.js.dev'], function() {
934+
gulp.task('!router.bundle.js.dev', ['build.js.dev'], function() {
935935
var devBundleConfig = merge(true, bundleConfig);
936936
devBundleConfig.paths =
937937
merge(true, devBundleConfig.paths, {
@@ -940,11 +940,11 @@ gulp.task('router.bundle.js.dev', ['build.js.dev'], function() {
940940
return bundler.bundle(
941941
devBundleConfig,
942942
'angular2/router - angular2/angular2',
943-
'./dist/bundle/router.dev.js',
943+
'./dist/js/bundle/router.dev.js',
944944
{ sourceMaps: true });
945945
});
946946

947-
gulp.task('test.bundle.js.dev', ['build.js.dev'], function() {
947+
gulp.task('!test.bundle.js.dev', ['build.js.dev'], function() {
948948
var devBundleConfig = merge(true, bundleConfig);
949949
devBundleConfig.paths =
950950
merge(true, devBundleConfig.paths, {
@@ -953,7 +953,7 @@ gulp.task('test.bundle.js.dev', ['build.js.dev'], function() {
953953
return bundler.bundle(
954954
devBundleConfig,
955955
'angular2/test + angular2/mock - angular2/angular2',
956-
'./dist/bundle/test_lib.dev.js',
956+
'./dist/js/bundle/test_lib.dev.js',
957957
{ sourceMaps: true });
958958
});
959959

@@ -962,7 +962,7 @@ gulp.task('test.bundle.js.dev', ['build.js.dev'], function() {
962962
// a corresponding System.import call. It is aimed at ES5 developers that do not
963963
// use System loader polyfills (like system.js and es6 loader).
964964
// see: https://github.com/systemjs/builder (SFX bundles).
965-
gulp.task('bundle.js.sfx.dev', ['build.js.dev'], function() {
965+
gulp.task('!bundle.js.sfx.dev', ['build.js.dev'], function() {
966966
var devBundleConfig = merge(true, bundleConfig);
967967
devBundleConfig.paths =
968968
merge(true, devBundleConfig.paths, {
@@ -976,22 +976,22 @@ gulp.task('bundle.js.sfx.dev', ['build.js.dev'], function() {
976976
/* self-executing */ true);
977977
});
978978

979-
gulp.task('bundle.js.prod.deps', ['bundle.js.prod'], function() {
979+
gulp.task('!bundle.js.prod.deps', ['!bundle.js.prod'], function() {
980980
return bundler.modify(
981981
['node_modules/zone.js/dist/zone-microtask.js', 'node_modules/reflect-metadata/Reflect.js',
982982
'dist/build/angular2.js'],
983983
'angular2.js'
984-
).pipe(gulp.dest('dist/bundle'));
984+
).pipe(gulp.dest('dist/js/bundle'));
985985
});
986986

987-
gulp.task('bundle.js.min.deps', ['bundle.js.min'], function() {
987+
gulp.task('!bundle.js.min.deps', ['!bundle.js.min'], function() {
988988
return bundler.modify(
989989
['node_modules/zone.js/dist/zone-microtask.min.js',
990990
'node_modules/reflect-metadata/Reflect.js', 'dist/build/angular2.min.js'],
991991
'angular2.min.js'
992992
)
993993
.pipe(uglify())
994-
.pipe(gulp.dest('dist/bundle'));
994+
.pipe(gulp.dest('dist/js/bundle'));
995995
});
996996

997997
var JS_DEV_DEPS = [
@@ -1015,29 +1015,29 @@ function insertRXLicense(source) {
10151015
}
10161016
}
10171017

1018-
gulp.task('bundle.js.dev.deps', ['bundle.js.dev'], function() {
1018+
gulp.task('!bundle.js.dev.deps', ['!bundle.js.dev'], function() {
10191019
return bundler.modify(JS_DEV_DEPS.concat(['dist/build/angular2.dev.js']), 'angular2.dev.js')
10201020
.pipe(insert.transform(insertRXLicense))
10211021
.pipe(insert.append('\nSystem.config({"paths":{"*":"*.js","angular2/*":"angular2/*"}});\n'))
1022-
.pipe(gulp.dest('dist/bundle'));
1022+
.pipe(gulp.dest('dist/js/bundle'));
10231023
});
10241024

1025-
gulp.task('bundle.js.sfx.dev.deps', ['bundle.js.sfx.dev'], function() {
1025+
gulp.task('!bundle.js.sfx.dev.deps', ['!bundle.js.sfx.dev'], function() {
10261026
return bundler.modify(JS_DEV_DEPS.concat(['dist/build/angular2.sfx.dev.js']),
10271027
'angular2.sfx.dev.js')
10281028
.pipe(insert.transform(insertRXLicense))
1029-
.pipe(gulp.dest('dist/bundle'));
1029+
.pipe(gulp.dest('dist/js/bundle'));
10301030
});
10311031

1032-
gulp.task('bundle.js.deps', [
1033-
'bundle.js.prod.deps',
1034-
'bundle.js.dev.deps',
1035-
'bundle.js.min.deps',
1036-
'bundle.js.sfx.dev.deps',
1037-
'router.bundle.js.dev',
1038-
'test.bundle.js.dev']);
1032+
gulp.task('bundles.js', [
1033+
'!bundle.js.prod.deps',
1034+
'!bundle.js.dev.deps',
1035+
'!bundle.js.min.deps',
1036+
'!bundle.js.sfx.dev.deps',
1037+
'!router.bundle.js.dev',
1038+
'!test.bundle.js.dev']);
10391039

1040-
gulp.task('build.js', ['build.js.dev', 'build.js.prod', 'build.js.cjs', 'bundle.js.deps', 'benchpress.bundle']);
1040+
gulp.task('build.js', ['build.js.dev', 'build.js.prod', 'build.js.cjs', 'bundles.js', 'benchpress.bundle']);
10411041

10421042
gulp.task('clean', ['build/clean.tools', 'build/clean.js', 'build/clean.dart', 'build/clean.docs', 'build/clean.benchpress.bundle']);
10431043

‎tools/code.angularjs.org/publish.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG_DEFS=(
1313

1414
function init {
1515
TMP_DIR=$(resolveDir ../../tmp)
16-
BUILD_DIR=$(resolveDir ../../dist/bundle)
16+
BUILD_DIR=$(resolveDir ../../dist/js/bundle)
1717
REPO_DIR=$TMP_DIR/code.angularjs.org
1818
# TODO: replace with version read from the bundle dir.
1919
NEW_VERSION=$VERSION_NUMBER

0 commit comments

Comments
 (0)