fix(bundles): remove polyfills from angular2.js bundle

pkozlowski-opensource · pkozlowski-opensource · commit 2983558e5e28 · 2015-12-14T21:34:56.000Z
BREAKING CHANGE: Previously `angular2.js`, `angular2.min.js` and `angular2.dev.js` bundles would have zone.js and reflect-metadata pre-appended. New bundles don't contain zone.js nor reflect-metadata - those external dependencies can be easily loaded into a browser using `angular2-polyfills.js` Closes #5881
diff --git a/gulpfile.js b/gulpfile.js
@@ -1165,7 +1165,7 @@ gulp.task('bundles.js.umd.min', ['!bundles.js.umd', '!bundle.ng.polyfills'], fun
 gulp.task('!bundle.js.prod.deps', ['!bundle.js.prod'], function() {
   var bundler = require('./tools/build/bundle');
 
-  return merge2(addDevDependencies('angular2.js'),
+  return merge2(bundler.modify(['dist/build/angular2.js'], 'angular2.js'),
                 bundler.modify(['dist/build/http.js'], 'http.js'),
                 bundler.modify(['dist/build/router.js'], 'router.js'),
                 bundler.modify(['dist/build/upgrade.js'], 'upgrade.js'))
@@ -1176,7 +1176,7 @@ gulp.task('!bundle.js.min.deps', ['!bundle.js.min'], function() {
   var bundler = require('./tools/build/bundle');
   var uglify = require('gulp-uglify');
 
-  return merge2(addDevDependencies('angular2.min.js'),
+  return merge2(bundler.modify(['dist/build/angular2.min.js'], 'angular2.min.js'),
                 bundler.modify(['dist/build/http.min.js'], 'http.min.js'),
                 bundler.modify(['dist/build/router.min.js'], 'router.min.js'),
                 bundler.modify(['dist/build/upgrade.min.js'], 'upgrade.min.js'))
@@ -1220,16 +1220,18 @@ function addDevDependencies(outputFile) {
 gulp.task('!bundle.js.dev.deps', ['!bundle.js.dev'], function() {
   var bundler = require('./tools/build/bundle');
 
-  return merge2(addDevDependencies('angular2.dev.js'),
+  return merge2(bundler.modify(['dist/build/angular2.dev.js'], 'angular2.dev.js'),
                 bundler.modify(['dist/build/http.dev.js'], 'http.dev.js'),
                 bundler.modify(['dist/build/router.dev.js'], 'router.dev.js'),
                 bundler.modify(['dist/build/upgrade.dev.js'], 'upgrade.dev.js'))
       .pipe(gulp.dest('dist/js/bundle'));
 });
 
 gulp.task('!bundle.web_worker.js.dev.deps', ['!bundle.web_worker.js.dev'], function() {
-  return merge2(
-      addDevDependencies("web_worker/ui.dev.js", addDevDependencies("web_worker/worker.dev.js")));
+  var bundler = require('./tools/build/bundle');
+  return merge2(bundler.modify(['dist/build/web_worker/ui.dev.js'], "web_worker/ui.dev.js"),
+                bundler.modify(['dist/build/web_worker/worker.dev.js'], "web_worker/worker.dev.js"))
+      .pipe(gulp.dest('dist/js/bundle'));
 });
 
 gulp.task('!bundle.copy', function() {
diff --git a/tools/broccoli/html-replace/SCRIPTS.html b/tools/broccoli/html-replace/SCRIPTS.html
@@ -16,6 +16,7 @@
     }
   });
 </script>
+<script src="/bundle/angular2-polyfills.js"></script>
 <script src="/bundle/angular2.dev.js"></script>
 <script src="/bundle/http.js"></script>
 <script src="/bundle/router.dev.js"></script>
diff --git a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html
@@ -17,6 +17,7 @@
     }
   });
 </script>
+<script src="/bundle/angular2-polyfills.js"></script>
 <script src="/bundle/angular2.dev.js"></script>
 <script>
   var filename = '@@PATH/@@FILENAME';

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`}`
`17`	`17`	`});`
`18`	`18`	`</script>`
	`19`	`+<script src="/bundle/angular2-polyfills.js"></script>`
`19`	`20`	`<script src="/bundle/angular2.dev.js"></script>`
`20`	`21`	`<script src="/bundle/http.js"></script>`
`21`	`22`	`<script src="/bundle/router.dev.js"></script>`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`}`
`18`	`18`	`});`
`19`	`19`	`</script>`
	`20`	`+<script src="/bundle/angular2-polyfills.js"></script>`
`20`	`21`	`<script src="/bundle/angular2.dev.js"></script>`
`21`	`22`	`<script>`
`22`	`23`	`var filename = '@@PATH/@@FILENAME';`