build: ensure common substitutions are replaced on all packages by de…

…fault
bazel-contrib · Mar 7, 2021 · 7f81e5d · 7f81e5d
1 parent 8e7c731
commit 7f81e5d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -48,9 +48,11 @@ def pkg_npm(**kwargs):
     pkg = native.package_name().split("/")[-1]
 
     # Default substitutions to scrub things like skylib references
-    substitutions = dict(kwargs.pop("substitutions", _COMMON_REPLACEMENTS), **{
+    default_substitutions = dict(_COMMON_REPLACEMENTS, **{
         "//packages/%s" % pkg: "//@bazel/%s" % pkg,
     })
+    substitutions = dict(kwargs.pop("substitutions", {}), **default_substitutions)
+
     stamped_substitutions = dict(substitutions, **{
         "0.0.0-PLACEHOLDER": "{STABLE_BUILD_SCM_VERSION}",
     })