build: update to rules_nodejs 1.0.0 (#18064)

gregmagolan · mmalerba · commit ad689cdbbefc · 2020-01-06T14:58:56.000-08:00
Dependency sandwich exists between material & angular so we need to patch both @angular/bazel & ts-api-guardian npm packages to land this so that the material-unit-test CI job in angular/angular#34589 can be greened up.
diff --git a/WORKSPACE b/WORKSPACE
@@ -8,21 +8,22 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Add NodeJS rules
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "a54b2511d6dae42c1f7cdaeb08144ee2808193a088004fc3b464a04583d5aa2e",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.42.3/rules_nodejs-0.42.3.tar.gz"],
+    sha256 = "3887b948779431ac443e6a64f31b9e1e17b8d386a31eebc50ec1d9b0a6cabd2b",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.0.0/rules_nodejs-1.0.0.tar.gz"],
 )
 
 # Add sass rules
 http_archive(
     name = "io_bazel_rules_sass",
-    sha256 = "ad08e8c82aa1f48b72dc295cb83bba33f514cdf24cc7b0e21e9353f20f0dc147",
-    strip_prefix = "rules_sass-5d1b26f8cd12c5d75dd359f9291090b341e8fd52",
-    # We need to use a version that includes SHA 5d1b26f8cd12c5d75dd359f9291090b341e8fd52 of
-    # the "rules_sass" repository as it adds support for workers.
-    url = "https://github.com/bazelbuild/rules_sass/archive/5d1b26f8cd12c5d75dd359f9291090b341e8fd52.zip",
+    sha256 = "77e241148f26d5dbb98f96fe0029d8f221c6cb75edbb83e781e08ac7f5322c5f",
+    strip_prefix = "rules_sass-1.24.0",
+    urls = [
+        "https://github.com/bazelbuild/rules_sass/archive/1.24.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/1.24.0.zip",
+    ],
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
+load("@build_bazel_rules_nodejs//:index.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
 # The minimum bazel version to use with this repo is v1.1.0.
 check_bazel_version("1.1.0")
diff --git a/package.json b/package.json
@@ -71,10 +71,10 @@
     "@bazel/bazel": "^1.1.0",
     "@bazel/buildifier": "^0.29.0",
     "@bazel/ibazel": "^0.10.3",
-    "@bazel/jasmine": "^0.41.0",
-    "@bazel/karma": "^0.41.0",
-    "@bazel/protractor": "^0.41.0",
-    "@bazel/typescript": "^0.41.0",
+    "@bazel/jasmine": "1.0.0",
+    "@bazel/karma": "1.0.0",
+    "@bazel/protractor": "1.0.0",
+    "@bazel/typescript": "1.0.0",
     "@firebase/app-types": "^0.3.2",
     "@octokit/rest": "^16.28.7",
     "@schematics/angular": "^9.0.0-rc.6",
diff --git a/src/cdk/BUILD.bazel b/src/cdk/BUILD.bazel
@@ -51,7 +51,7 @@ ng_package(
     srcs = ["package.json"],
     data = rerootedStyleTargets + CDK_SCSS_LIBS,
     entry_point = ":public-api.ts",
-    packages = [
+    nested_packages = [
         "//src/cdk/schematics:npm_package",
     ],
     tags = ["release-package"],
diff --git a/src/cdk/schematics/BUILD.bazel b/src/cdk/schematics/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
+load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
 load("//:packages.bzl", "VERSION_PLACEHOLDER_REPLACEMENTS")
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
@@ -40,10 +40,10 @@ ts_library(
 )
 
 # This package is intended to be combined into the main @angular/cdk package as a dep.
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [":schematics_assets"],
-    replacements = VERSION_PLACEHOLDER_REPLACEMENTS,
+    substitutions = VERSION_PLACEHOLDER_REPLACEMENTS,
     deps = [":schematics"],
 )
 
diff --git a/src/material/BUILD.bazel b/src/material/BUILD.bazel
@@ -53,7 +53,7 @@ ng_package(
     ] + MATERIAL_SCSS_LIBS,
     entry_point = ":index.ts",
     entry_point_name = "material",
-    packages = ["//src/material/schematics:npm_package"],
+    nested_packages = ["//src/material/schematics:npm_package"],
     tags = ["release-package"],
     deps = MATERIAL_TARGETS + MATERIAL_TESTING_TARGETS,
 )
diff --git a/src/material/schematics/BUILD.bazel b/src/material/schematics/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
+load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
 load("//:packages.bzl", "VERSION_PLACEHOLDER_REPLACEMENTS")
 load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
 
@@ -38,10 +38,10 @@ ts_library(
 )
 
 # This package is intended to be combined into the main @angular/material package as a dep.
-npm_package(
+pkg_npm(
     name = "npm_package",
     srcs = [":schematics_assets"],
-    replacements = VERSION_PLACEHOLDER_REPLACEMENTS,
+    substitutions = VERSION_PLACEHOLDER_REPLACEMENTS,
     deps = [":schematics"],
 )
 
diff --git a/src/universal-app/BUILD.bazel b/src/universal-app/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_test")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test")
 load("//src/cdk:config.bzl", "CDK_TARGETS")
 load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
 load("//src/material:config.bzl", "MATERIAL_TARGETS")
diff --git a/tools/bazel/BUILD.bazel b/tools/bazel/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 
 # Custom "tsc_wrapped" binary that has "tsickle" available as runtime dependency.
 # This is needed as the default compiler for a "ts_library" does not have a dependency
diff --git a/tools/bazel/angular_bazel_rules_nodejs_1.0.0.patch b/tools/bazel/angular_bazel_rules_nodejs_1.0.0.patch
@@ -0,0 +1,77 @@
+diff --git node_modules/@angular/bazel/_BUILD.bazel node_modules/@angular/bazel/_BUILD.bazel
+index 1e4880f..5654615 100755
+--- node_modules/@angular/bazel/_BUILD.bazel
++++ node_modules/@angular/bazel/_BUILD.bazel
+@@ -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(
+         "//src/schematics:package_assets",
+         "//third_party/github.com/bazelbuild/bazel/src/main/protobuf:package_assets",
+     ],
+-    packages = [
++    nested_packages = [
+         "//docs",
+     ],
+-    replacements = {
++    substitutions = {
+         "(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
+         "//": "//",
+         "npm_angular_bazel/": "npm_angular_bazel/",
+diff --git node_modules/@angular/bazel/src/ng_package/ng_package.bzl node_modules/@angular/bazel/src/ng_package/ng_package.bzl
+index 55bd685..8aaefdc 100755
+--- node_modules/@angular/bazel/src/ng_package/ng_package.bzl
++++ node_modules/@angular/bazel/src/ng_package/ng_package.bzl
+@@ -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("//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(
diff --git a/tools/bazel/expand_template.bzl b/tools/bazel/expand_template.bzl
@@ -1,16 +1,16 @@
 """Implementation of the expand_template rule """
 
 def expand_template_impl(ctx):
-    replacements = dict(**ctx.attr.substitutions)
+    substitutions = dict(**ctx.attr.substitutions)
 
     for k in ctx.attr.configuration_env_vars:
         if k in ctx.var.keys():
-            replacements["$%s_TMPL" % k.upper()] = ctx.var[k]
+            substitutions["$%s_TMPL" % k.upper()] = ctx.var[k]
 
     ctx.actions.expand_template(
         template = ctx.file.template,
         output = ctx.outputs.output_name,
-        substitutions = replacements,
+        substitutions = substitutions,
     )
 
 """
diff --git a/tools/bazel/postinstall-patches.js b/tools/bazel/postinstall-patches.js
@@ -29,6 +29,15 @@ shelljs.cd(projectDir);
 // Workaround for https://github.com/angular/angular/issues/18810.
 shelljs.exec('ngc -p angular-tsconfig.json');
 
+// Temporary patch to make @angular/bazel compatible with rules_nodejs 1.0.0.
+// This is needed to resolve the dependency sandwich between angular components and
+// repo framework. It can be removed with a future @angular/bazel update.
+applyPatch(path.join(__dirname, './angular_bazel_rules_nodejs_1.0.0.patch'));
+
+// Temporary patch for ts-api-guardian to be compatible with rules_nodejs 1.0.0.
+// TODO: a new ts-api-guardian release is needed.
+applyPatch(path.join(__dirname, './ts_api_guardian_rules_nodejs_1.0.0.patch'));
+
 // Workaround for https://github.com/angular/angular/issues/30586. It's not possible to
 // enable tsickle decorator processing without enabling import rewriting to closure.
 // This replacement allows us to enable decorator processing without rewriting imports.
diff --git a/tools/bazel/ts_api_guardian_rules_nodejs_1.0.0.patch b/tools/bazel/ts_api_guardian_rules_nodejs_1.0.0.patch
@@ -0,0 +1,13 @@
+diff --git node_modules/ts-api-guardian/index.bzl node_modules/ts-api-guardian/index.bzl
+index d00888a..3142db4 100755
+--- node_modules/ts-api-guardian/index.bzl
++++ node_modules/ts-api-guardian/index.bzl
+@@ -15,7 +15,7 @@
+ """Runs ts_api_guardian
+ """
+ 
+-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "nodejs_test")
++load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test")
+ 
+ COMMON_MODULE_IDENTIFIERS = ["angular", "jasmine", "protractor"]
+ 
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -120,7 +120,7 @@ def ng_package(name, data = [], globals = ROLLUP_GLOBALS, readme_md = None, **kw
         globals = globals,
         data = data + [":license_copied"],
         readme_md = readme_md,
-        replacements = VERSION_PLACEHOLDER_REPLACEMENTS,
+        substitutions = VERSION_PLACEHOLDER_REPLACEMENTS,
         **kwargs
     )
 
diff --git a/tools/dev-server/BUILD.bazel b/tools/dev-server/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 load("//tools:defaults.bzl", "ts_library")
 
 exports_files(["launcher_template.sh"])
diff --git a/tools/dgeni/BUILD.bazel b/tools/dgeni/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 load("//tools:defaults.bzl", "ts_library")
 
 nodejs_binary(
diff --git a/tools/example-module/BUILD.bazel b/tools/example-module/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
diff --git a/tools/highlight-files/BUILD.bazel b/tools/highlight-files/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
diff --git a/tools/markdown-to-html/BUILD.bazel b/tools/markdown-to-html/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
diff --git a/tools/package-docs-content/BUILD.bazel b/tools/package-docs-content/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 load("//tools:defaults.bzl", "ts_library")
 
 nodejs_binary(
diff --git a/yarn.lock b/yarn.lock
@@ -289,31 +289,31 @@
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.10.3.tgz#2e2b8a1d3e885946eac41db2b1aa6801fb319887"
   integrity sha512-v1nXbMTHVlMM4z4uWp6XiRoHAyUlYggF1SOboLLWRp0+D22kWixqArWqnozLw2mOtnxr97BdLjluWiho6A8Hjg==
 
-"@bazel/jasmine@^0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.41.0.tgz#4e9c1622b6ceacdcf12740098d8c99fc3cff6bfb"
-  integrity sha512-vbZaTx05Ab5ZbJ1TDHjwWvtrDYBh4miXVJBdFeSZtquLQ0FQb9iNdMTuDHkEF9aq6nqG+rnjUoQjjmDLC/uRkg==
+"@bazel/jasmine@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.0.0.tgz#12aa82c0e4b7b5658e9e496b73c0cf660df2b0ae"
+  integrity sha512-cheQWMYs0PaS4kYwJC9tmAiyd0tLbPNcgoM+S8plNUp5k0gUVosCvQ0TOrxvRlKEY0ni1hdn9owPx2rUO1J+Wg==
   dependencies:
     jasmine "~3.4.0"
     jasmine-core "~3.4.0"
     v8-coverage "1.0.9"
 
-"@bazel/karma@^0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.41.0.tgz#1ad3b48d8b5cf1e08ed266872c18344c8bd63e94"
-  integrity sha512-L23VC9EUFmrMCYJAT9qPnyezM5IErCJ8URpmXfRo/7IUJ04/l4vQeiyi4iNY7+zw9lbGf2I8seGaPFJrFtxdoQ==
+"@bazel/karma@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.0.0.tgz#6f1e31bc2cb698e50d76f43ec9f1ee095d8e72b8"
+  integrity sha512-esfsHRVWVcp6OyTk/QI1sBV7bcygFiXY6LUMPLPYqVZkQvJ0x+/L1weiwuRrqFf+FCwCajhYjwiR6S9kX2Z9LA==
   dependencies:
     tmp "0.1.0"
 
-"@bazel/protractor@^0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.41.0.tgz#56075a657f236602bd762e712dd42c514baede0c"
-  integrity sha512-sQtAYheBOEcX32BWNyRj5VssCrMbPzEun4x9QPWnoxtBebkxeuZplRjbaoc+PFdVYys+ixwAqTkS49qlV4Ng1w==
+"@bazel/protractor@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.0.0.tgz#b77fde3bb53a008c330c13a953a0bf93aa06b5f1"
+  integrity sha512-8kGuM3NkFfokjzKBlYxK9rUwJO/ICnYTHC567KJk6T4pjm4kfyh6iVI3Df3K+ONRCEYmiuZrQ37U06lzMMGN9g==
 
-"@bazel/typescript@^0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.41.0.tgz#b767c4972cc42fd76c118f21e83e98860afdc249"
-  integrity sha512-i+PXf5BR7aUEA49V+D8OatHonNCDm2MhtjFwEJ7yKKLTPEm4riHWSDASNuOi4iAAe+EB8eKe1Fxh8iSjh/hm4A==
+"@bazel/typescript@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.0.0.tgz#2c7318b9a3aaa730f282b094ddf41dd16fda7b5a"
+  integrity sha512-caNOKz7EjVMgbedjVTreao9++9Sb9oYlU2nqDOMIK8MyoOUQvgGQWhFwF65XXGSb79Tzv8kaFQskoaH/iAs4ng==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ ng_package(`
`53`	`53`	`] + MATERIAL_SCSS_LIBS,`
`54`	`54`	`entry_point = ":index.ts",`
`55`	`55`	`entry_point_name = "material",`
`56`		`- packages = ["//src/material/schematics:npm_package"],`
	`56`	`+ nested_packages = ["//src/material/schematics:npm_package"],`
`57`	`57`	`tags = ["release-package"],`
`58`	`58`	`deps = MATERIAL_TARGETS + MATERIAL_TESTING_TARGETS,`
`59`	`59`	`)`