From 39ab72ebdc19d240444b529ebc02a87049a9e137 Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Wed, 15 Jan 2020 18:47:12 -0800 Subject: [PATCH] build: dedupe dependencies in typings_test_ts3{6,7}/package.json (#34798) we should try to reuse as many dependencies as we can from the top level node_modules. PR Close #34798 --- integration/typings_test_ts36/package.json | 2 +- integration/typings_test_ts36/yarn.lock | 6 ++---- integration/typings_test_ts37/package.json | 2 +- integration/typings_test_ts37/yarn.lock | 6 ++---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/integration/typings_test_ts36/package.json b/integration/typings_test_ts36/package.json index 58d97e198e..4f5f64ed01 100644 --- a/integration/typings_test_ts36/package.json +++ b/integration/typings_test_ts36/package.json @@ -19,7 +19,7 @@ "@angular/router": "file:../../dist/packages-dist/router", "@angular/service-worker": "file:../../dist/packages-dist/service-worker", "@angular/upgrade": "file:../../dist/packages-dist/upgrade", - "@types/jasmine": "2.5.41", + "@types/jasmine": "file:../../node_modules/@types/jasmine", "rxjs": "file:../../node_modules/rxjs", "typescript": "3.6.4", "zone.js": "file:../../dist/zone.js-dist/zone.js" diff --git a/integration/typings_test_ts36/yarn.lock b/integration/typings_test_ts36/yarn.lock index 6108b8b8a6..cf27763dd7 100644 --- a/integration/typings_test_ts36/yarn.lock +++ b/integration/typings_test_ts36/yarn.lock @@ -61,10 +61,8 @@ "@angular/upgrade@file:../../dist/packages-dist/upgrade": version "9.0.0-rc.1" -"@types/jasmine@2.5.41": - version "2.5.41" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.41.tgz#d5e86161a0af80d52062b310a33ed65b051a0713" - integrity sha1-1ehhYaCvgNUgYrMQoz7WWwUaBxM= +"@types/jasmine@file:../../node_modules/@types/jasmine": + version "2.8.8" abbrev@1: version "1.1.1" diff --git a/integration/typings_test_ts37/package.json b/integration/typings_test_ts37/package.json index a4dd03d3e9..7e9fee12c9 100644 --- a/integration/typings_test_ts37/package.json +++ b/integration/typings_test_ts37/package.json @@ -19,7 +19,7 @@ "@angular/router": "file:../../dist/packages-dist/router", "@angular/service-worker": "file:../../dist/packages-dist/service-worker", "@angular/upgrade": "file:../../dist/packages-dist/upgrade", - "@types/jasmine": "2.5.41", + "@types/jasmine": "file:../../node_modules/@types/jasmine", "rxjs": "file:../../node_modules/rxjs", "typescript": "3.7.4", "zone.js": "file:../../dist/zone.js-dist/zone.js" diff --git a/integration/typings_test_ts37/yarn.lock b/integration/typings_test_ts37/yarn.lock index d4b8063042..66d1842ebd 100644 --- a/integration/typings_test_ts37/yarn.lock +++ b/integration/typings_test_ts37/yarn.lock @@ -61,10 +61,8 @@ "@angular/upgrade@file:../../dist/packages-dist/upgrade": version "9.0.0-rc.1" -"@types/jasmine@2.5.41": - version "2.5.41" - resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.5.41.tgz#d5e86161a0af80d52062b310a33ed65b051a0713" - integrity sha1-1ehhYaCvgNUgYrMQoz7WWwUaBxM= +"@types/jasmine@file:../../node_modules/@types/jasmine": + version "2.8.8" ansi-regex@^2.0.0: version "2.1.1"