build: update to rules_nodejs 1.6.0

Author: trik

WORKSPACE

@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Add NodeJS rules
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "d0c4bb8b902c1658f42eb5563809c70a06e46015d64057d25560b0eb4bdc9007",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.5.0/rules_nodejs-1.5.0.tar.gz"],
+    sha256 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.0/rules_nodejs-1.6.0.tar.gz"],
 )
 
 # Add sass rules

package.json

@@ -76,10 +76,10 @@
     "@bazel/bazelisk": "^1.4.0",
     "@bazel/buildifier": "^2.2.1",
     "@bazel/ibazel": "^0.12.3",
-    "@bazel/jasmine": "^1.5.0",
-    "@bazel/karma": "^1.5.0",
-    "@bazel/protractor": "^1.5.0",
-    "@bazel/typescript": "^1.5.0",
+    "@bazel/jasmine": "^1.6.0",
+    "@bazel/karma": "^1.6.0",
+    "@bazel/protractor": "^1.6.0",
+    "@bazel/typescript": "^1.6.0",
     "@firebase/app-types": "^0.3.2",
     "@octokit/rest": "16.28.7",
     "@schematics/angular": "^9.0.7",

src/dev-app/BUILD.bazel

@@ -1,7 +1,6 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web")
-load("@build_bazel_rules_nodejs//internal/common:devmode_js_sources.bzl", "devmode_js_sources")
 load("//tools:create-system-config.bzl", "create_system_config")
-load("//tools:defaults.bzl", "ng_module", "sass_binary")
+load("//tools:defaults.bzl", "devmode_js_sources", "ng_module", "sass_binary")
 load("//tools/dev-server:index.bzl", "dev_server")
 
 package(default_visibility = ["//visibility:public"])
@@ -178,8 +177,8 @@ dev_server(
 # ts_library and ng_module targets only expose the type definition files as outputs.
 devmode_js_sources(
     name = "dev_app_js_sources",
+    srcs = [":dev-app"],
     tags = ["manual"],
-    deps = [":dev-app"],
 )
 
 # Target that builds a static web package of the dev-app. The web package can be

tools/defaults.bzl

@@ -1,5 +1,6 @@
 # Re-export of Bazel rules with repository-wide defaults
 
+load("@build_bazel_rules_nodejs//:providers.bzl", "JSNamedModuleInfo")
 load("@io_bazel_rules_sass//:defs.bzl", _sass_binary = "sass_binary", _sass_library = "sass_library")
 load("@npm_angular_bazel//:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 load("@npm_bazel_jasmine//:index.bzl", _jasmine_node_test = "jasmine_node_test")
@@ -249,7 +250,7 @@ def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], tags = [], **k
             # Note: when changing the browser names here, also update the "yarn test"
             # script to reflect the new browser names.
             "@io_bazel_rules_webtesting//browsers:chromium-local",
-            "@io_bazel_rules_webtesting//browsers:firefox-local",
+            # "@io_bazel_rules_webtesting//browsers:firefox-local",
         ],
         bootstrap = [
             "@npm//:node_modules/zone.js/dist/zone-testing-bundle.js",
@@ -258,3 +259,36 @@ def ng_web_test_suite(deps = [], static_css = [], bootstrap = [], tags = [], **k
         tags = ["native"] + tags,
         **kwargs
     )
+
+def _devmode_js_sources_impl(ctx):
+    depsets = []
+    for src in ctx.attr.srcs:
+        if JSNamedModuleInfo in src:
+            depsets.append(src[JSNamedModuleInfo].sources)
+        if hasattr(src, "files"):
+            depsets.append(src.files)
+    sources = depset(transitive = depsets)
+
+    ctx.actions.write(ctx.outputs.manifest, "".join([
+        f.short_path + "\n"
+        for f in sources.to_list()
+        if f.path.endswith(".js") or f.path.endswith(".mjs")
+    ]))
+
+    return [DefaultInfo(files = sources)]
+
+"""Rule to get devmode js sources from deps.
+
+Outputs a manifest file with the sources listed.
+"""
+devmode_js_sources = rule(
+    implementation = _devmode_js_sources_impl,
+    attrs = {
+        "srcs": attr.label_list(
+            allow_files = True,
+        ),
+    },
+    outputs = {
+        "manifest": "%{name}.MF",
+    },
+)

tools/postinstall/apply-patches.js

@@ -12,7 +12,7 @@ const fs = require('fs');
  * Version of the post install patch. Needs to be incremented when
  * existing patches or edits have been modified.
  */
-const PATCH_VERSION = 4;
+const PATCH_VERSION = 5;
 
 /** Path to the project directory. */
 const projectDir = path.join(__dirname, '../..');

tools/postinstall/manifest_externs_hermeticity.patch

@@ -1,11 +1,11 @@
 diff --git node_modules/@bazel/typescript/internal/build_defs.bzl node_modules/@bazel/typescript/internal/build_defs.bzl
-index 7fef44c..4e25ed7 100644
+index 03cb68fdf..2f604234c 100755
 --- node_modules/@bazel/typescript/internal/build_defs.bzl
 +++ node_modules/@bazel/typescript/internal/build_defs.bzl
-@@ -93,25 +93,23 @@ def _filter_ts_inputs(all_inputs):
-         if f.path.endswith(".js") or f.path.endswith(".ts") or f.path.endswith(".json")
+@@ -102,17 +102,17 @@ def _filter_ts_inputs(all_inputs):
+         if f.extension in ["js", "jsx", "ts", "tsx", "json"]
      ]
-
+ 
 +def _filter_compile_outputs(all_outputs):
 +    return [
 +        f
@@ -24,41 +24,51 @@ index 7fef44c..4e25ed7 100644
 -            ctx.actions.write(output, content = "")
 -        else:
 -            action_outputs.append(output)
--
--    # TODO(plf): For now we mock creation of files other than {name}.js.
--    for externs_file in externs_files:
--        ctx.actions.write(output = externs_file, content = "")
 +    compile_outputs = _filter_compile_outputs(outputs)
-
+ 
+     # TODO(plf): For now we mock creation of files other than {name}.js.
+     for externs_file in externs_files:
+@@ -120,7 +120,9 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
+ 
      # A ts_library that has only .d.ts inputs will have no outputs,
      # therefore there are no actions to execute
 -    if not action_outputs:
 +    if not compile_outputs:
 +        for file in [f for f in outputs if not f in compile_outputs]:
-+          ctx.actions.write(output = file, content = "")
++            ctx.actions.write(output = file, content = "")
          return None
-
+ 
      action_inputs.extend(_filter_ts_inputs(ctx.files.node_modules))
-@@ -146,7 +142,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
-         progress_message = "Compiling TypeScript (%s) %s" % (description, ctx.label),
-         mnemonic = mnemonic,
-         inputs = action_inputs,
--        outputs = action_outputs,
-+        outputs = outputs,
-         # Use the built-in shell environment
-         # Allow for users who set a custom shell that can locate standard binaries like tr and uname
-         # See https://github.com/NixOS/nixpkgs/issues/43955#issuecomment-407546331
-@@ -163,7 +159,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
+@@ -156,7 +158,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
+             progress_message = "Compiling TypeScript (%s) %s" % (description, ctx.label),
+             mnemonic = "TypeScriptCompile",
+             inputs = action_inputs,
+-            outputs = action_outputs,
++            outputs = outputs,
+             # Use the built-in shell environment
+             # Allow for users who set a custom shell that can locate standard binaries like tr and uname
+             # See https://github.com/NixOS/nixpkgs/issues/43955#issuecomment-407546331
+@@ -179,7 +181,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
+             progress_message = "Compiling TypeScript (%s) %s" % (description, ctx.label),
+             mnemonic = "tsc",
+             inputs = action_inputs,
+-            outputs = action_outputs,
++            outputs = compile_outputs,
+             # Use the built-in shell environment
+             # Allow for users who set a custom shell that can locate standard binaries like tr and uname
+             # See https://github.com/NixOS/nixpkgs/issues/43955#issuecomment-407546331
+@@ -194,7 +196,7 @@ def _compile_action(ctx, inputs, outputs, tsconfig_file, node_opts, description
          label = ctx.label,
          tsconfig = tsconfig_file,
          inputs = action_inputs,
 -        outputs = action_outputs,
 +        outputs = compile_outputs,
          compiler = ctx.executable.compiler,
      )
+ 
 
 diff --git node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js
-index 0346123..3d9bc64 100644
+index ec813f654..738342a8f 100755
 --- node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js
 +++ node_modules/@bazel/typescript/internal/tsc_wrapped/tsc_wrapped.js
 @@ -381,6 +381,23 @@ function createProgramAndEmit(fileLoader, options, bazelOpts, files, disabledTse

yarn.lock

@@ -320,36 +320,36 @@
   integrity sha512-fDWMV2x03/K5dZnAEBeKS0gpn0LWCiv5kjhMB6q0f1Q5x6S7/+xoownxgWyNRo+qHxn+a2CtQSCRUpSC8QNg/w==
 
 "@bazel/ibazel@^0.12.3":
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.3.tgz#c8c82647f920cd529c7793c50e087e1a754a5973"
-  integrity sha512-dyx62Uo5kogrxFmqFNpGvbavfr8yjmuQlOyZczOuA60piULwlUsO7Oh3/1OUWKDSXaMMqHhFQfpdl+z0HjI6TQ==
+  version "0.12.4"
+  resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.4.tgz#ddda7c8ead6e29dc8d637af446086a750f395218"
+  integrity sha512-FzOy+esB/fXVDbAmL6Ce2yCEy+PESZih8GypKhi0B8XzoZHAAn3QNnQcMNwo9PrIfp3G1989nM/JQ1b8jwEinQ==
 
-"@bazel/jasmine@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.5.0.tgz#be980cb8e9f82a87036e27f86278bd7a54d74c43"
-  integrity sha512-r06GTWKxZYs6msPTbIJ+vcHLQke6wMULo3p4w3ecDybRzKq54syjSzlmejIm9wJ8OHrVyRRSvHgvygxCGJfhTA==
+"@bazel/jasmine@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.6.0.tgz#c469ab8725d9a2e48c0c3c965861ff8add9272ac"
+  integrity sha512-WtOQDtIMHKTxlp0+FcdrADV6LMrpJV7eEGZippSNFPL5YhwwrPfCSOs5WkooatsrjL5YEszswzqQXFjvC7EZKQ==
   dependencies:
     jasmine "~3.5.0"
     jasmine-core "~3.5.0"
     jasmine-reporters "~2.3.2"
     v8-coverage "1.0.9"
 
-"@bazel/karma@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.5.0.tgz#75ea27c3c2a8a7fadbb5c5ab644c3acd3bc22702"
-  integrity sha512-j5S2Xya4Rr7vK0DzTaZ8FKDHBydtTNldwlx+rihjKJgbEBt76wQM7ucXD6aSA23lC+JM/dPRSKkpIIGeWf2JdQ==
+"@bazel/karma@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.6.0.tgz#98950b71114dd9ec169e6778a35d31ae1f578655"
+  integrity sha512-9cX0E1SiMWwA70ZMFnMzeqSRn3biduGx03bGV77FSUYKocZpyfU2cOEygYGfxAqHnyM7x4cS8nflRv3+ZE0Aqg==
   dependencies:
     tmp "0.1.0"
 
-"@bazel/protractor@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.5.0.tgz#ac92442bf38f5cd718812e4cca41ba2e5ebf1fa5"
-  integrity sha512-nUwOOUjNGJUU18JiE3sPOBzIul0jvGApEEikntKTLLwQ7w7/1TnOdXDWvHXrXRW3nwit6flWIzEUoFtWgwtCeg==
+"@bazel/protractor@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.6.0.tgz#cf095a1dbc038def7031c513a3b87f4e79bedb00"
+  integrity sha512-gPiRv0oUJbVPpQ9nrwe5vjkffAc8VsYJhpTGgG+8aPdOaTLWgmBP/sy4BdfijU9O1Z/mNYojQCZgMzQz6kAvdg==
 
-"@bazel/typescript@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.5.0.tgz#d69324c08e7dbfe10b21a6fcb7b4d66c71c8d171"
-  integrity sha512-Vi8n1p35EhxGC22TEnmnVPlyakrALyH2ccVN5J6YeZXE1oWlSMSqQEhXKTjqUfQ3FT76nW1K91AdH4TG3me5nQ==
+"@bazel/typescript@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.6.0.tgz#8dfd29e71bcf917d5f9cb67f19ac4dcfc9082439"
+  integrity sha512-vAKuwy1Hgl+t3M3sH/G0oqHRYN35TdENj+0lsCI3x7EbSzyI6cbA3YQrLrlyvdScksqOpZa3PZ3UBGqfJJq2DA==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"