build(bazel): update to rules_typescript 0.17.0 & rules_nodejs 0.13.4 (#25920)

PR Close #25920
This commit is contained in:
Greg Magolan
2018-09-11 18:11:32 -07:00
committed by Ben Lesh
parent f47f2628e1
commit b99d7ed5bf
65 changed files with 111 additions and 258 deletions

View File

@ -1,9 +1,10 @@
"""Re-export of some bazel rules with repository-wide defaults."""
load("@build_bazel_rules_nodejs//:defs.bzl", _npm_package = "npm_package")
load("@build_bazel_rules_nodejs//:defs.bzl", _jasmine_node_test = "jasmine_node_test", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package")
load("@build_bazel_rules_typescript//:defs.bzl", _ts_library = "ts_library", _ts_web_test_suite = "ts_web_test_suite")
load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
load("//packages/bazel/src:ng_module.bzl", _internal_global_ng_module = "internal_global_ng_module")
load("//packages/bazel/src:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle")
DEFAULT_TSCONFIG_BUILD = "//packages:tsconfig-build.json"
DEFAULT_TSCONFIG_TEST = "//packages:tsconfig-test.json"
@ -71,7 +72,7 @@ def ivy_ng_module(name, tsconfig = None, entry_point = None, testonly = False, *
entry_point = "public_api.ts"
_internal_global_ng_module(name = name, flat_module_out_file = name, tsconfig = tsconfig, entry_point = entry_point, testonly = testonly, **kwargs)
def ng_package(name, readme_md = None, license_banner = None, **kwargs):
def ng_package(name, node_modules = DEFAULT_NODE_MODULES, readme_md = None, license_banner = None, **kwargs):
if not readme_md:
readme_md = "//packages:README.md"
if not license_banner:
@ -82,6 +83,7 @@ def ng_package(name, readme_md = None, license_banner = None, **kwargs):
readme_md = readme_md,
license_banner = license_banner,
replacements = PKG_GROUP_REPLACEMENTS,
node_modules = node_modules,
**kwargs
)
@ -116,3 +118,12 @@ def ts_web_test_suite(bootstrap = [], deps = [], **kwargs):
],
**kwargs
)
def nodejs_binary(node_modules = DEFAULT_NODE_MODULES, **kwargs):
_nodejs_binary(node_modules = node_modules, **kwargs)
def jasmine_node_test(node_modules = DEFAULT_NODE_MODULES, **kwargs):
_jasmine_node_test(node_modules = node_modules, **kwargs)
def ng_rollup_bundle(node_modules = DEFAULT_NODE_MODULES, **kwargs):
_ng_rollup_bundle(node_modules = node_modules, **kwargs)

View File

@ -19,7 +19,7 @@ def ng_setup_workspace():
package_json = "@angular//:package.json",
yarn_lock = "@angular//:yarn.lock",
data = ["@angular//:tools/yarn/check-yarn.js", "@angular//:tools/postinstall-patches.js"],
node_modules_filegroup = """
manual_build_file_contents = """package(default_visibility = ["//visibility:public"])
filegroup(
name = "node_modules",
srcs = glob(["/".join([

View File

@ -1,7 +1,6 @@
package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "ts_library")
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
ts_library(
name = "lib",

View File

@ -10,7 +10,9 @@
# because it introduces an extra target_bin target.
load("@build_bazel_rules_nodejs//internal/node:node.bzl", "nodejs_binary", "nodejs_test")
def js_expected_symbol_test(name, src, golden, **kwargs):
DEFAULT_NODE_MODULES = "@angular_deps//:node_modules"
def js_expected_symbol_test(name, src, golden, node_modules = DEFAULT_NODE_MODULES, **kwargs):
"""This test verifies that a set of top level symbols from a javascript file match a gold file.
"""
all_data = [src, golden]
@ -23,6 +25,7 @@ def js_expected_symbol_test(name, src, golden, **kwargs):
data = all_data,
entry_point = entry_point,
templated_args = ["$(location %s)" % src, "$(location %s)" % golden],
node_modules = node_modules,
**kwargs
)
@ -32,5 +35,6 @@ def js_expected_symbol_test(name, src, golden, **kwargs):
data = all_data,
entry_point = entry_point,
templated_args = ["$(location %s)" % src, "$(location %s)" % golden, "--accept"],
node_modules = node_modules,
**kwargs
)

View File

@ -1,4 +1,4 @@
load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
load("//tools:defaults.bzl", "jasmine_node_test")
jasmine_node_test(
name = "validate-commit-message",