From 678b4209c8ed95072c73ed6e6978e9226d985a33 Mon Sep 17 00:00:00 2001 From: Alan Agius Date: Tue, 28 Aug 2018 20:04:21 +0200 Subject: [PATCH] fix(bazel): specify the package and lock files using the workspace (#25694) PR Close #25694 --- tools/ts-api-guardian/BUILD.bazel | 1 + tools/ts-api-guardian/index.bzl | 6 +++--- tools/ts-api-guardian/package.json | 3 +++ tools/ts-api-guardian/yarn.lock | 12 ++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel index 689670f9f8..20057f6a9b 100644 --- a/tools/ts-api-guardian/BUILD.bazel +++ b/tools/ts-api-guardian/BUILD.bazel @@ -13,6 +13,7 @@ ts_library( name = "lib", srcs = glob(["lib/*.ts"]), module_name = "ts-api-guardian", + node_modules = "@ts-api-guardian_runtime_deps//:node_modules", tsconfig = "//tools:tsconfig.json", visibility = ["//visibility:public"], ) diff --git a/tools/ts-api-guardian/index.bzl b/tools/ts-api-guardian/index.bzl index f5a170b3c5..9541a81e83 100644 --- a/tools/ts-api-guardian/index.bzl +++ b/tools/ts-api-guardian/index.bzl @@ -17,14 +17,14 @@ load("@build_bazel_rules_nodejs//internal/node:node.bzl", "nodejs_binary", "nodejs_test") -COMMON_MODULE_IDENTIFIERS = ["angular", "jasmine", "protractor"] +COMMON_MODULE_IDENTIFIERS = ["angular", "jasmine", "protractor", "fs", "Symbol"] def ts_api_guardian_test(name, golden, actual, data = [], **kwargs): """Runs ts_api_guardian """ data += [ - "//tools/ts-api-guardian:lib", - "//tools/ts-api-guardian:bin/ts-api-guardian", + "@angular//tools/ts-api-guardian:lib", + "@angular//tools/ts-api-guardian:bin/ts-api-guardian", "@bazel_tools//tools/bash/runfiles", ] diff --git a/tools/ts-api-guardian/package.json b/tools/ts-api-guardian/package.json index 41be8b44f2..ec3fbbac0b 100644 --- a/tools/ts-api-guardian/package.json +++ b/tools/ts-api-guardian/package.json @@ -19,6 +19,9 @@ "minimist": "^1.2.0" }, "devDependencies": { + "@types/diff": "^3.5.1", + "@types/minimist": "^1.2.0", + "@types/node": "^10.9.2", "chai": "^4.1.2", "jasmine": "^3.1.0", "typescript": "~2.6.2" diff --git a/tools/ts-api-guardian/yarn.lock b/tools/ts-api-guardian/yarn.lock index 9e69506d1b..4f06bd4794 100644 --- a/tools/ts-api-guardian/yarn.lock +++ b/tools/ts-api-guardian/yarn.lock @@ -2,6 +2,18 @@ # yarn lockfile v1 +"@types/diff@^3.5.1": + version "3.5.1" + resolved "https://registry.yarnpkg.com/@types/diff/-/diff-3.5.1.tgz#30253f6e177564ad7da707b1ebe46d3eade71706" + +"@types/minimist@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6" + +"@types/node@^10.9.2": + version "10.9.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.2.tgz#f0ab8dced5cd6c56b26765e1c0d9e4fdcc9f2a00" + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"