Skip to content

chore(gulp): moves bundles to dist/js/bundles #3286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rkirov wants to merge 1 commit into from
Closed

chore(gulp): moves bundles to dist/js/bundles #3286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ var bundleConfig = {
};

// production build
gulp.task('bundle.js.prod', ['build.js.prod'], function() {
gulp.task('!bundle.js.prod', ['build.js.prod'], function() {
return bundler.bundle(
bundleConfig,
'angular2/angular2',
Expand All @@ -906,7 +906,7 @@ gulp.task('bundle.js.prod', ['build.js.prod'], function() {
});

// minified production build
gulp.task('bundle.js.min', ['build.js.prod'], function() {
gulp.task('!bundle.js.min', ['build.js.prod'], function() {
return bundler.bundle(
bundleConfig,
'angular2/angular2',
Expand All @@ -918,7 +918,7 @@ gulp.task('bundle.js.min', ['build.js.prod'], function() {
});

// development build
gulp.task('bundle.js.dev', ['build.js.dev'], function() {
gulp.task('!bundle.js.dev', ['build.js.dev'], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths =
merge(true, devBundleConfig.paths, {
Expand All @@ -931,7 +931,7 @@ gulp.task('bundle.js.dev', ['build.js.dev'], function() {
{ sourceMaps: true });
});

gulp.task('router.bundle.js.dev', ['build.js.dev'], function() {
gulp.task('!router.bundle.js.dev', ['build.js.dev'], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths =
merge(true, devBundleConfig.paths, {
Expand All @@ -940,11 +940,11 @@ gulp.task('router.bundle.js.dev', ['build.js.dev'], function() {
return bundler.bundle(
devBundleConfig,
'angular2/router - angular2/angular2',
'./dist/bundle/router.dev.js',
'./dist/js/bundle/router.dev.js',
{ sourceMaps: true });
});

gulp.task('test.bundle.js.dev', ['build.js.dev'], function() {
gulp.task('!test.bundle.js.dev', ['build.js.dev'], function() {
var devBundleConfig = merge(true, bundleConfig);
devBundleConfig.paths =
merge(true, devBundleConfig.paths, {
Expand All @@ -953,7 +953,7 @@ gulp.task('test.bundle.js.dev', ['build.js.dev'], function() {
return bundler.bundle(
devBundleConfig,
'angular2/test + angular2/mock - angular2/angular2',
'./dist/bundle/test_lib.dev.js',
'./dist/js/bundle/test_lib.dev.js',
{ sourceMaps: true });
});

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

gulp.task('bundle.js.prod.deps', ['bundle.js.prod'], function() {
gulp.task('!bundle.js.prod.deps', ['!bundle.js.prod'], function() {
return bundler.modify(
['node_modules/zone.js/dist/zone-microtask.js', 'node_modules/reflect-metadata/Reflect.js',
'dist/build/angular2.js'],
'angular2.js'
).pipe(gulp.dest('dist/bundle'));
).pipe(gulp.dest('dist/js/bundle'));
});

gulp.task('bundle.js.min.deps', ['bundle.js.min'], function() {
gulp.task('!bundle.js.min.deps', ['!bundle.js.min'], function() {
return bundler.modify(
['node_modules/zone.js/dist/zone-microtask.min.js',
'node_modules/reflect-metadata/Reflect.js', 'dist/build/angular2.min.js'],
'angular2.min.js'
)
.pipe(uglify())
.pipe(gulp.dest('dist/bundle'));
.pipe(gulp.dest('dist/js/bundle'));
});

var JS_DEV_DEPS = [
Expand All @@ -1015,29 +1015,29 @@ function insertRXLicense(source) {
}
}

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

gulp.task('bundle.js.sfx.dev.deps', ['bundle.js.sfx.dev'], function() {
gulp.task('!bundle.js.sfx.dev.deps', ['!bundle.js.sfx.dev'], function() {
return bundler.modify(JS_DEV_DEPS.concat(['dist/build/angular2.sfx.dev.js']),
'angular2.sfx.dev.js')
.pipe(insert.transform(insertRXLicense))
.pipe(gulp.dest('dist/bundle'));
.pipe(gulp.dest('dist/js/bundle'));
});

gulp.task('bundle.js.deps', [
'bundle.js.prod.deps',
'bundle.js.dev.deps',
'bundle.js.min.deps',
'bundle.js.sfx.dev.deps',
'router.bundle.js.dev',
'test.bundle.js.dev']);
gulp.task('bundles.js', [
'!bundle.js.prod.deps',
Copy link
Copy Markdown
Contributor

@alexeagle alexeagle Jul 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any particular reason these should be private? is it wrong to build just one bundle? do they depend on each other so you get an incorrect build if you run just one?

Copy link
Copy Markdown
Contributor Author

@rkirov rkirov Jul 24, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There just so many, that people have to come ask me which one to run to get the bundles. So they are all private so that the one public one 'bundles.js' stands out.

'!bundle.js.dev.deps',
'!bundle.js.min.deps',
'!bundle.js.sfx.dev.deps',
'!router.bundle.js.dev',
'!test.bundle.js.dev']);

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

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

Expand Down
2 changes: 1 addition & 1 deletion tools/code.angularjs.org/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ARG_DEFS=(

function init {
TMP_DIR=$(resolveDir ../../tmp)
BUILD_DIR=$(resolveDir ../../dist/bundle)
BUILD_DIR=$(resolveDir ../../dist/js/bundle)
REPO_DIR=$TMP_DIR/code.angularjs.org
# TODO: replace with version read from the bundle dir.
NEW_VERSION=$VERSION_NUMBER
Expand Down