Skip to content

Commit 2aabbc5

Browse files
jelbournmatsko
authored andcommitted
fix(bazel): ng_package packages attr not forwarded to npm_package (#22967)
PR Close #22967
1 parent 2388f24 commit 2aabbc5

File tree

4 files changed

+29
-1
lines changed

4 files changed

+29
-1
lines changed

packages/bazel/src/ng_package/ng_package.bzl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,11 @@ def _ng_package_impl(ctx):
239239
for d in ctx.attr.deps:
240240
devfiles = depset(transitive = [devfiles, d.files, d.node_sources])
241241

242-
package_dir = create_package(ctx, devfiles.to_list(), [npm_package_directory])
242+
# Re-use the create_package function from the nodejs npm_package rule.
243+
package_dir = create_package(
244+
ctx,
245+
devfiles.to_list(),
246+
[npm_package_directory] + ctx.files.packages)
243247
return struct(
244248
files = depset([package_dir])
245249
)

packages/bazel/test/ng_package/example/BUILD.bazel

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package(default_visibility = ["//packages/bazel/test:__subpackages__"])
22

33
load("//packages/bazel:index.bzl", "ng_module", "ng_package")
4+
load("//tools:defaults.bzl", "npm_package")
45

56
ng_module(
67
name = "example",
@@ -21,6 +22,9 @@ ng_package(
2122
":extra-styles.css",
2223
],
2324
entry_point = "packages/bazel/test/ng_package/example/index.js",
25+
packages = [
26+
":arbitrary_npm_package",
27+
],
2428
deps = [
2529
":example",
2630
"//packages/bazel/test/ng_package/example/secondary",
@@ -43,3 +47,8 @@ genrule(
4347
cmd = "echo World > $@",
4448
output_to_bindir = True,
4549
)
50+
51+
npm_package(
52+
name = "arbitrary_npm_package",
53+
srcs = [":arbitrary-npm-package-main.js"],
54+
)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**
2+
* @license
3+
* Copyright Google Inc. All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
const x = 1;

packages/bazel/test/ng_package/example_package.golden

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
arbitrary-npm-package-main.js
12
arbitrary_bin.txt
23
arbitrary_genfiles.txt
34
bundles
@@ -68,6 +69,11 @@ secondary
6869
secondary.d.ts
6970
secondary.metadata.json
7071
some-file.txt
72+
--- arbitrary-npm-package-main.js ---
73+
74+
const x = 1;
75+
76+
7177
--- arbitrary_bin.txt ---
7278

7379
World

0 commit comments

Comments
 (0)