From 930b717337030cf158d748cdf53f2d2f1439ba0f Mon Sep 17 00:00:00 2001 From: cexbrayat Date: Sat, 24 Jun 2017 16:38:57 +0200 Subject: [PATCH] fix(@angular/cli): bump jasmine and add jasminewd2 types This bumps jasmine types to 2.5.53. The version was previously pinned down to 2.5.45, because more recent versions weren't playing nice with Protractor and lead to errors like https://github.com/angular/protractor/issues/4176 The proper fix appears to be the one mentioned in the Protractor issue: add `@types/jasminewd2` typings, and add these typings to the tsconfig for e2e tests. [jasminewd](https://github.com/angular/jasminewd) is the adapter used by Protractor to handle the async part. --- .../@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json | 1 + packages/@angular/cli/blueprints/ng/files/package.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json b/packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json index e2a9a2fc7795..39b800f78961 100644 --- a/packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json +++ b/packages/@angular/cli/blueprints/ng/files/e2e/tsconfig.e2e.json @@ -6,6 +6,7 @@ "target": "es5", "types": [ "jasmine", + "jasminewd2", "node" ] } diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json index 605cf18230fb..9cc2159040a8 100644 --- a/packages/@angular/cli/blueprints/ng/files/package.json +++ b/packages/@angular/cli/blueprints/ng/files/package.json @@ -32,7 +32,8 @@ "@angular/cli": "<%= version %>", "@angular/compiler-cli": "^4.0.0", "@angular/language-service": "^4.0.0",<% if (!minimal) { %> - "@types/jasmine": "2.5.45", + "@types/jasmine": "~2.5.53", + "@types/jasminewd2": "~2.0.2", "@types/node": "~6.0.60", "codelyzer": "~3.0.1", "jasmine-core": "~2.6.2",