From e84c8b199565938458fb82f9e14b88539587dc9d Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Thu, 7 Mar 2019 17:04:30 -0800 Subject: [PATCH] Don't put style rules inside empty @keyframes rules (#613) Closes #611 --- CHANGELOG.md | 4 ++++ lib/src/visitor/async_evaluate.dart | 2 +- lib/src/visitor/evaluate.dart | 4 ++-- pubspec.yaml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a89bab3..829f17c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.17.3 + +* Don't put style rules inside empty `@keyframes` selectors. + ## 1.17.2 * Deprecate `!global` variable assignments to variables that aren't yet defined. diff --git a/lib/src/visitor/async_evaluate.dart b/lib/src/visitor/async_evaluate.dart index 9fdd4d20..767a12b7 100644 --- a/lib/src/visitor/async_evaluate.dart +++ b/lib/src/visitor/async_evaluate.dart @@ -666,7 +666,7 @@ class _EvaluateVisitor await _withParent(ModifiableCssAtRule(name, node.span, value: value), () async { - if (!_inStyleRule) { + if (!_inStyleRule || _inKeyframes) { for (var child in node.children) { await child.accept(this); } diff --git a/lib/src/visitor/evaluate.dart b/lib/src/visitor/evaluate.dart index c6f74808..b1e18b47 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/synchronize.dart for details. // -// Checksum: 607d30ac9d49b341367f71b69bed09f19f93e77d +// Checksum: ffaa86c905bb6ef4bcb3d5a0c4ddf7b9af5d4d55 // // ignore_for_file: unused_import @@ -668,7 +668,7 @@ class _EvaluateVisitor } _withParent(ModifiableCssAtRule(name, node.span, value: value), () { - if (!_inStyleRule) { + if (!_inStyleRule || _inKeyframes) { for (var child in node.children) { child.accept(this); } diff --git a/pubspec.yaml b/pubspec.yaml index 8b5fa2c6..c0d4cc5c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: sass -version: 1.17.2 +version: 1.17.3-dev description: A Sass implementation in Dart. author: Dart Team homepage: https://github.com/sass/dart-sass