Skip to content

Commit

Permalink
refactor: make npm targets foo__nested_node_modules, `foo__all_file…
Browse files Browse the repository at this point in the history 
…s` & `foo__contents` private
  • Loading branch information
@gregmagolan
gregmagolan committed Nov 26, 2019
1 parent 5de3c6c commit 393922e
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 0 deletions.
3 changes: 3 additions & 0 deletions internal/npm_install/generate_build_file.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,11 +835,13 @@ filegroup(
filegroup(
name = "${pkg._name}__nested_node_modules",${nestedNodeModulesStarlark}
visibility = ["//visibility:private"],
)
filegroup(
name = "${pkg._name}__all_files",
srcs = [":${pkg._name}__files", ":${pkg._name}__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
Expand All @@ -853,6 +855,7 @@ node_module_library(
node_module_library(
name = "${pkg._name}__contents",
srcs = [":${pkg._name}__all_files"],${namedSourcesStarlark}
visibility = ["//:__subpackages__"],
)
# ${pkg._name}__typings is the subset of ${pkg._name}__contents that are declarations
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/generate_build_file.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -927,11 +927,13 @@ filegroup(
filegroup(
name = "${pkg._name}__nested_node_modules",${nestedNodeModulesStarlark}
visibility = ["//visibility:private"],
)
filegroup(
name = "${pkg._name}__all_files",
srcs = [":${pkg._name}__files", ":${pkg._name}__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
Expand All @@ -945,6 +947,7 @@ node_module_library(
node_module_library(
name = "${pkg._name}__contents",
srcs = [":${pkg._name}__all_files"],${namedSourcesStarlark}
visibility = ["//:__subpackages__"],
)
# ${pkg._name}__typings is the subset of ${pkg._name}__contents that are declarations
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/test/golden/@angular/core/BUILD.bazel.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,10 +666,12 @@ filegroup(
)
filegroup(
name = "core__nested_node_modules",
visibility = ["//visibility:private"],
)
filegroup(
name = "core__all_files",
srcs = [":core__files", ":core__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "core",
Expand All @@ -688,6 +690,7 @@ node_module_library(
"//:node_modules/@angular/core/bundles/core-testing.umd.js",
"//:node_modules/@angular/core/bundles/core.umd.js",
],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "core__typings",
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/test/golden/@gregmagolan/test-a/BUILD.bazel.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ filegroup(
)
filegroup(
name = "test-a__nested_node_modules",
visibility = ["//visibility:private"],
)
filegroup(
name = "test-a__all_files",
srcs = [":test-a__files", ":test-a__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "test-a",
Expand All @@ -26,6 +28,7 @@ node_module_library(
node_module_library(
name = "test-a__contents",
srcs = [":test-a__all_files"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "test-a__typings",
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/test/golden/@gregmagolan/test-b/BUILD.bazel.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ filegroup(
"//:node_modules/@gregmagolan/test-b/node_modules/@gregmagolan/test-a/main.js",
"//:node_modules/@gregmagolan/test-b/node_modules/@gregmagolan/test-a/package.json",
],
visibility = ["//visibility:private"],
)
filegroup(
name = "test-b__all_files",
srcs = [":test-b__files", ":test-b__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "test-b",
Expand All @@ -29,6 +31,7 @@ node_module_library(
node_module_library(
name = "test-b__contents",
srcs = [":test-b__all_files"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "test-b__typings",
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/test/golden/ajv/BUILD.bazel.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,12 @@ filegroup(
)
filegroup(
name = "ajv__nested_node_modules",
visibility = ["//visibility:private"],
)
filegroup(
name = "ajv__all_files",
srcs = [":ajv__files", ":ajv__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "ajv",
Expand All @@ -115,6 +117,7 @@ node_module_library(
node_module_library(
name = "ajv__contents",
srcs = [":ajv__all_files"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "ajv__typings",
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/test/golden/jasmine/BUILD.bazel.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ filegroup(
)
filegroup(
name = "jasmine__nested_node_modules",
visibility = ["//visibility:private"],
)
filegroup(
name = "jasmine__all_files",
srcs = [":jasmine__files", ":jasmine__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "jasmine",
Expand All @@ -49,6 +51,7 @@ node_module_library(
node_module_library(
name = "jasmine__contents",
srcs = [":jasmine__all_files"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "jasmine__typings",
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/test/golden/rxjs/BUILD.bazel.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3615,10 +3615,12 @@ filegroup(
)
filegroup(
name = "rxjs__nested_node_modules",
visibility = ["//visibility:private"],
)
filegroup(
name = "rxjs__all_files",
srcs = [":rxjs__files", ":rxjs__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "rxjs",
Expand All @@ -3631,6 +3633,7 @@ node_module_library(
node_module_library(
name = "rxjs__contents",
srcs = [":rxjs__all_files"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "rxjs__typings",
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/test/golden/unidiff/BUILD.bazel.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ filegroup(
)
filegroup(
name = "unidiff__nested_node_modules",
visibility = ["//visibility:private"],
)
filegroup(
name = "unidiff__all_files",
srcs = [":unidiff__files", ":unidiff__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "unidiff",
Expand All @@ -34,6 +36,7 @@ node_module_library(
node_module_library(
name = "unidiff__contents",
srcs = [":unidiff__all_files"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "unidiff__typings",
Expand Down
3 changes: 3 additions & 0 deletions internal/npm_install/test/golden/zone.js/BUILD.bazel.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,12 @@ filegroup(
)
filegroup(
name = "zone.js__nested_node_modules",
visibility = ["//visibility:private"],
)
filegroup(
name = "zone.js__all_files",
srcs = [":zone.js__files", ":zone.js__nested_node_modules"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "zone.js",
Expand All @@ -151,6 +153,7 @@ node_module_library(
node_module_library(
name = "zone.js__contents",
srcs = [":zone.js__all_files"],
visibility = ["//:__subpackages__"],
)
node_module_library(
name = "zone.js__typings",
Expand Down

0 comments on commit 393922e

Please sign in to comment.