Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 321a07b

Browse files
committed
Get rid of closure aspect and add runtime_deps to the provider output.
1 parent fe1856c commit 321a07b

File tree

2 files changed

+5
-41
lines changed

2 files changed

+5
-41
lines changed

internal/common/closure.bzl

Lines changed: 0 additions & 39 deletions
This file was deleted.

internal/common/compilation.bzl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515
"""Used for compilation by the different implementations of build_defs.bzl.
1616
"""
1717

18-
load(":common/closure.bzl", "closure_aspect")
1918
load(":common/module_mappings.bzl", "module_mappings_aspect")
2019
load(":common/json_marshal.bzl", "json_marshal")
2120

2221
BASE_ATTRIBUTES = dict()
2322

2423
DEPS_ASPECTS = [
2524
module_mappings_aspect,
26-
closure_aspect,
2725
]
2826

2927
# Attributes shared by any typescript-compatible rule (ts_library, ng_module)
@@ -353,6 +351,10 @@ def compile_ts(ctx,
353351
transitive_es5_sources = depset(transitive = [transitive_es5_sources, es5_sources])
354352
transitive_es6_sources = depset(transitive = [transitive_es6_sources, es6_sources])
355353

354+
transitive_runtime_deps = depset(
355+
ctx.attr.runtime_deps,
356+
transitive=[dep.typescript.runtime_deps for dep in ctx.attr.deps] )
357+
356358
return {
357359
"files": files,
358360
"runfiles": ctx.runfiles(
@@ -374,6 +376,7 @@ def compile_ts(ctx,
374376
"type_blacklisted_declarations": type_blacklisted_declarations,
375377
"tsickle_externs": tsickle_externs,
376378
"replay_params": replay_params,
379+
"runtime_deps": transitive_runtime_deps,
377380
},
378381
# Expose the tags so that a Skylark aspect can access them.
379382
"tags": ctx.attr.tags,

0 commit comments

Comments
 (0)