Skip to content

Commit c8a0ed4

Browse files
committed
refactor(NgZone): use zone.js v0.5 from npm
1 parent e11c205 commit c8a0ed4

File tree

8 files changed

+74
-2081
lines changed

8 files changed

+74
-2081
lines changed

gulpfile.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -752,19 +752,23 @@ gulp.task('bundle.js.sfx.dev', ['build.js.dev'], function() {
752752

753753
gulp.task('bundle.js.prod.deps', ['bundle.js.prod'], function() {
754754
return bundler.modify(
755-
['node_modules/zone.js/zone.js', 'dist/build/angular2.js'], 'angular2.js')
756-
.pipe(gulp.dest('dist/bundle'));
755+
['node_modules/zone.js/dist/zone-microtask.js', 'dist/build/angular2.js'],
756+
'angular2.js'
757+
).pipe(gulp.dest('dist/bundle'));
757758
});
758759

759760
gulp.task('bundle.js.min.deps', ['bundle.js.min'], function() {
760761
return bundler.modify(
761-
['node_modules/zone.js/zone.js', 'dist/build/angular2.min.js'], 'angular2.min.js')
762-
.pipe(gulp.dest('dist/bundle'));
762+
['node_modules/zone.js/dist/zone-microtask.js', 'dist/build/angular2.min.js'],
763+
'angular2.min.js'
764+
).pipe(gulp.dest('dist/bundle'));
763765
});
764766

765-
var JS_DEV_DEPS = ['node_modules/zone.js/zone.js',
766-
'node_modules/zone.js/long-stack-trace-zone.js',
767-
'node_modules/reflect-metadata/Reflect.js'];
767+
var JS_DEV_DEPS = [
768+
'node_modules/zone.js/dist/zone-microtask.js',
769+
'node_modules/zone.js/dist/long-stack-trace-zone.js',
770+
'node_modules/reflect-metadata/Reflect.js'
771+
];
768772

769773
gulp.task('bundle.js.dev.deps', ['bundle.js.dev'], function() {
770774
return bundler.modify(JS_DEV_DEPS.concat(['dist/build/angular2.dev.js']), 'angular2.dev.js')

karma-js.conf.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ module.exports = function(config) {
1212
// Loaded through the es6-module-loader, in `test-main.js`.
1313
{pattern: 'dist/js/dev/es5/**', included: false, watched: false},
1414

15-
'zone/zone-microtask.js',
16-
'zone/long-stack-trace-zone.js',
15+
// zone-microtask must be included first as it contains a Promise monkey patch
16+
'node_modules/zone.js/dist/zone-microtask.js',
17+
'node_modules/zone.js/dist/long-stack-trace-zone.js',
1718

1819
'node_modules/traceur/bin/traceur-runtime.js',
1920
'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js',

npm-shrinkwrap.clean.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9483,7 +9483,7 @@
94839483
}
94849484
},
94859485
"zone.js": {
9486-
"version": "0.4.4"
9486+
"version": "0.5.0"
94879487
}
94889488
},
94899489
"name": "angular",

npm-shrinkwrap.json

Lines changed: 56 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"systemjs": "^0.9.1",
3737
"traceur": "0.0.87",
3838
"which": "~1",
39-
"zone.js": "0.4.4"
39+
"zone.js": "0.5.0"
4040
},
4141
"devDependencies": {
4242
"angular": "1.3.5",

tools/broccoli/trees/browser_tree.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ module.exports = function makeBrowserTree(options, destinationPath) {
7878

7979
var vendorScriptsTree = flatten(new Funnel('.', {
8080
files: [
81-
'zone/zone-microtask.js',
82-
'zone/long-stack-trace-zone.js',
81+
'node_modules/zone.js/dist/zone-microtask.js',
82+
'node_modules/zone.js/dist/long-stack-trace-zone.js',
8383
'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js',
8484
'node_modules/systemjs/dist/system.src.js',
8585
'node_modules/systemjs/lib/extension-register.js',

zone/long-stack-trace-zone.js

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)