diff --git a/CHANGELOG.md b/CHANGELOG.md index a34bd7c2e..211d76439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.92.1 + +* Fix a bug where variable definitions from one imported, forwarded module + would not be passed as implicit configuration to a later imported, forwarded + module. + ## 1.92.0 * **Breaking change:** Emit declarations, childless at-rules, and comments in diff --git a/lib/src/async_environment.dart b/lib/src/async_environment.dart index fa8458ab4..09192f4eb 100644 --- a/lib/src/async_environment.dart +++ b/lib/src/async_environment.dart @@ -834,6 +834,12 @@ final class AsyncEnvironment { /// environment. Configuration toImplicitConfiguration() { var configuration = {}; + for (var module in _importedModules.keys) { + for (var (name, value) in module.variables.pairs) { + configuration[name] = + ConfiguredValue.implicit(value, module.variableNodes[name]!); + } + } for (var i = 0; i < _variables.length; i++) { var values = _variables[i]; var nodes = _variableNodes[i]; diff --git a/lib/src/environment.dart b/lib/src/environment.dart index 63c82ae53..681a8b745 100644 --- a/lib/src/environment.dart +++ b/lib/src/environment.dart @@ -5,7 +5,7 @@ // DO NOT EDIT. This file was generated from async_environment.dart. // See tool/grind/synchronize.dart for details. // -// Checksum: 72b802e4004aae8a84f7aa78ec728861339b846b +// Checksum: 608af187f35a7483a87d8a54e97793e776ba215c // // ignore_for_file: unused_import @@ -842,6 +842,12 @@ final class Environment { /// environment. Configuration toImplicitConfiguration() { var configuration = {}; + for (var module in _importedModules.keys) { + for (var (name, value) in module.variables.pairs) { + configuration[name] = + ConfiguredValue.implicit(value, module.variableNodes[name]!); + } + } for (var i = 0; i < _variables.length; i++) { var values = _variables[i]; var nodes = _variableNodes[i]; diff --git a/pkg/sass-parser/CHANGELOG.md b/pkg/sass-parser/CHANGELOG.md index 3165f0bdb..12ed2d361 100644 --- a/pkg/sass-parser/CHANGELOG.md +++ b/pkg/sass-parser/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.28 + +* No user-visible changes. + ## 0.4.27 * No user-visible changes. diff --git a/pkg/sass-parser/package.json b/pkg/sass-parser/package.json index 053e2f428..0354632f2 100644 --- a/pkg/sass-parser/package.json +++ b/pkg/sass-parser/package.json @@ -1,6 +1,6 @@ { "name": "sass-parser", - "version": "0.4.27", + "version": "0.4.28", "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 09e613e8f..1db448704 100644 --- a/pkg/sass_api/CHANGELOG.md +++ b/pkg/sass_api/CHANGELOG.md @@ -1,3 +1,7 @@ +## 15.11.0 + +* No user-visible changes. + ## 15.10.0 * No user-visible changes. diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml index dfbb50f55..6c13dc35d 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.10.0 +version: 15.11.0 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.0 + sass: 1.92.1 dev_dependencies: dartdoc: ^8.0.14 diff --git a/pubspec.yaml b/pubspec.yaml index b656f1b88..c67d9b1d5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: sass -version: 1.92.0 +version: 1.92.1 description: A Sass implementation in Dart. homepage: https://github.com/sass/dart-sass