From 8dddcb7b7db13984fea69fa85438acf30b56b4bb Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Tue, 25 Apr 2023 16:21:05 -0700
Subject: [PATCH] Split SilentComment nodes on empty lines in SCSS (#1945)

Closes #1941
---
 lib/src/parse/scss.dart   | 2 +-
 pkg/sass_api/CHANGELOG.md | 5 +++--
 pkg/sass_api/pubspec.yaml | 4 ++--
 pubspec.yaml              | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/src/parse/scss.dart b/lib/src/parse/scss.dart
index a936ba594..bbb61a9e4 100644
--- a/lib/src/parse/scss.dart
+++ b/lib/src/parse/scss.dart
@@ -151,7 +151,7 @@ class ScssParser extends StylesheetParser {
     do {
       while (!scanner.isDone && !isNewline(scanner.readChar())) {}
       if (scanner.isDone) break;
-      whitespaceWithoutComments();
+      spaces();
     } while (scanner.scan("//"));
 
     if (plainCss) {
diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md
index 0f02232d3..37a4c7981 100644
--- a/pkg/sass_api/CHANGELOG.md
+++ b/pkg/sass_api/CHANGELOG.md
@@ -1,6 +1,7 @@
-## 6.3.1
+## 7.0.0
 
-* No user-visible changes.
+* Silent comments in SCSS that are separated by blank lines are now parsed as
+  separate `SilentComment` nodes rather than a single conjoined node.
 
 ## 6.3.0
 
diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml
index f84003075..07a5109dd 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: 6.3.1-dev
+version: 7.0.0
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
@@ -10,7 +10,7 @@ environment:
   sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
-  sass: 1.62.1-dev
+  sass: 1.62.1
 
 dev_dependencies:
   dartdoc: ^5.0.0
diff --git a/pubspec.yaml b/pubspec.yaml
index 32658cac4..91d03cf7a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: sass
-version: 1.62.1-dev
+version: 1.62.1
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass