Merge pull request #619 from sass/merge-master

Merge branch 'master' into feature.use

CHANGELOG.md

@@ -1,5 +1,19 @@
+## 1.17.3
+
+* Fix an edge case where slash-separated numbers were written to the stylesheet
+  with a slash even when they're used as part of another arithmetic operation,
+  such as being concatenated with a string.
+
+* Don't put style rules inside empty `@keyframes` selectors.
+
 ## 1.17.2
 
+* Deprecate `!global` variable assignments to variables that aren't yet defined.
+  This deprecation message can be avoided by assigning variables to `null` at
+  the top level before globally assigning values to them.
+
+### Dart API
+
 * Explicitly mark classes that were never intended to be subclassed or
   implemented as "sealed".
 

CODE_OF_CONDUCT.md

@@ -7,4 +7,4 @@ fair place to play.
 
 [The full community guidelines can be found on the Sass website.][link]
 
-[link]: http://sass-lang.com/community-guidelines
+[link]: https://sass-lang.com/community-guidelines

README.md

@@ -19,7 +19,7 @@ A [Dart][dart] implementation of [Sass][sass]. **Sass makes CSS fun again**.
 </table>
 
 [dart]: https://www.dartlang.org
-[sass]: http://sass-lang.com/
+[sass]: https://sass-lang.com/
 
 * [Using Dart Sass](#using-dart-sass)
   * [From Chocolatey (Windows)](#from-chocolatey-windows)

lib/src/parse/stylesheet.dart

@@ -1496,6 +1496,8 @@ relase. For details, see http://bit.ly/moz-document.
             length: operator.operator.length);
       }
 
+      allowSlash = allowSlash && operator == BinaryOperator.dividedBy;
+
       operators ??= [];
       operands ??= [];
       while (operators.isNotEmpty &&

lib/src/visitor/async_evaluate.dart

@@ -763,7 +763,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);
         }
@@ -1224,6 +1224,16 @@ class _EvaluateVisitor
       if (value != null && value != sassNull) return null;
     }
 
+    if (node.isGlobal && !_environment.globalVariableExists(node.name)) {
+      _logger.warn(
+          "As of Dart Sass 2.0.0, !global assignments won't be able to\n"
+          "declare new variables. Consider adding `\$${node.name}: null` at "
+          "the top level.",
+          span: node.span,
+          trace: _stackTrace(node.span),
+          deprecation: true);
+    }
+
     var value = (await node.expression.accept(this)).withoutSlash();
     _addExceptionSpan(node, () {
       _environment.setVariable(

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: da6068544fd58007ee2d44c2688063cbe4543e73
+// Checksum: 9f5130aa940610d9f0a84205428197c7b51f1bd3
 //
 // ignore_for_file: unused_import
 
@@ -764,7 +764,7 @@ class _EvaluateVisitor
     }
 
     _withParent(ModifiableCssAtRule(name, node.span, value: value), () {
-      if (!_inStyleRule) {
+      if (!_inStyleRule || _inKeyframes) {
         for (var child in node.children) {
           child.accept(this);
         }
@@ -1218,6 +1218,16 @@ class _EvaluateVisitor
       if (value != null && value != sassNull) return null;
     }
 
+    if (node.isGlobal && !_environment.globalVariableExists(node.name)) {
+      _logger.warn(
+          "As of Dart Sass 2.0.0, !global assignments won't be able to\n"
+          "declare new variables. Consider adding `\$${node.name}: null` at "
+          "the top level.",
+          span: node.span,
+          trace: _stackTrace(node.span),
+          deprecation: true);
+    }
+
     var value = node.expression.accept(this).withoutSlash();
     _addExceptionSpan(node, () {
       _environment.setVariable(

package/README.npm.md

@@ -16,7 +16,7 @@ A pure JavaScript implementation of [Sass][sass]. **Sass makes CSS fun again**.
   </tr>
 </table>
 
-[sass]: http://sass-lang.com/
+[sass]: https://sass-lang.com/
 
 This package is a distribution of [Dart Sass][], compiled to pure JavaScript
 with no native code or external dependencies. It provides a command-line `sass`

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.17.2-dev
+version: 1.17.3-dev
 description: A Sass implementation in Dart.
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/sass/dart-sass

tool/grind/github.dart

@@ -77,7 +77,7 @@ String _releaseMessage() {
           version.replaceAll(".", "");
   return "To install Dart Sass $version, download one of the packages above "
       "and [add it to your PATH](https://katiek2.github.io/path-doc/), or see "
-      "[the Sass website](http://sass-lang.com/install) for full installation "
+      "[the Sass website](https://sass-lang.com/install) for full installation "
       "instructions.\n\n"
       "## Changes\n\n" +
       _lastChangelogSection() +

tool/travis/utils.sh

@@ -5,8 +5,8 @@
 # Decrypts the encrypted credentials using Travis's private key and saves them
 # to credentials.tar.
 function decrypt_credentials() {
-    openssl aes-256-cbc -K $encrypted_d18df560dfb2_key \
+    openssl aes-256-cbc -K $encrypted_867f88017e77_key \
-            -iv $encrypted_d18df560dfb2_iv \
+            -iv $encrypted_867f88017e77_iv \
             -in tool/travis/credentials.tar.enc \
             -out credentials.tar -d
 }