From 7cafbddce5e3684505c7470cc513326ccdced3cc Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Thu, 28 Dec 2023 14:20:58 -0800
Subject: [PATCH] Make meta.apply() an AsyncBuiltInCallable

Closes #2151
---
 CHANGELOG.md                        | 2 ++
 lib/src/visitor/async_evaluate.dart | 3 ++-
 lib/src/visitor/evaluate.dart       | 2 +-
 pkg/sass_api/CHANGELOG.md           | 4 ++++
 pkg/sass_api/pubspec.yaml           | 4 ++--
 pubspec.yaml                        | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f520294c..7ee7dd522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 
 * Provide official releases for musl LibC and for Android.
 
+* Don't crash when running `meta.apply()` in asynchronous mode.
+
 ### JS API
 
 * Fix a bug where certain exceptions could produce `SourceSpan`s that didn't
diff --git a/lib/src/visitor/async_evaluate.dart b/lib/src/visitor/async_evaluate.dart
index 767d2393b..7d75430f7 100644
--- a/lib/src/visitor/async_evaluate.dart
+++ b/lib/src/visitor/async_evaluate.dart
@@ -545,7 +545,8 @@ final class _EvaluateVisitor
             namesInErrors: true);
         _assertConfigurationIsEmpty(configuration, nameInError: true);
       }, url: "sass:meta"),
-      BuiltInCallable.mixin("apply", r"$mixin, $args...", (arguments) async {
+      AsyncBuiltInCallable.mixin("apply", r"$mixin, $args...",
+          (arguments) async {
         var mixin = arguments[0];
         var args = arguments[1] as SassArgumentList;
 
diff --git a/lib/src/visitor/evaluate.dart b/lib/src/visitor/evaluate.dart
index 50b2cce78..37c2e0c08 100644
--- a/lib/src/visitor/evaluate.dart
+++ b/lib/src/visitor/evaluate.dart
@@ -5,7 +5,7 @@
 // DO NOT EDIT. This file was generated from async_evaluate.dart.
 // See tool/grind/synchronize.dart for details.
 //
-// Checksum: 58ef9912c6a9d9cfe9c3f5d991f625ab1a627e7a
+// Checksum: 71dcf1747eb45036d3c1b5b57bd0cd5dbe6b8e14
 //
 // ignore_for_file: unused_import
 
diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md
index 6dd5a42b9..d1b3b19b5 100644
--- a/pkg/sass_api/CHANGELOG.md
+++ b/pkg/sass_api/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 9.2.6
+
+* No user-visible changes.
+
 ## 9.2.5
 
 * No user-visible changes.
diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml
index 4756d33f1..3984e8f17 100644
--- a/pkg/sass_api/pubspec.yaml
+++ b/pkg/sass_api/pubspec.yaml
@@ -2,7 +2,7 @@ name: sass_api
 # Note: Every time we add a new Sass AST node, we need to bump the *major*
 # version because it's a breaking change for anyone who's implementing the
 # visitor interface(s).
-version: 9.2.5
+version: 9.2.6
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
@@ -10,7 +10,7 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  sass: 1.69.5
+  sass: 1.69.6
 
 dev_dependencies:
   dartdoc: ^6.0.0
diff --git a/pubspec.yaml b/pubspec.yaml
index c42d2133e..f87c516ce 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: sass
-version: 1.69.6-dev
+version: 1.69.6
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass