From 971b6726c08b0489fed4eeef61283335f8666f54 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Sat, 6 Feb 2021 08:32:14 +1000
Subject: [PATCH] Restore "Merge pull request #1007 from hgiesel/sveltesass2""

This reverts commit ffcf0aa3ca85cb23fe148ce3a96e71405d11b903 and
points to a new rules_svelte commit.

It looks like we were getting away with not listing the dep on the
rules_svelte end - the failing build turned out to be because we need
to pass sass in to our local svelte_check invocation.
---
 repos.bzl                   | 2 +-
 ts/graphs/CardCounts.svelte | 8 ++++----
 ts/package.json             | 1 +
 ts/svelte.bzl               | 1 +
 ts/yarn.lock                | 9 ++++++++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/repos.bzl b/repos.bzl
index 1b44d6c76..57f979e80 100644
--- a/repos.bzl
+++ b/repos.bzl
@@ -125,7 +125,7 @@ def register_repos():
         urls = [
             "https://github.com/ankitects/rules_svelte/archive/anki-2021-02-06.tar.gz",
         ],
-        sha256 = "7069687c83754271f72c34c4d1b57c9812565b47754d3d673828c01a78a6f139",
+        sha256 = "f77a96ae5a354f8c3c24045f3bee8521bfe56224292d4f71184a3382784640eb",
     )
 
     # translations
diff --git a/ts/graphs/CardCounts.svelte b/ts/graphs/CardCounts.svelte
index d63f91d99..c7152f6ae 100644
--- a/ts/graphs/CardCounts.svelte
+++ b/ts/graphs/CardCounts.svelte
@@ -33,7 +33,7 @@
     const total = i18n.tr(i18n.TR.STATISTICS_COUNTS_TOTAL_CARDS);
 </script>
 
-<style>
+<style lang="scss">
     svg {
         transition: opacity 1s;
     }
@@ -47,10 +47,10 @@
         display: flex;
         flex-direction: column;
         justify-content: center;
-    }
 
-    .counts-table td {
-        white-space: nowrap;
+        td {
+            white-space: nowrap;
+        }
     }
 
     table {
diff --git a/ts/package.json b/ts/package.json
index 08f5d995d..84dbfc85c 100644
--- a/ts/package.json
+++ b/ts/package.json
@@ -37,6 +37,7 @@
         "protobufjs-taylorm": "^7.0.4",
         "rollup": "^2.32.1",
         "rollup-plugin-terser": "^7.0.2",
+        "sass": "^1.32.6",
         "svelte": "^3.28.0",
         "svelte-check": "^1.0.61",
         "svelte2tsx": "^0.1.133",
diff --git a/ts/svelte.bzl b/ts/svelte.bzl
index 593b8778a..4641c1d9c 100644
--- a/ts/svelte.bzl
+++ b/ts/svelte.bzl
@@ -24,6 +24,7 @@ def svelte_check(name = "svelte_check", srcs = []):
             "//ts:tsconfig.json",
             "//ts/lib",
             "//ts/lib:backend_proto",
+            "@npm//sass"
         ] + srcs,
         link_workspace_root = True,
     )
diff --git a/ts/yarn.lock b/ts/yarn.lock
index 9e7ec1a90..f73eb1287 100644
--- a/ts/yarn.lock
+++ b/ts/yarn.lock
@@ -797,7 +797,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^3.4.1:
+"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
   integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
@@ -2713,6 +2713,13 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sass@^1.32.6:
+  version "1.32.6"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.6.tgz#e3646c8325cd97ff75a8a15226007f3ccd221393"
+  integrity sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==
+  dependencies:
+    chokidar ">=2.0.0 <4.0.0"
+
 "semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"