From bb7d55244d15bce377bbf6931f2ec69ffb2b34ff Mon Sep 17 00:00:00 2001 From: Julie Ralph Date: Fri, 19 Aug 2016 14:35:26 -0700 Subject: [PATCH] fix(zones): bump zone version to 0.6.15 (#10953) This fixes issues with microtasks being called too early in certain tests. --- karma-js.conf.js | 2 +- modules/@angular/compiler-cli/integrationtest/test/init.ts | 2 +- modules/@angular/core/testing/async.ts | 2 +- modules/@angular/router/karma.conf.js | 2 +- npm-shrinkwrap.clean.json | 2 +- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- tools/cjs-jasmine/index-tools.ts | 2 +- tools/cjs-jasmine/index.ts | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/karma-js.conf.js b/karma-js.conf.js index ee3ab95478..0bc20e8dcf 100644 --- a/karma-js.conf.js +++ b/karma-js.conf.js @@ -19,7 +19,7 @@ module.exports = function(config) { 'node_modules/zone.js/dist/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/jasmine-patch.js', 'node_modules/zone.js/dist/async-test.js', diff --git a/modules/@angular/compiler-cli/integrationtest/test/init.ts b/modules/@angular/compiler-cli/integrationtest/test/init.ts index 927bdb8fd7..59e576a3c5 100644 --- a/modules/@angular/compiler-cli/integrationtest/test/init.ts +++ b/modules/@angular/compiler-cli/integrationtest/test/init.ts @@ -13,5 +13,5 @@ require('reflect-metadata'); require('zone.js/dist/zone-node.js'); require('zone.js/dist/long-stack-trace-zone.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'); diff --git a/modules/@angular/core/testing/async.ts b/modules/@angular/core/testing/async.ts index b2e4befe01..822e14f37b 100644 --- a/modules/@angular/core/testing/async.ts +++ b/modules/@angular/core/testing/async.ts @@ -70,7 +70,7 @@ function runInTestZone(fn: Function, finishCallback: Function, failCallback: Fun if (ProxyZoneSpec === undefined) { throw new Error( '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(); ProxyZoneSpec.assertPresent(); diff --git a/modules/@angular/router/karma.conf.js b/modules/@angular/router/karma.conf.js index 09ce039071..e55941d79a 100644 --- a/modules/@angular/router/karma.conf.js +++ b/modules/@angular/router/karma.conf.js @@ -21,7 +21,7 @@ module.exports = function(config) { // Zone.js dependencies 'node_modules/zone.js/dist/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/jasmine-patch.js', 'node_modules/zone.js/dist/async-test.js', diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json index 98c455b08f..f34739aae6 100644 --- a/npm-shrinkwrap.clean.json +++ b/npm-shrinkwrap.clean.json @@ -5774,7 +5774,7 @@ } }, "zone.js": { - "version": "0.6.14" + "version": "0.6.15" } }, "name": "angular-srcs", diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 27797d0c9d..978e69846e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -9214,9 +9214,9 @@ } }, "zone.js": { - "version": "0.6.14", - "from": "zone.js@0.6.14", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.6.14.tgz" + "version": "0.6.15", + "from": "zone.js@0.6.15", + "resolved": "http://registry.npmjs.org/zone.js/-/zone.js-0.6.15.tgz" } } } diff --git a/package.json b/package.json index 2e16fb42e1..893a5c7164 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "es6-shim": "^0.35.0", "reflect-metadata": "^0.1.3", "rxjs": "5.0.0-beta.6", - "zone.js": "^0.6.14" + "zone.js": "^0.6.15" }, "devDependencies": { "@types/angularjs": "^1.5.13-alpha", diff --git a/tools/cjs-jasmine/index-tools.ts b/tools/cjs-jasmine/index-tools.ts index 02c511c28f..c22a52db95 100644 --- a/tools/cjs-jasmine/index-tools.ts +++ b/tools/cjs-jasmine/index-tools.ts @@ -6,7 +6,7 @@ var JasmineRunner = require('jasmine'); var path = require('path'); // require('es6-shim/es6-shim.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/async-test.js'); require('zone.js/dist/fake-async-test.js'); diff --git a/tools/cjs-jasmine/index.ts b/tools/cjs-jasmine/index.ts index 4f99868cdb..79b6a4b9fb 100644 --- a/tools/cjs-jasmine/index.ts +++ b/tools/cjs-jasmine/index.ts @@ -7,7 +7,7 @@ var path = require('path'); require('source-map-support').install(); // require('es6-shim/es6-shim.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/async-test.js'); require('zone.js/dist/fake-async-test.js');