honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(zones): bump zone version to 0.6.15 (#10953) 

This fixes issues with microtasks being called too early
in certain tests.
This commit is contained in:
Julie Ralph 2016-08-19 14:35:26 -07:00 committed by Kara
parent 8a5eb08672
commit bb7d55244d
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
karma-js.conf.js
View File

@ -19,7 +19,7 @@ module.exports = function(config) {
'node_modules/zone.js/dist/zone.js', 'node_modules/zone.js/dist/zone.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js', 'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/proxy-zone.js', 'node_modules/zone.js/dist/proxy.js',
'node_modules/zone.js/dist/sync-test.js', 'node_modules/zone.js/dist/sync-test.js',
'node_modules/zone.js/dist/jasmine-patch.js', 'node_modules/zone.js/dist/jasmine-patch.js',
'node_modules/zone.js/dist/async-test.js', 'node_modules/zone.js/dist/async-test.js',

2
modules/@angular/compiler-cli/integrationtest/test/init.ts
View File

@ -13,5 +13,5 @@ require('reflect-metadata');
require('zone.js/dist/zone-node.js'); require('zone.js/dist/zone-node.js');
require('zone.js/dist/long-stack-trace-zone.js'); require('zone.js/dist/long-stack-trace-zone.js');
require('zone.js/dist/sync-test.js'); require('zone.js/dist/sync-test.js');
require('zone.js/dist/proxy-zone.js'); require('zone.js/dist/proxy.js');
require('zone.js/dist/jasmine-patch.js'); require('zone.js/dist/jasmine-patch.js');

2
modules/@angular/core/testing/async.ts
View File

@ -70,7 +70,7 @@ function runInTestZone(fn: Function, finishCallback: Function, failCallback: Fun
if (ProxyZoneSpec === undefined) { if (ProxyZoneSpec === undefined) {
throw new Error( throw new Error(
'ProxyZoneSpec is needed for the async() test helper but could not be found. ' + 'ProxyZoneSpec is needed for the async() test helper but could not be found. ' +
'Please make sure that your environment includes zone.js/dist/proxy-zone.js'); 'Please make sure that your environment includes zone.js/dist/proxy.js');
} }
const proxyZoneSpec = ProxyZoneSpec.get(); const proxyZoneSpec = ProxyZoneSpec.get();
ProxyZoneSpec.assertPresent(); ProxyZoneSpec.assertPresent();

2
modules/@angular/router/karma.conf.js
View File

@ -21,7 +21,7 @@ module.exports = function(config) {
// Zone.js dependencies // Zone.js dependencies
'node_modules/zone.js/dist/zone.js', 'node_modules/zone.js/dist/zone.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js', 'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/zone.js/dist/proxy-zone.js', 'node_modules/zone.js/dist/proxy.js',
'node_modules/zone.js/dist/sync-test.js', 'node_modules/zone.js/dist/sync-test.js',
'node_modules/zone.js/dist/jasmine-patch.js', 'node_modules/zone.js/dist/jasmine-patch.js',
'node_modules/zone.js/dist/async-test.js', 'node_modules/zone.js/dist/async-test.js',

2
npm-shrinkwrap.clean.json
View File

@ -5774,7 +5774,7 @@
} }
}, },
"zone.js": { "zone.js": {
"version": "0.6.14" "version": "0.6.15"
} }
}, },
"name": "angular-srcs", "name": "angular-srcs",

6
npm-shrinkwrap.json generated
View File

@ -9214,9 +9214,9 @@
} }
}, },
"zone.js": { "zone.js": {
"version": "0.6.14", "version": "0.6.15",
"from": "zone.js@0.6.14", "from": "zone.js@0.6.15",
"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.6.14.tgz" "resolved": "http://registry.npmjs.org/zone.js/-/zone.js-0.6.15.tgz"
} }
} }
} }

2
package.json
View File

@ -21,7 +21,7 @@
"es6-shim": "^0.35.0", "es6-shim": "^0.35.0",
"reflect-metadata": "^0.1.3", "reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.6",
"zone.js": "^0.6.14" "zone.js": "^0.6.15"
}, },
"devDependencies": { "devDependencies": {
"@types/angularjs": "^1.5.13-alpha", "@types/angularjs": "^1.5.13-alpha",

2
tools/cjs-jasmine/index-tools.ts
View File

@ -6,7 +6,7 @@ var JasmineRunner = require('jasmine');
var path = require('path'); var path = require('path');
// require('es6-shim/es6-shim.js'); // require('es6-shim/es6-shim.js');
require('zone.js/dist/long-stack-trace-zone.js'); require('zone.js/dist/long-stack-trace-zone.js');
require('zone.js/dist/proxy-zone.js'); require('zone.js/dist/proxy.js');
require('zone.js/dist/sync-test.js'); require('zone.js/dist/sync-test.js');
require('zone.js/dist/async-test.js'); require('zone.js/dist/async-test.js');
require('zone.js/dist/fake-async-test.js'); require('zone.js/dist/fake-async-test.js');

2
tools/cjs-jasmine/index.ts
View File

@ -7,7 +7,7 @@ var path = require('path');
require('source-map-support').install(); require('source-map-support').install();
// require('es6-shim/es6-shim.js'); // require('es6-shim/es6-shim.js');
require('zone.js/dist/long-stack-trace-zone.js'); require('zone.js/dist/long-stack-trace-zone.js');
require('zone.js/dist/proxy-zone.js'); require('zone.js/dist/proxy.js');
require('zone.js/dist/sync-test.js'); require('zone.js/dist/sync-test.js');
require('zone.js/dist/async-test.js'); require('zone.js/dist/async-test.js');
require('zone.js/dist/fake-async-test.js'); require('zone.js/dist/fake-async-test.js');