build: upgrade @types/jasminewd2 to 2.0.4 (#26432)

This commit also removes the extra jasminewd2 typings, since the
changes have been merged in the official typings with
DefinitelyTyped/DefinitelyTyped#28957.

aio/package.json

@@ -97,7 +97,7 @@
     "@angular/compiler-cli": "^7.0.0-rc.1",
     "@angular/language-service": "^7.0.0-rc.1",
     "@types/jasmine": "^2.5.52",
-    "@types/jasminewd2": "^2.0.3",
+    "@types/jasminewd2": "^2.0.4",
     "@types/node": "~6.0.60",
     "archiver": "^1.3.0",
     "canonical-path": "^0.0.2",

aio/tools/examples/shared/package.json

@@ -53,7 +53,7 @@
     "@types/angular-route": "^1.3.5",
     "@types/express": "^4.0.35",
     "@types/jasmine": "~2.8.0",
-    "@types/jasminewd2": "^2.0.3",
+    "@types/jasminewd2": "^2.0.4",
     "@types/jquery": "^3.3.4",
     "@types/node": "^6.0.45",
     "canonical-path": "0.0.2",

aio/yarn.lock

@@ -348,10 +348,10 @@
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.6.0.tgz#997b41a27752b4850af2683bc4a8d8222c25bd02"
   integrity sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==
 
-"@types/jasminewd2@^2.0.3":
+"@types/jasminewd2@^2.0.4":
-  version "2.0.3"
+  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.3.tgz#0d2886b0cbdae4c0eeba55e30792f584bf040a95"
+  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.4.tgz#12422ee719f372d30c3cc7d99cc72dadba6ace01"
-  integrity sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==
+  integrity sha512-G83fHoholqR7pmsY7ojHJqMAl4zD6ylKNaKCx7zH+GisCBQpnI5a7aUTFWVzv2wppIuWd+mJxyRqTASPfqcQ2w==
   dependencies:
     "@types/jasmine" "*"
 
@@ -9451,7 +9451,14 @@ rx-lite@^3.1.2:
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
   integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=
 
-rxjs@6.3.3, rxjs@^6.1.0, rxjs@^6.3.0:
+rxjs@6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
+  integrity sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@6.3.3, rxjs@^6.1.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
   integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==

integration/cli-hello-world/package.json

@@ -32,7 +32,7 @@
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@angular/language-service": "file:../../dist/packages-dist/language-service",
     "@types/jasmine": "~2.8.3",
-    "@types/jasminewd2": "~2.0.2",
+    "@types/jasminewd2": "~2.0.4",
     "@types/node": "~6.0.60",
     "codelyzer": "^4.3.0",
     "jasmine-core": "~2.8.0",

integration/cli-hello-world/yarn.lock

@@ -206,9 +206,9 @@
   version "2.8.6"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.6.tgz#14445b6a1613cf4e05dd61c3c3256d0e95c0421e"
 
-"@types/jasminewd2@~2.0.2":
+"@types/jasminewd2@~2.0.4":
-  version "2.0.3"
+  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.3.tgz#0d2886b0cbdae4c0eeba55e30792f584bf040a95"
+  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.4.tgz#12422ee719f372d30c3cc7d99cc72dadba6ace01"
   dependencies:
     "@types/jasmine" "*"
 

modules/types.d.ts

@@ -13,6 +13,5 @@
 /// <reference types="jasminewd2" />
 /// <reference types="node" />
 /// <reference types="zone.js" />
-/// <reference path="../tools/types-ext/jasminewd2.d.ts" />
 /// <reference path="./es6-subset.d.ts" />
 /// <reference path="./system.d.ts" />

package.json

@@ -48,7 +48,7 @@
     "@types/fs-extra": "4.0.2",
     "@types/hammerjs": "2.0.35",
     "@types/jasmine": "^2.8.8",
-    "@types/jasminewd2": "^2.0.3",
+    "@types/jasminewd2": "^2.0.4",
     "@types/minimist": "^1.2.0",
     "@types/node": "6.0.88",
     "@types/selenium-webdriver": "3.0.7",

packages/examples/tsconfig-build.json

@@ -16,7 +16,6 @@
 
   "include": [
     "../../node_modules/@types/jasminewd2/index.d.ts",
-    "../../tools/types-ext/jasminewd2.d.ts",
     "../types.d.ts",
     "**/*.ts"
   ]

packages/examples/tsconfig.json

@@ -10,7 +10,6 @@
 
   "include": [
     "../../node_modules/@types/jasminewd2/index.d.ts",
-    "../../tools/types-ext/jasminewd2.d.ts",
     "../types.d.ts",
     "**/e2e_test/*"
   ],

tools/types-ext/jasminewd2.d.ts

@@ -1,30 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/// <reference types="jasminewd2" />
-
-/**
- * Extended typings for `jasminewd2`.
- *
- * The currently used `jasminewd2` version (v2.1.0), supports passing a `done` callback to a spec,
- * but the latest typings on [DefinitelyTyped][1] do not reflect that.
- * Overwrite the relevant function signatures to add a `done` callback.
- *
- * [1]:
- * https://github.com/DefinitelyTyped/DefinitelyTyped/blob/566e0394859fdc1dc893658ccec6b06372d56a91/types/jasminewd2/index.d.ts#L9-L15
- */
-declare function it(
-    expectation: string, assertion?: (done: DoneFn) => Promise<void>, timeout?: number): void;
-    declare function fit(
-        expectation: string, assertion?: (done: DoneFn) => Promise<void>, timeout?: number): void;
-    declare function xit(
-        expectation: string, assertion?: (done: DoneFn) => Promise<void>, timeout?: number): void;
-    declare function beforeEach(action: (done: DoneFn) => Promise<void>, timeout?: number): void;
-    declare function afterEach(action: (done: DoneFn) => Promise<void>, timeout?: number): void;
-    declare function beforeAll(action: (done: DoneFn) => Promise<void>, timeout?: number): void;
-    declare function afterAll(action: (done: DoneFn) => Promise<void>, timeout?: number): void;