diff --git a/CHANGELOG.md b/CHANGELOG.md index 211d76439..00b267c57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.92.2-dev + +* Fix a crash when a style rule contains a nested `@import`, and the loaded file + `@use`s a user-defined module as well as `@include`s a top-level mixin which + emits top-level declarations. + ## 1.92.1 * Fix a bug where variable definitions from one imported, forwarded module diff --git a/lib/src/visitor/async_evaluate.dart b/lib/src/visitor/async_evaluate.dart index dc6d43b73..1041ffff7 100644 --- a/lib/src/visitor/async_evaluate.dart +++ b/lib/src/visitor/async_evaluate.dart @@ -4670,9 +4670,8 @@ final class _ImportedCssVisitor implements ModifiableCssVisitor { void visitCssComment(ModifiableCssComment node) => _visitor._addChild(node); - void visitCssDeclaration(ModifiableCssDeclaration node) { - assert(false, "visitCssDeclaration() should never be called."); - } + void visitCssDeclaration(ModifiableCssDeclaration node) => + _visitor._addChild(node); void visitCssImport(ModifiableCssImport node) { if (_visitor._parent != _visitor._root) { diff --git a/lib/src/visitor/evaluate.dart b/lib/src/visitor/evaluate.dart index 6fb68b56b..82802e74f 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: a32ff6b83b3365e8dad72b8b12c2c17937a5f28e +// Checksum: b79ed685f78b8d5356795eb2d1112f830abaf58e // // ignore_for_file: unused_import @@ -4652,9 +4652,8 @@ final class _ImportedCssVisitor implements ModifiableCssVisitor { void visitCssComment(ModifiableCssComment node) => _visitor._addChild(node); - void visitCssDeclaration(ModifiableCssDeclaration node) { - assert(false, "visitCssDeclaration() should never be called."); - } + void visitCssDeclaration(ModifiableCssDeclaration node) => + _visitor._addChild(node); void visitCssImport(ModifiableCssImport node) { if (_visitor._parent != _visitor._root) { diff --git a/pkg/sass-parser/CHANGELOG.md b/pkg/sass-parser/CHANGELOG.md index 12ed2d361..a84180808 100644 --- a/pkg/sass-parser/CHANGELOG.md +++ b/pkg/sass-parser/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.29-dev + +* No user-visible changes. + ## 0.4.28 * No user-visible changes. diff --git a/pkg/sass-parser/package.json b/pkg/sass-parser/package.json index 0354632f2..3f4040939 100644 --- a/pkg/sass-parser/package.json +++ b/pkg/sass-parser/package.json @@ -1,6 +1,6 @@ { "name": "sass-parser", - "version": "0.4.28", + "version": "0.4.29-dev", "description": "A PostCSS-compatible wrapper of the official Sass parser", "repository": "sass/sass", "author": "Google Inc.", diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md index 1db448704..c8c833be1 100644 --- a/pkg/sass_api/CHANGELOG.md +++ b/pkg/sass_api/CHANGELOG.md @@ -1,3 +1,7 @@ +## 15.11.1-dev + +* No user-visible changes. + ## 15.11.0 * No user-visible changes. diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml index 6c13dc35d..af473f072 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: 15.11.0 +version: 15.11.1-dev description: Additional APIs for Dart Sass. homepage: https://github.com/sass/dart-sass @@ -10,7 +10,7 @@ environment: sdk: ">=3.6.0 <4.0.0" dependencies: - sass: 1.92.1 + sass: 1.92.2 dev_dependencies: dartdoc: ^8.0.14 diff --git a/pubspec.yaml b/pubspec.yaml index c67d9b1d5..64dabed46 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: sass -version: 1.92.1 +version: 1.92.2-dev description: A Sass implementation in Dart. homepage: https://github.com/sass/dart-sass