build: upgrade to rules_nodejs 1.0.0 (first stable release) (#34736)

Brings in the fix for stamping which was preventing many targets from getting cached.

PR Close #34736
This commit is contained in:
Greg Magolan
2019-12-28 16:37:59 -08:00
committed by Matias Niemelä
parent fb7a6ce586
commit c8ba576021
21 changed files with 78 additions and 79 deletions

View File

@ -1,6 +1,6 @@
load("//tools:defaults.bzl", "npm_package")
load("//tools:defaults.bzl", "pkg_npm")
npm_package(
pkg_npm(
name = "npm_package",
srcs = glob(
["*"],
@ -14,10 +14,10 @@ npm_package(
"//packages/bazel/src/schematics:package_assets",
"//packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf:package_assets",
],
packages = [
nested_packages = [
"//packages/bazel/docs",
],
replacements = {
substitutions = {
"(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
"//packages/bazel/": "//",
"angular/packages/bazel/": "npm_angular_bazel/",

View File

@ -15,9 +15,9 @@ specification of this format at https://goo.gl/jB3GVv
load("@build_bazel_rules_nodejs//:providers.bzl", "JSEcmaScriptModuleInfo", "JSNamedModuleInfo", "NpmPackageInfo", "node_modules_aspect")
load(
"@build_bazel_rules_nodejs//internal/npm_package:npm_package.bzl",
"NPM_PACKAGE_ATTRS",
"NPM_PACKAGE_OUTPUTS",
"@build_bazel_rules_nodejs//internal/pkg_npm:pkg_npm.bzl",
"PKG_NPM_ATTRS",
"PKG_NPM_OUTPUTS",
"create_package",
)
load("//packages/bazel/src:external.bzl", "FLAT_DTS_FILE_SUFFIX")
@ -623,7 +623,7 @@ def _ng_package_impl(ctx):
package_dir = create_package(
ctx,
devfiles.to_list(),
[npm_package_directory] + ctx.files.packages,
[npm_package_directory] + ctx.files.nested_packages,
)
return [DefaultInfo(
files = depset([package_dir]),
@ -631,7 +631,7 @@ def _ng_package_impl(ctx):
_NG_PACKAGE_DEPS_ASPECTS = [esm5_outputs_aspect, ng_package_module_mappings_aspect, node_modules_aspect]
_NG_PACKAGE_ATTRS = dict(NPM_PACKAGE_ATTRS, **{
_NG_PACKAGE_ATTRS = dict(PKG_NPM_ATTRS, **{
"srcs": attr.label_list(
doc = """JavaScript source files from the workspace.
These can use ES2015 syntax and ES Modules (import/export)""",
@ -807,12 +807,12 @@ def _ng_package_outputs(name, entry_point, entry_point_name):
"umd": "%s.umd.js" % basename,
"umd_min": "%s.umd.min.js" % basename,
}
for key in NPM_PACKAGE_OUTPUTS:
# NPM_PACKAGE_OUTPUTS is a "normal" dict-valued outputs so it looks like
for key in PKG_NPM_OUTPUTS:
# PKG_NPM_OUTPUTS is a "normal" dict-valued outputs so it looks like
# "pack": "%{name}.pack",
# But this is a function-valued outputs.
# Bazel won't replace the %{name} token so we have to do it.
outputs[key] = NPM_PACKAGE_OUTPUTS[key].replace("%{name}", name)
outputs[key] = PKG_NPM_OUTPUTS[key].replace("%{name}", name)
return outputs
ng_package = rule(

View File

@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "ng_module", "ng_package", "npm_package")
load("//tools:defaults.bzl", "ng_module", "ng_package", "pkg_npm")
package(default_visibility = ["//packages/bazel/test:__subpackages__"])
@ -26,7 +26,7 @@ ng_package(
],
entry_point = ":index.ts",
entry_point_name = "waffels",
packages = [
nested_packages = [
":arbitrary_npm_package",
],
deps = [
@ -52,7 +52,7 @@ genrule(
output_to_bindir = True,
)
npm_package(
pkg_npm(
name = "arbitrary_npm_package",
srcs = [":arbitrary-npm-package-main.js"],
)

View File

@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "npm_package", "ts_library")
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
package(default_visibility = ["//visibility:public"])
@ -18,7 +18,7 @@ ts_library(
],
)
npm_package(
pkg_npm(
name = "npm_package",
srcs = [
"README.md",

View File

@ -26,7 +26,7 @@ ng_package(
"//packages/common/upgrade:package.json",
],
entry_point = ":index.ts",
packages = ["//packages/common/locales:package"],
nested_packages = ["//packages/common/locales:package"],
tags = [
"release-with-framework",
],

View File

@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "npm_package", "ts_library")
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
package(default_visibility = ["//visibility:public"])
@ -10,11 +10,10 @@ ts_library(
),
)
npm_package(
pkg_npm(
name = "package",
srcs = glob(["global/*.js"]) + ["package.json"],
replacements = {
substitutions = {
# Workaround for `.d.ts`` containing `/// <amd-module .../>`
# which are generated in TypeScript v2.9, but not before.
"/// <amd-module name=.*/>": "",

View File

@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "npm_package", "ts_library")
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
load("@npm_bazel_typescript//:index.bzl", "ts_config")
ts_config(
@ -53,7 +53,7 @@ ts_library(
],
)
npm_package(
pkg_npm(
name = "npm_package",
srcs = [
"package.json",

View File

@ -30,7 +30,7 @@ ng_package(
"//packages/core/testing:package.json",
],
entry_point = ":index.ts",
packages = [
nested_packages = [
"//packages/core/schematics:npm_package",
],
tags = [

View File

@ -1,11 +1,11 @@
load("//tools:defaults.bzl", "npm_package")
load("//tools:defaults.bzl", "pkg_npm")
exports_files([
"tsconfig.json",
"migrations.json",
])
npm_package(
pkg_npm(
name = "npm_package",
srcs = ["migrations.json"],
visibility = ["//packages/core:__pkg__"],

View File

@ -24,7 +24,7 @@ ng_package(
"**/package.json",
]),
entry_point = ":index.ts",
packages = [
nested_packages = [
"//packages/elements/schematics:npm_package",
],
tags = [

View File

@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "npm_package")
load("//tools:defaults.bzl", "pkg_npm")
package(default_visibility = ["//visibility:public"])
@ -15,7 +15,7 @@ genrule(
output_to_bindir = 1,
)
npm_package(
pkg_npm(
name = "npm_package",
srcs = [
"collection.json",

View File

@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "npm_package", "ts_library")
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
package(default_visibility = ["//visibility:public"])
@ -20,7 +20,7 @@ ts_library(
],
)
npm_package(
pkg_npm(
name = "npm_package",
srcs = ["package.json"],
tags = [

View File

@ -24,7 +24,7 @@ ng_package(
"//packages/localize/init:package.json",
],
entry_point = ":index.ts",
packages = [
nested_packages = [
"//packages/localize/schematics:npm_package",
"//packages/localize/src/tools:npm_package",
],

View File

@ -1,4 +1,4 @@
load("//tools:defaults.bzl", "npm_package")
load("//tools:defaults.bzl", "pkg_npm")
package(default_visibility = ["//visibility:public"])
@ -10,7 +10,7 @@ filegroup(
visibility = ["//packages/localize:__subpackages__"],
)
npm_package(
pkg_npm(
name = "npm_package",
srcs = [
"collection.json",

View File

@ -1,6 +1,6 @@
package(default_visibility = ["//visibility:public"])
load("//tools:defaults.bzl", "npm_package", "ts_library")
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
load("@npm_bazel_typescript//:index.bzl", "ts_config")
ts_config(
@ -30,7 +30,7 @@ ts_library(
],
)
npm_package(
pkg_npm(
name = "npm_package",
srcs = [
],

View File

@ -1,4 +1,4 @@
load("@build_bazel_rules_nodejs//:index.bzl", "npm_package")
load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
load("//packages/zone.js:bundles.bzl", "ES2015_BUNDLES", "ES5_BUNDLES", "ES5_GLOBAL_BUNDLES")
exports_files([
@ -21,7 +21,7 @@ genrule(
cmd = "(echo '/**\n @license' && cat $< && echo '*/') > $@",
)
npm_package(
pkg_npm(
name = "npm_package",
srcs = [
"CHANGELOG.md",