From 36bdfafe5b44d5ef83b6f1f2906ff98a02c85c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= <i@ntk.me>
Date: Wed, 16 Oct 2024 19:44:27 -0700
Subject: [PATCH] Fix sass deprecation warnings

---
 package-lock.json           |  2 +-
 package.json                |  2 +-
 src/scss/_color-scheme.scss |  3 ++-
 src/scss/_mixins.scss       | 11 +++++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d24bdfa4..e0fb9ab0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,7 +39,7 @@
         "mocha": "^10.4.0",
         "rollup": "^4.16.4",
         "rollup-plugin-istanbul": "^5.0.0",
-        "sass": "^1.79.0",
+        "sass": "^1.80.0",
         "sinon": "^19.0.0",
         "sinon-chai": "^3.7.0"
       }
diff --git a/package.json b/package.json
index 6d8a642a..80262d9c 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "mocha": "^10.4.0",
     "rollup": "^4.16.4",
     "rollup-plugin-istanbul": "^5.0.0",
-    "sass": "^1.79.0",
+    "sass": "^1.80.0",
     "sinon": "^19.0.0",
     "sinon-chai": "^3.7.0"
   }
diff --git a/src/scss/_color-scheme.scss b/src/scss/_color-scheme.scss
index 5ee1e787..e7450f44 100644
--- a/src/scss/_color-scheme.scss
+++ b/src/scss/_color-scheme.scss
@@ -1,10 +1,11 @@
 @use "sass:color";
+@use "sass:string";
 @use "functions" as *;
 @use "mixins" as *;
 
 $scheme: '@primer/primitives/dist/styleLint/functional/themes/light.json' !default;
 
-$enable-background-image-linear-gradient: str-index($scheme, '-high-contrast') == null !default;
+$enable-background-image-linear-gradient: string.index($scheme, '-high-contrast') == null !default;
 
 $btn-color: json($scheme, button-default-fgColor-rest, value) !default;
 $btn-background-color-start: json($scheme, button-default-bgColor-rest, value) !default;
diff --git a/src/scss/_mixins.scss b/src/scss/_mixins.scss
index 76c0f5ec..ea053c2f 100644
--- a/src/scss/_mixins.scss
+++ b/src/scss/_mixins.scss
@@ -1,13 +1,16 @@
 @use "sass:color";
+@use "sass:map";
 @use "sass:math";
+@use "sass:meta";
+@use "sass:string";
 @use "functions" as *;
 
 @mixin blend($args...) {
-  $declarations: keywords($args);
-  $background-color: map-get($declarations, "background-color");
+  $declarations: meta.keywords($args);
+  $background-color: map.get($declarations, "background-color");
 
   @each $property, $value in $declarations {
-    @if type-of($value) == color and color.channel($value, "alpha") != 1 {
+    @if meta.type-of($value) == color and color.channel($value, "alpha") != 1 {
       $color: $value;
       $red:   (1 - color.channel($color, "alpha")) * color.channel($background-color, "red") + color.channel($color, "alpha") * color.channel($color, "red");
       $green: (1 - color.channel($color, "alpha")) * color.channel($background-color, "green") + color.channel($color, "alpha") * color.channel($color, "green");
@@ -31,7 +34,7 @@
   $blue: color.channel($color-start, "blue") + math.div(color.channel($color-stop, "blue") - color.channel($color-start, "blue"), $color-stop-percentage) * 100%;
   $color-stop: rgb($red, $green, $blue);
 
-  filter: unquote("progid:DXImageTransform.Microsoft.Gradient(startColorstr='#{color.ie-hex-str($color-start)}', endColorstr='#{color.ie-hex-str($color-stop)}')");
+  filter: string.unquote("progid:DXImageTransform.Microsoft.Gradient(startColorstr='#{color.ie-hex-str($color-start)}', endColorstr='#{color.ie-hex-str($color-stop)}')");
 
   :root & {
     filter: none;