From a479bd6cd9efcdabbed9f91b00e2fb733b9db662 Mon Sep 17 00:00:00 2001 From: Marc Plano-Lesay Date: Thu, 19 Aug 2021 11:43:56 +1000 Subject: [PATCH 1/3] Bump rules_nodejs to 3.8.0 https://github.com/bazelbuild/rules_nodejs/pull/2430 is needed to access rules_nodejs's bzl_library target, which was first included after their 3.0.0 release. --- package.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.bzl b/package.bzl index 9eb0fe6..6ea5050 100644 --- a/package.bzl +++ b/package.bzl @@ -26,8 +26,8 @@ def rules_sass_dependencies(): _include_if_not_defined( http_archive, name = "build_bazel_rules_nodejs", - sha256 = "6142e9586162b179fdd570a55e50d1332e7d9c030efd853453438d607569721d", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.0.0/rules_nodejs-3.0.0.tar.gz"], + sha256 = "e79c08a488cc5ac40981987d862c7320cee8741122a2649e9b08e850b6f20442", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.8.0/rules_nodejs-3.8.0.tar.gz"], ) # Dependencies from the NodeJS rules. We don't want to use the "package.bzl" dependency macro From 25692518718efb46e714bddc800d26919cfac44a Mon Sep 17 00:00:00 2001 From: Marc Plano-Lesay Date: Thu, 19 Aug 2021 12:16:53 +1000 Subject: [PATCH 2/3] Run buildifier --- sass/BUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sass/BUILD b/sass/BUILD index 567828a..7b266bb 100644 --- a/sass/BUILD +++ b/sass/BUILD @@ -10,12 +10,12 @@ exports_files([ # Executable for the sass_binary rule nodejs_binary( name = "sass", - entry_point = "sass_wrapper", data = [ ":sass_wrapper.js", - "@build_bazel_rules_sass_deps//sass", "@build_bazel_rules_sass_deps//@bazel/worker", + "@build_bazel_rules_sass_deps//sass", ], + entry_point = "sass_wrapper", # Opt-in to the patched require() function like google3 has # rules_nodejs 3.0 will flip the default for this flag which breaks rules_sass users templated_args = [ From c97834172ebe5ee4523f4297c6fbf1c5f25a5a68 Mon Sep 17 00:00:00 2001 From: Marc Plano-Lesay Date: Thu, 19 Aug 2021 12:17:02 +1000 Subject: [PATCH 3/3] Export bzl_library targets --- BUILD.bazel | 13 +++++++++++++ sass/BUILD | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/BUILD.bazel b/BUILD.bazel index 9c0f139..3ffe5a7 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -11,3 +11,16 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") + +bzl_library( + name = "bzl", + srcs = [ + "defs.bzl", + ], + visibility = ["//visibility:public"], + deps = [ + "//sass:bzl", + ], +) diff --git a/sass/BUILD b/sass/BUILD index 7b266bb..4bd1a58 100644 --- a/sass/BUILD +++ b/sass/BUILD @@ -1,5 +1,6 @@ package(default_visibility = ["//visibility:public"]) +load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") exports_files([ @@ -23,3 +24,15 @@ nodejs_binary( "--bazel_patch_module_resolver", ], ) + +bzl_library( + name = "bzl", + srcs = [ + "sass.bzl", + "sass_repositories.bzl", + ], + visibility = ["//:__pkg__"], + deps = [ + "@build_bazel_rules_nodejs//:bzl", + ], +)