Skip to content

Commit 2236bc1

Browse files
devversionalan-agius4
authored andcommitted
build: remove legacy defaults.bzl macro file
This file is currently no longer necessary after migrating all consumers to their `rules_js` variants, so we can delete the file. In follow-ups we will consider renaming `defaults2.bzl` back to this file, or have a better name altogether.
1 parent 83b9d33 commit 2236bc1

File tree

3 files changed

+14
-230
lines changed

3 files changed

+14
-230
lines changed

packages/angular/ssr/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ load("@aspect_rules_js//npm:defs.bzl", "npm_package")
22
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
33
load("@npm2//:defs.bzl", "npm_link_all_packages")
44
load("@rules_pkg//:pkg.bzl", "pkg_tar")
5-
load("//tools:defaults.bzl", "ng_package")
6-
load("//tools:defaults2.bzl", "ts_project")
5+
load("//tools:defaults2.bzl", "ng_package", "ts_project")
76

87
package(default_visibility = ["//visibility:public"])
98

tools/defaults.bzl

-228
This file was deleted.

tools/defaults2.bzl

+13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin")
22
load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test")
33
load("@aspect_rules_js//js:defs.bzl", _js_binary = "js_binary")
4+
load("@npm//@angular/bazel:index.bzl", _ng_package = "ng_package")
45
load("//tools:interop.bzl", _ts_project = "ts_project")
6+
load("//tools:substitutions.bzl", "substitutions")
57
load("//tools/bazel:npm_package.bzl", _npm_package = "npm_package")
68

79
def ts_project(**kwargs):
@@ -16,6 +18,17 @@ def copy_to_bin(**kwargs):
1618
def js_binary(**kwargs):
1719
_js_binary(**kwargs)
1820

21+
def ng_package(deps = [], **kwargs):
22+
_ng_package(
23+
deps = deps,
24+
license = "//:LICENSE",
25+
substitutions = select({
26+
"//:stamp": substitutions["legacy"]["stamp"],
27+
"//conditions:default": substitutions["legacy"]["nostamp"],
28+
}),
29+
**kwargs
30+
)
31+
1932
def jasmine_test(data = [], args = [], **kwargs):
2033
# Create relative path to root, from current package dir. Necessary as
2134
# we change the `chdir` below to the package directory.

0 commit comments

Comments
 (0)