From ee03c35e74e0082bd461220fd7214fb9fdc6ac35 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Fri, 11 Oct 2019 19:38:00 +0200 Subject: [PATCH] build: do not generate type definitions without reference to needed global types Ensures that we properly generate all type definitions for source files which rely on global types from third-party type packages. This is a workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1265 --- src/google-maps/google-map/google-map.ts | 3 +++ src/google-maps/map-info-window/map-info-window.ts | 3 +++ src/google-maps/map-marker/map-marker.ts | 3 +++ src/google-maps/tsconfig-build.json | 3 --- src/google-maps/tsconfig-tests.json | 5 ++--- src/google-maps/tsconfig.json | 3 +-- src/youtube-player/tsconfig-build.json | 1 - src/youtube-player/tsconfig-tests.json | 2 +- src/youtube-player/tsconfig.json | 2 +- src/youtube-player/youtube-player.ts | 3 +++ 10 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/google-maps/google-map/google-map.ts b/src/google-maps/google-map/google-map.ts index 835d8da7dc0b..33abea9ca285 100644 --- a/src/google-maps/google-map/google-map.ts +++ b/src/google-maps/google-map/google-map.ts @@ -6,6 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1265 +/// + import { ChangeDetectionStrategy, Component, diff --git a/src/google-maps/map-info-window/map-info-window.ts b/src/google-maps/map-info-window/map-info-window.ts index 23740d426dd8..4c2012d0649c 100644 --- a/src/google-maps/map-info-window/map-info-window.ts +++ b/src/google-maps/map-info-window/map-info-window.ts @@ -6,6 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1265 +/// + import { Directive, ElementRef, diff --git a/src/google-maps/map-marker/map-marker.ts b/src/google-maps/map-marker/map-marker.ts index 606f37db2bd5..015b589d9a3e 100644 --- a/src/google-maps/map-marker/map-marker.ts +++ b/src/google-maps/map-marker/map-marker.ts @@ -6,6 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1265 +/// + import { ChangeDetectionStrategy, Component, diff --git a/src/google-maps/tsconfig-build.json b/src/google-maps/tsconfig-build.json index f51f09247bff..6eb144c87d99 100644 --- a/src/google-maps/tsconfig-build.json +++ b/src/google-maps/tsconfig-build.json @@ -11,9 +11,6 @@ "rootDirs": [ ".", "../../dist/packages/google-maps" - ], - "types": [ - "googlemaps" ] }, "files": [ diff --git a/src/google-maps/tsconfig-tests.json b/src/google-maps/tsconfig-tests.json index 0f0829b28ac1..04873f85f342 100644 --- a/src/google-maps/tsconfig-tests.json +++ b/src/google-maps/tsconfig-tests.json @@ -8,9 +8,8 @@ "module": "commonjs", "target": "es5", "types": [ - "jasmine", - "googlemaps" - ], + "jasmine" + ] }, "angularCompilerOptions": { "strictMetadataEmit": true, diff --git a/src/google-maps/tsconfig.json b/src/google-maps/tsconfig.json index 31ad9496d92f..1dae47577d3b 100644 --- a/src/google-maps/tsconfig.json +++ b/src/google-maps/tsconfig.json @@ -6,8 +6,7 @@ "baseUrl": ".", "paths": {}, "types": [ - "jasmine", - "googlemaps" + "jasmine" ] }, "include": [ diff --git a/src/youtube-player/tsconfig-build.json b/src/youtube-player/tsconfig-build.json index af1ba9047ce0..010eebca2957 100644 --- a/src/youtube-player/tsconfig-build.json +++ b/src/youtube-player/tsconfig-build.json @@ -12,7 +12,6 @@ ".", "../../dist/packages/youtube-player" ], - "types": ["youtube"] }, "files": [ "public-api.ts", diff --git a/src/youtube-player/tsconfig-tests.json b/src/youtube-player/tsconfig-tests.json index 74272aeb5a3a..4c99e1383aa8 100644 --- a/src/youtube-player/tsconfig-tests.json +++ b/src/youtube-player/tsconfig-tests.json @@ -7,7 +7,7 @@ "importHelpers": false, "module": "commonjs", "target": "es5", - "types": ["jasmine", "youtube"] + "types": ["jasmine"] }, "angularCompilerOptions": { "strictMetadataEmit": true, diff --git a/src/youtube-player/tsconfig.json b/src/youtube-player/tsconfig.json index 8e41d2ec562e..bb27efc808a1 100644 --- a/src/youtube-player/tsconfig.json +++ b/src/youtube-player/tsconfig.json @@ -5,7 +5,7 @@ "rootDir": "..", "baseUrl": ".", "paths": {}, - "types": ["jasmine", "youtube"] + "types": ["jasmine"] }, "include": ["*.ts"] } diff --git a/src/youtube-player/youtube-player.ts b/src/youtube-player/youtube-player.ts index 30cbb6ea52f8..76a720f14601 100644 --- a/src/youtube-player/youtube-player.ts +++ b/src/youtube-player/youtube-player.ts @@ -6,6 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1265 +/// + import { AfterViewInit, ChangeDetectionStrategy,