From cfb9ed267fd097fdaa3f9ff23173dfa6d707d077 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Tue, 13 Apr 2021 18:17:32 +0200
Subject: [PATCH] Create explicit dependencies for the congrats,editor,graphs
 scss files

---
 ts/compile_sass.bzl               |  1 +
 ts/congrats/BUILD.bazel           | 12 ++++++++----
 ts/editor/BUILD.bazel             | 24 ++++++++++++------------
 ts/editor/editable.scss           |  2 +-
 ts/graphs/BUILD.bazel             | 12 ++++++++----
 ts/sass/BUILD.bazel               | 13 +++++++++++--
 ts/sass/{_base.scss => base.scss} |  0
 7 files changed, 41 insertions(+), 23 deletions(-)
 rename ts/sass/{_base.scss => base.scss} (100%)

diff --git a/ts/compile_sass.bzl b/ts/compile_sass.bzl
index b4835f532..642b53714 100644
--- a/ts/compile_sass.bzl
+++ b/ts/compile_sass.bzl
@@ -13,6 +13,7 @@ def compile_sass(group, srcs, visibility, deps):
             src = scss_file,
             sourcemap = False,
             deps = deps,
+            visibility = visibility,
         )
 
     native.filegroup(
diff --git a/ts/congrats/BUILD.bazel b/ts/congrats/BUILD.bazel
index a5f27dbd8..8e41624f2 100644
--- a/ts/congrats/BUILD.bazel
+++ b/ts/congrats/BUILD.bazel
@@ -3,11 +3,15 @@ load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts/svelte:svelte.bzl", "svelte", "svelte_check")
 load("//ts:esbuild.bzl", "esbuild")
-load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
+load("//ts:compile_sass.bzl", "compile_sass")
 
-sass_binary(
-    name = "base_css",
-    src = "congrats-base.scss",
+compile_sass(
+    group = "base_css",
+    srcs = ["congrats-base.scss"],
+    deps = [
+        "//ts/sass:base_lib",
+        "//ts/sass:scrollbar_lib",
+    ],
     visibility = ["//visibility:public"],
 )
 
diff --git a/ts/editor/BUILD.bazel b/ts/editor/BUILD.bazel
index f2a6d6b0a..9b4253a8b 100644
--- a/ts/editor/BUILD.bazel
+++ b/ts/editor/BUILD.bazel
@@ -3,17 +3,16 @@ load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts:esbuild.bzl", "esbuild")
 load("//ts:vendor.bzl", "copy_bootstrap_icons")
-load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
+load("//ts:compile_sass.bzl", "compile_sass")
 
-sass_binary(
-    name = "editor_css",
-    src = "editor.scss",
-    visibility = ["//visibility:public"],
-)
-
-sass_binary(
-    name = "editable_css",
-    src = "editable.scss",
+compile_sass(
+    group = "base_css",
+    srcs = ["editor.scss", "editable.scss"],
+    deps = [
+        "//ts/sass:base_lib",
+        "//ts/sass:buttons_lib",
+        "//ts/sass:scrollbar_lib",
+    ],
     visibility = ["//visibility:public"],
 )
 
@@ -42,8 +41,9 @@ esbuild(
     entry_point = "index_wrapper.ts",
     visibility = ["//visibility:public"],
     deps = [
-        "bootstrap-icons",
-        "editor_ts",
+        ":bootstrap-icons",
+        ":editor_ts",
+        "base_css",
     ],
 )
 
diff --git a/ts/editor/editable.scss b/ts/editor/editable.scss
index f819b8fb3..9cd7186f3 100644
--- a/ts/editor/editable.scss
+++ b/ts/editor/editable.scss
@@ -1,4 +1,4 @@
-@use '../sass/scrollbar';
+@use 'ts/sass/scrollbar';
 
 anki-editable {
     display: block;
diff --git a/ts/graphs/BUILD.bazel b/ts/graphs/BUILD.bazel
index 2d34efbe0..05775e211 100644
--- a/ts/graphs/BUILD.bazel
+++ b/ts/graphs/BUILD.bazel
@@ -3,11 +3,15 @@ load("//ts/svelte:svelte.bzl", "compile_svelte", "svelte_check")
 load("//ts:prettier.bzl", "prettier_test")
 load("//ts:eslint.bzl", "eslint_test")
 load("//ts:esbuild.bzl", "esbuild")
-load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
+load("//ts:compile_sass.bzl", "compile_sass")
 
-sass_binary(
-    name = "base_css",
-    src = "graphs-base.scss",
+compile_sass(
+    group = "base_css",
+    srcs = ["graphs-base.scss"],
+    deps = [
+        "//ts/sass:base_lib",
+        "//ts/sass:scrollbar_lib",
+    ],
     visibility = ["//visibility:public"],
 )
 
diff --git a/ts/sass/BUILD.bazel b/ts/sass/BUILD.bazel
index 0564eb324..ea0f4c633 100644
--- a/ts/sass/BUILD.bazel
+++ b/ts/sass/BUILD.bazel
@@ -1,5 +1,14 @@
 load("@io_bazel_rules_sass//:defs.bzl", "sass_library")
 
+sass_library(
+    name = "base_lib",
+    srcs = [
+        "_vars.scss",
+        "base.scss",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 sass_library(
     name = "buttons_lib",
     srcs = [
@@ -36,6 +45,6 @@ sass_library(
 
 # qt package extracts colours from source file
 exports_files(
-    ["_vars.scss"],
-    visibility = ["//qt:__subpackages__"],
+    ["_vars.scss"] + glob(["*.scss"], exclude = ["_*.scss"]),
+    visibility = ["//qt:__subpackages__", "//ts:__subpackages__"],
 )
diff --git a/ts/sass/_base.scss b/ts/sass/base.scss
similarity index 100%
rename from ts/sass/_base.scss
rename to ts/sass/base.scss