Skip to content

Commit

Permalink
build: use api-golden tool from dev-infra for testing public API (ang…
Browse files Browse the repository at this point in the history
…ular#42688)

Switches our TS API guardian targets to rather use the new tool from
dev-infra that relies on Microsoft's API extractor.

PR Close angular#42688
  • Loading branch information
devversion authored and thePunderWoman committed Jun 30, 2021
1 parent 56bd21d commit 9db69a9
Show file tree
Hide file tree
Showing 15 changed files with 64 additions and 64 deletions.
2 changes: 1 addition & 1 deletion goldens/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ exports_files([
filegroup(
name = "public-api",
srcs = glob([
"public-api/**/*.d.ts",
"public-api/**/*.md",
]),
)
8 changes: 4 additions & 4 deletions packages/animations/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -40,12 +40,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "animations_api",
actualDir = "angular/packages/animations/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/animations",
golden_dir = "angular/goldens/public-api/animations",
npm_package = "angular/packages/animations/npm_package",
)
8 changes: 4 additions & 4 deletions packages/common/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -52,12 +52,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "common_api",
actualDir = "angular/packages/common/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/common",
golden_dir = "angular/goldens/public-api/common",
npm_package = "angular/packages/common/npm_package",
)
14 changes: 7 additions & 7 deletions packages/compiler-cli/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "pkg_npm", "ts_api_guardian_test", "ts_config", "ts_library")
load("//tools:defaults.bzl", "api_golden_test", "pkg_npm", "ts_config", "ts_library")

# Load ng_perf_flag explicitly from ng_perf.bzl as it's private API, and not exposed to other
# consumers of @angular/bazel.
Expand Down Expand Up @@ -73,24 +73,24 @@ pkg_npm(
],
)

ts_api_guardian_test(
api_golden_test(
name = "error_code_api",
actual = "angular/packages/compiler-cli/npm_package/src/ngtsc/diagnostics/src/error_code.d.ts",
data = [
":npm_package",
"//goldens:public-api",
],
golden = "angular/goldens/public-api/compiler-cli/error_code.d.ts",
entry_point = "angular/packages/compiler-cli/npm_package/src/ngtsc/diagnostics/src/error_code.d.ts",
golden = "angular/goldens/public-api/compiler-cli/error_code.md",
)

ts_api_guardian_test(
api_golden_test(
name = "compiler_options_api",
actual = "angular/packages/compiler-cli/npm_package/src/ngtsc/core/api/src/public_options.d.ts",
data = [
":npm_package",
"//goldens:public-api",
],
golden = "angular/goldens/public-api/compiler-cli/compiler_options.d.ts",
entry_point = "angular/packages/compiler-cli/npm_package/src/ngtsc/core/api/src/public_options.d.ts",
golden = "angular/goldens/public-api/compiler-cli/compiler_options.md",
)

# Controls whether the Ivy compiler produces performance traces as part of each build
Expand Down
14 changes: 7 additions & 7 deletions packages/core/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -55,22 +55,22 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "core_api",
actualDir = "angular/packages/core/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/core",
golden_dir = "angular/goldens/public-api/core",
npm_package = "angular/packages/core/npm_package",
)

ts_api_guardian_test(
api_golden_test(
name = "ng_global_utils_api",
actual = "angular/packages/core/src/render3/global_utils_api.d.ts",
data = [
"//goldens:public-api",
"//packages/core",
],
golden = "angular/goldens/public-api/core/global_utils.d.ts",
entry_point = "angular/packages/core/src/render3/global_utils_api.d.ts",
golden = "angular/goldens/public-api/core/global_utils.md",
)
8 changes: 4 additions & 4 deletions packages/elements/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -35,12 +35,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "elements_api",
actualDir = "angular/packages/elements/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/elements",
golden_dir = "angular/goldens/public-api/elements",
npm_package = "angular/packages/elements/npm_package",
)
8 changes: 4 additions & 4 deletions packages/forms/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -38,12 +38,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "forms_api",
actualDir = "angular/packages/forms/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/forms",
golden_dir = "angular/goldens/public-api/forms",
npm_package = "angular/packages/forms/npm_package",
)
8 changes: 4 additions & 4 deletions packages/localize/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_package", "ts_api_guardian_test_npm_package", "ts_library")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_package", "ts_library")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -37,12 +37,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "localize_api",
actualDir = "angular/packages/localize/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/localize",
golden_dir = "angular/goldens/public-api/localize",
npm_package = "angular/packages/localize/npm_package",
)
8 changes: 4 additions & 4 deletions packages/platform-browser-dynamic/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -41,12 +41,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "platform-browser-dynamic_api",
actualDir = "angular/packages/platform-browser-dynamic/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/platform-browser-dynamic",
golden_dir = "angular/goldens/public-api/platform-browser-dynamic",
npm_package = "angular/packages/platform-browser-dynamic/npm_package",
)
8 changes: 4 additions & 4 deletions packages/platform-browser/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -44,12 +44,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "platform-browser_api",
actualDir = "angular/packages/platform-browser/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/platform-browser",
golden_dir = "angular/goldens/public-api/platform-browser",
npm_package = "angular/packages/platform-browser/npm_package",
)
8 changes: 4 additions & 4 deletions packages/platform-server/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -50,12 +50,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "platform-server_api",
actualDir = "angular/packages/platform-server/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/platform-server",
golden_dir = "angular/goldens/public-api/platform-server",
npm_package = "angular/packages/platform-server/npm_package",
)
8 changes: 4 additions & 4 deletions packages/router/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -44,12 +44,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "router_api",
actualDir = "angular/packages/router/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/router",
golden_dir = "angular/goldens/public-api/router",
npm_package = "angular/packages/router/npm_package",
)
8 changes: 4 additions & 4 deletions packages/service-worker/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -59,12 +59,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "service-worker_api",
actualDir = "angular/packages/service-worker/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/service-worker",
golden_dir = "angular/goldens/public-api/service-worker",
npm_package = "angular/packages/service-worker/npm_package",
)
8 changes: 4 additions & 4 deletions packages/upgrade/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "ts_api_guardian_test_npm_package")
load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -39,12 +39,12 @@ ng_package(
],
)

ts_api_guardian_test_npm_package(
api_golden_test_npm_package(
name = "upgrade_api",
actualDir = "angular/packages/upgrade/npm_package",
data = [
":npm_package",
"//goldens:public-api",
],
goldenDir = "angular/goldens/public-api/upgrade",
golden_dir = "angular/goldens/public-api/upgrade",
npm_package = "angular/packages/upgrade/npm_package",
)
10 changes: 5 additions & 5 deletions tools/defaults.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ load("@npm//typescript:index.bzl", "tsc")
load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
load("//dev-infra/benchmark/ng_rollup_bundle:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle")
load("//tools:ng_benchmark.bzl", _ng_benchmark = "ng_benchmark")
load("//tools/ts-api-guardian:index.bzl", _ts_api_guardian_test = "ts_api_guardian_test", _ts_api_guardian_test_npm_package = "ts_api_guardian_test_npm_package")
load("//dev-infra/bazel/api-golden:index.bzl", _api_golden_test = "api_golden_test", _api_golden_test_npm_package = "api_golden_test_npm_package")

_DEFAULT_TSCONFIG_TEST = "//packages:tsconfig-test"
_INTERNAL_NG_MODULE_API_EXTRACTOR = "//packages/bazel/src/api-extractor:api_extractor"
Expand Down Expand Up @@ -495,16 +495,16 @@ def rollup_bundle(name, testonly = False, sourcemap = "true", **kwargs):
terser_minified(name = name + ".min.es5umd", testonly = testonly, src = name + ".es5umd", **common_terser_args)
native.filegroup(name = name + ".min.es5umd.js", testonly = testonly, srcs = [name + ".min.es5umd"])

def ts_api_guardian_test(**kwargs):
_ts_api_guardian_test(
def api_golden_test(**kwargs):
_api_golden_test(
tags = [
"fixme-ivy-aot",
],
**kwargs
)

def ts_api_guardian_test_npm_package(**kwargs):
_ts_api_guardian_test_npm_package(
def api_golden_test_npm_package(**kwargs):
_api_golden_test_npm_package(
tags = [
"fixme-ivy-aot",
],
Expand Down

0 comments on commit 9db69a9

Please sign in to comment.