From 2e493edf800fe48fbff65ca712cefd2476ddbda6 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Thu, 12 Mar 2020 12:36:28 +0100 Subject: [PATCH] build: provide full paths to `ts_api_guardian_test_npm_package` and `ts_api_guardian_test` (#36034) ts-api-guardian uses `require.resolve` to resolve the actual and golden files under bazel. In Windows for these files to be resolved correct the full path including the workspace name as per the MANIFEST entries is required. This used to be the case until the recent changes done to use npm_integration tests https://github.com/angular/angular/blob/83c74ceacf620535673ec141fc8a1003aed187ef/tools/public_api_guard/public_api_guard.bzl#L19 https://github.com/angular/angular/blob/83c74ceacf620535673ec141fc8a1003aed187ef/tools/public_api_guard/public_api_guard.bzl#L28 ``` bazel test //packages/... --test_tag_filters=api_guard //packages/animations:animations_api (cached) PASSED in 18.4s //packages/common:common_api (cached) PASSED in 25.5s //packages/compiler-cli:compiler_options_api (cached) PASSED in 12.4s //packages/compiler-cli:error_code_api (cached) PASSED in 11.6s //packages/core:core_api (cached) PASSED in 20.6s //packages/core:ng_global_utils_api (cached) PASSED in 13.5s //packages/elements:elements_api (cached) PASSED in 11.9s //packages/forms:forms_api (cached) PASSED in 13.9s //packages/http:http_api (cached) PASSED in 14.8s //packages/localize:localize_api (cached) PASSED in 6.3s //packages/platform-browser:platform-browser_api (cached) PASSED in 18.1s //packages/platform-browser-dynamic:platform-browser-dynamic_api (cached) PASSED in 14.0s //packages/platform-server:platform-server_api (cached) PASSED in 13.9s //packages/platform-webworker:platform-webworker_api (cached) PASSED in 13.7s //packages/platform-webworker-dynamic:platform-webworker-dynamic_api (cached) PASSED in 11.7s //packages/router:router_api (cached) PASSED in 19.9s //packages/service-worker:service-worker_api (cached) PASSED in 18.1s //packages/upgrade:upgrade_api (cached) PASSED in 13.5s ``` Reference: DEV-71 PR Close #36034 --- packages/animations/BUILD.bazel | 4 ++-- packages/common/BUILD.bazel | 4 ++-- packages/compiler-cli/BUILD.bazel | 8 ++++---- packages/core/BUILD.bazel | 8 ++++---- packages/elements/BUILD.bazel | 4 ++-- packages/forms/BUILD.bazel | 4 ++-- packages/http/BUILD.bazel | 4 ++-- packages/localize/BUILD.bazel | 4 ++-- packages/platform-browser-dynamic/BUILD.bazel | 4 ++-- packages/platform-browser/BUILD.bazel | 4 ++-- packages/platform-server/BUILD.bazel | 4 ++-- packages/platform-webworker-dynamic/BUILD.bazel | 4 ++-- packages/platform-webworker/BUILD.bazel | 4 ++-- packages/router/BUILD.bazel | 4 ++-- packages/service-worker/BUILD.bazel | 4 ++-- packages/upgrade/BUILD.bazel | 4 ++-- tools/ts-api-guardian/index.bzl | 4 ++-- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/packages/animations/BUILD.bazel b/packages/animations/BUILD.bazel index e51bab36718..ae37978d317 100644 --- a/packages/animations/BUILD.bazel +++ b/packages/animations/BUILD.bazel @@ -42,10 +42,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "animations_api", - actualDir = "packages/animations/npm_package", + actualDir = "angular/packages/animations/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/animations", + goldenDir = "angular/goldens/public-api/animations", ) diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel index fd0b213c76a..f37222c5171 100644 --- a/packages/common/BUILD.bazel +++ b/packages/common/BUILD.bazel @@ -54,10 +54,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "common_api", - actualDir = "packages/common/npm_package", + actualDir = "angular/packages/common/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/common", + goldenDir = "angular/goldens/public-api/common", ) diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel index 2a4142878d5..07925924624 100644 --- a/packages/compiler-cli/BUILD.bazel +++ b/packages/compiler-cli/BUILD.bazel @@ -62,20 +62,20 @@ pkg_npm( ts_api_guardian_test( name = "error_code_api", - actual = "packages/compiler-cli/npm_package/src/ngtsc/diagnostics/src/error_code.d.ts", + actual = "angular/packages/compiler-cli/npm_package/src/ngtsc/diagnostics/src/error_code.d.ts", data = [ ":npm_package", "//goldens:public-api", ], - golden = "goldens/public-api/compiler-cli/error_code.d.ts", + golden = "angular/goldens/public-api/compiler-cli/error_code.d.ts", ) ts_api_guardian_test( name = "compiler_options_api", - actual = "packages/compiler-cli/npm_package/src/ngtsc/core/api/src/public_options.d.ts", + actual = "angular/packages/compiler-cli/npm_package/src/ngtsc/core/api/src/public_options.d.ts", data = [ ":npm_package", "//goldens:public-api", ], - golden = "goldens/public-api/compiler-cli/compiler_options.d.ts", + golden = "angular/goldens/public-api/compiler-cli/compiler_options.d.ts", ) diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel index 940534a1373..04d4423c271 100644 --- a/packages/core/BUILD.bazel +++ b/packages/core/BUILD.bazel @@ -57,20 +57,20 @@ ng_package( ts_api_guardian_test_npm_package( name = "core_api", - actualDir = "packages/core/npm_package", + actualDir = "angular/packages/core/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/core", + goldenDir = "angular/goldens/public-api/core", ) ts_api_guardian_test( name = "ng_global_utils_api", - actual = "packages/core/src/render3/global_utils_api.d.ts", + actual = "angular/packages/core/src/render3/global_utils_api.d.ts", data = [ "//goldens:public-api", "//packages/core", ], - golden = "goldens/public-api/core/global_utils.d.ts", + golden = "angular/goldens/public-api/core/global_utils.d.ts", ) diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel index 94c4c86d4da..a5b89b28c96 100644 --- a/packages/elements/BUILD.bazel +++ b/packages/elements/BUILD.bazel @@ -40,10 +40,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "elements_api", - actualDir = "packages/elements/npm_package", + actualDir = "angular/packages/elements/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/elements", + goldenDir = "angular/goldens/public-api/elements", ) diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel index 5ef1d014165..6466bc700f4 100644 --- a/packages/forms/BUILD.bazel +++ b/packages/forms/BUILD.bazel @@ -40,10 +40,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "forms_api", - actualDir = "packages/forms/npm_package", + actualDir = "angular/packages/forms/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/forms", + goldenDir = "angular/goldens/public-api/forms", ) diff --git a/packages/http/BUILD.bazel b/packages/http/BUILD.bazel index 12240ab7d2c..cfec8fa5bf7 100644 --- a/packages/http/BUILD.bazel +++ b/packages/http/BUILD.bazel @@ -45,10 +45,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "http_api", - actualDir = "packages/http/npm_package", + actualDir = "angular/packages/http/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/http", + goldenDir = "angular/goldens/public-api/http", ) diff --git a/packages/localize/BUILD.bazel b/packages/localize/BUILD.bazel index 057ff08a6fd..e768811b95e 100644 --- a/packages/localize/BUILD.bazel +++ b/packages/localize/BUILD.bazel @@ -39,10 +39,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "localize_api", - actualDir = "packages/localize/npm_package", + actualDir = "angular/packages/localize/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/localize", + goldenDir = "angular/goldens/public-api/localize", ) diff --git a/packages/platform-browser-dynamic/BUILD.bazel b/packages/platform-browser-dynamic/BUILD.bazel index 6be1cb4864d..5dc308f172d 100644 --- a/packages/platform-browser-dynamic/BUILD.bazel +++ b/packages/platform-browser-dynamic/BUILD.bazel @@ -43,10 +43,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "platform-browser-dynamic_api", - actualDir = "packages/platform-browser-dynamic/npm_package", + actualDir = "angular/packages/platform-browser-dynamic/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/platform-browser-dynamic", + goldenDir = "angular/goldens/public-api/platform-browser-dynamic", ) diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel index 1ca1740b234..857ec5093a1 100644 --- a/packages/platform-browser/BUILD.bazel +++ b/packages/platform-browser/BUILD.bazel @@ -46,10 +46,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "platform-browser_api", - actualDir = "packages/platform-browser/npm_package", + actualDir = "angular/packages/platform-browser/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/platform-browser", + goldenDir = "angular/goldens/public-api/platform-browser", ) diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel index b6c4820fffb..6713c1b971f 100644 --- a/packages/platform-server/BUILD.bazel +++ b/packages/platform-server/BUILD.bazel @@ -49,10 +49,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "platform-server_api", - actualDir = "packages/platform-server/npm_package", + actualDir = "angular/packages/platform-server/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/platform-server", + goldenDir = "angular/goldens/public-api/platform-server", ) diff --git a/packages/platform-webworker-dynamic/BUILD.bazel b/packages/platform-webworker-dynamic/BUILD.bazel index 44d2a5c8eae..1103cdf08b0 100644 --- a/packages/platform-webworker-dynamic/BUILD.bazel +++ b/packages/platform-webworker-dynamic/BUILD.bazel @@ -34,10 +34,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "platform-webworker-dynamic_api", - actualDir = "packages/platform-webworker-dynamic/npm_package", + actualDir = "angular/packages/platform-webworker-dynamic/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/platform-webworker-dynamic", + goldenDir = "angular/goldens/public-api/platform-webworker-dynamic", ) diff --git a/packages/platform-webworker/BUILD.bazel b/packages/platform-webworker/BUILD.bazel index bb3156484f3..1237f7af7b7 100644 --- a/packages/platform-webworker/BUILD.bazel +++ b/packages/platform-webworker/BUILD.bazel @@ -40,10 +40,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "platform-webworker_api", - actualDir = "packages/platform-webworker/npm_package", + actualDir = "angular/packages/platform-webworker/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/platform-webworker", + goldenDir = "angular/goldens/public-api/platform-webworker", ) diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel index 4e8e1cb96fa..3415be9ee04 100644 --- a/packages/router/BUILD.bazel +++ b/packages/router/BUILD.bazel @@ -46,10 +46,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "router_api", - actualDir = "packages/router/npm_package", + actualDir = "angular/packages/router/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/router", + goldenDir = "angular/goldens/public-api/router", ) diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel index 8fb353c274b..5f5c60abeb3 100644 --- a/packages/service-worker/BUILD.bazel +++ b/packages/service-worker/BUILD.bazel @@ -61,10 +61,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "service-worker_api", - actualDir = "packages/service-worker/npm_package", + actualDir = "angular/packages/service-worker/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/service-worker", + goldenDir = "angular/goldens/public-api/service-worker", ) diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel index 4b23d7dc8c3..576adf70e4a 100644 --- a/packages/upgrade/BUILD.bazel +++ b/packages/upgrade/BUILD.bazel @@ -41,10 +41,10 @@ ng_package( ts_api_guardian_test_npm_package( name = "upgrade_api", - actualDir = "packages/upgrade/npm_package", + actualDir = "angular/packages/upgrade/npm_package", data = [ ":npm_package", "//goldens:public-api", ], - goldenDir = "goldens/public-api/upgrade", + goldenDir = "angular/goldens/public-api/upgrade", ) diff --git a/tools/ts-api-guardian/index.bzl b/tools/ts-api-guardian/index.bzl index 521756b82d0..0b6a8a40e03 100644 --- a/tools/ts-api-guardian/index.bzl +++ b/tools/ts-api-guardian/index.bzl @@ -123,7 +123,7 @@ def ts_api_guardian_test_npm_package( data = data, entry_point = "@angular//tools/ts-api-guardian:bin/ts-api-guardian", tags = kwargs.pop("tags", []) + ["api_guard"], - templated_args = args + ["--autoDiscoverEntrypoints", "--verifyDir", goldenDir, "--rootDir", actualDir], + templated_args = args + ["--autoDiscoverEntrypoints", "--verifyDir", goldenDir, "--rootDir", "$(rlocation %s)" % actualDir], **kwargs ) @@ -133,6 +133,6 @@ def ts_api_guardian_test_npm_package( data = data, entry_point = "@angular//tools/ts-api-guardian:bin/ts-api-guardian", tags = kwargs.pop("tags", []) + ["api_guard"], - templated_args = args + ["--autoDiscoverEntrypoints", "--outDir", goldenDir, "--rootDir", actualDir], + templated_args = args + ["--autoDiscoverEntrypoints", "--outDir", goldenDir, "--rootDir", "$(rlocation %s)" % actualDir], **kwargs )