Fix runfiles.

Author: ribrdb

closure/compiler/closure_js_library.bzl

@@ -108,7 +108,6 @@ def _closure_js_library_impl(
         convention = "CLOSURE",
         no_closure_library = False,
         internal_expect_failure = False,
-        ts_lib=None,
 
         # These file definitions for our outputs are deprecated,
         # and will be replaced with |actions.declare_file()| soon.
@@ -150,15 +149,6 @@ def _closure_js_library_impl(
         "%s.i.js" % label.name,
     )
 
-    # Wrapper around a ts_library. It's  like creating a closure_js_library with 
-    # the runtime_deps of the ts_library, and the srcs are the tsickle outputs from 
-    # the ts_library.
-    if ts_lib:
-        srcs = srcs + ts_lib.typescript.transitive_es6_sources.to_list()
-        # Note that we need to modify deps before calling unfurl below for exports to work.
-        deps = deps + ts_lib.typescript.runtime_deps.to_list()
-        suppress = suppress + ["checkTypes", "reportUnknownTypes", "analyzerChecks", "JSC_EXTRA_REQUIRE_WARNING"]
-
     # Create a list of direct children of this rule. If any direct dependencies
     # have the exports attribute, those labels become direct dependencies here.
     deps = unfurl(deps, provider = "closure_js_library")
@@ -393,14 +383,26 @@ def _closure_js_library(ctx):
         print("closure_js_library 'externs' is deprecated; just use 'srcs'")
         srcs = ctx.files.externs + srcs
 
+    deps = ctx.attr.deps
+    suppress = ctx.attr.suppress
+
+    # Wrapper around a ts_library. It's  like creating a closure_js_library with 
+    # the runtime_deps of the ts_library, and the srcs are the tsickle outputs from 
+    # the ts_library.
+    if ctx.attr.ts_lib:
+        srcs = srcs + ctx.attr.ts_lib.typescript.transitive_es6_sources.to_list()
+        # Note that we need to modify deps before calling unfurl below for exports to work.
+        deps = deps + ctx.attr.ts_lib.typescript.runtime_deps.to_list()
+        suppress = suppress + ["checkTypes", "strictCheckTypes", "reportUnknownTypes", "analyzerChecks", "JSC_EXTRA_REQUIRE_WARNING"]
+
     library = _closure_js_library_impl(
         ctx.actions,
         ctx.label,
         ctx.workspace_name,
         srcs,
-        ctx.attr.deps,
+        deps,
         ctx.attr.testonly,
-        ctx.attr.suppress,
+        suppress,
         ctx.attr.lenient,
         ctx.files._closure_library_base,
         ctx.executable._ClosureWorker,
@@ -410,7 +412,6 @@ def _closure_js_library(ctx):
         ctx.attr.convention,
         ctx.attr.no_closure_library,
         ctx.attr.internal_expect_failure,
-        ctx.attr.ts_lib,
 
         # Deprecated output files.
         ctx.outputs.info,
@@ -429,7 +430,7 @@ def _closure_js_library(ctx):
             transitive_files = (depset([] if ctx.attr.no_closure_library else ctx.files._closure_library_base) |
                                 collect_runfiles(
                                     unfurl(
-                                        ctx.attr.deps,
+                                        deps+ctx.attr.exports,
                                         provider = "closure_js_library",
                                     ),
                                 ) |

closure/repositories.bzl

@@ -696,7 +696,7 @@ def com_google_protobuf_js():
         ],
         sha256 = "2244b0308846bb22b4ff0bcc675e99290ff9f1115553ae9671eba1030af31bc0",
         strip_prefix = "protobuf-3.6.1.2/js",
-        patches = ["//closure:patch_protobuf.patch"],
+        patches = ["@io_bazel_rules_closure//closure:patch_protobuf.patch"],
         patch_args = ["-p1"],
         build_file = str(Label("//closure/protobuf:protobuf_js.BUILD")),
     )
@@ -800,7 +800,7 @@ def fonts_noto_mono_deb():
     )
 
 def io_angular_clutz():
-  native.new_http_archive(
+  http_archive(
     name = "io_angular_clutz",
     build_file = str(Label("//third_party/clutz:clutz.BUILD")),
     sha256 = "7a5c785dbcc3ae0daa1fcf4507de6a23bbecdb2bf80460651e4c2b88c1ad7582",