fix(typescript): exclude package.json from tsconfig#files

bazel-contrib · Jul 20, 2020 · 16cbc6f · 16cbc6f
1 parent 1c70656
commit 16cbc6f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/internal/providers/declaration_info.bzl b/internal/providers/declaration_info.bzl
@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This module contains a provider for TypeScript typings files (.d.ts)"""
+"""This module contains a provider for TypeScript typings (*.d.ts and package.json#typings)"""
 
 DeclarationInfo = provider(
-    doc = """The DeclarationInfo provider allows JS rules to communicate typing information. TypeScript's .d.ts files are used as the interop format for describing types.
+    doc = """The DeclarationInfo provider allows JS rules to communicate typing information.
+TypeScript's .d.ts files are used as the interop format for describing types.
+package.json files are included as well, as TypeScript needs to read the "typings" property.
 
 Do not create DeclarationInfo instances directly, instead use the declaration_info factory function.
 
@@ -24,18 +26,18 @@ Note: historically this was a subset of the string-typed "typescript" provider.
     # TODO(alexeagle): The ts_library#deps attribute should require that this provider is attached.
     # TODO: if we ever enable --declarationMap we will have .d.ts.map files too
     fields = {
-        "declarations": "A depset of .d.ts files produced by this rule",
-        "transitive_declarations": """A depset of .d.ts files produced by this rule and all its transitive dependencies.
+        "declarations": "A depset of typings files produced by this rule",
+        "transitive_declarations": """A depset of typings files produced by this rule and all its transitive dependencies.
 This prevents needing an aspect in rules that consume the typings, which improves performance.""",
         "type_blacklisted_declarations": """A depset of .d.ts files that we should not use to infer JSCompiler types (via tsickle)""",
     },
 )
 
 def declaration_info(declarations, deps = []):
-    """Constructs a DeclarationInfo including all transitive declarations from DeclarationInfo providers in a list of deps.
+    """Constructs a DeclarationInfo including all transitive files needed to type-check from DeclarationInfo providers in a list of deps.
 
     Args:
-        declarations: list of .d.ts files
+        declarations: list of typings files
         deps: list of labels of dependencies where we should collect their DeclarationInfo to pass transitively
 
     Returns:

diff --git a/packages/typescript/internal/build_defs.bzl b/packages/typescript/internal/build_defs.bzl
@@ -244,7 +244,9 @@ def tsc_wrapped_tsconfig(
     node_modules_root = _compute_node_modules_root(ctx)
     config = create_tsconfig(
         ctx,
-        files,
+        # Filter out package.json files that are included in DeclarationInfo
+        # tsconfig files=[] property should only be .ts/.d.ts
+        [f for f in files if f.path.endswith(".ts")],
         srcs,
         devmode_manifest = devmode_manifest,
         node_modules_root = node_modules_root,