diff --git a/CHANGELOG.md b/CHANGELOG.md index 68f510e21..07c4230aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.93.3 + +* Additional fixes for implicit configuration when nested imports are involved. + ## 1.93.2 * No user-visible changes. diff --git a/lib/src/async_environment.dart b/lib/src/async_environment.dart index 09192f4eb..7c104948c 100644 --- a/lib/src/async_environment.dart +++ b/lib/src/async_environment.dart @@ -223,7 +223,7 @@ final class AsyncEnvironment { {}, _importedModules, null, - null, + _nestedForwardedModules, [], _variables.toList(), _variableNodes.toList(), @@ -834,13 +834,15 @@ 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 modules = + i == 0 ? _importedModules.keys : _nestedForwardedModules?[i - 1]; + for (var module in modules ?? const []) { + for (var (name, value) in module.variables.pairs) { + configuration[name] = + ConfiguredValue.implicit(value, module.variableNodes[name]!); + } + } var values = _variables[i]; var nodes = _variableNodes[i]; for (var (name, value) in values.pairs) { diff --git a/lib/src/environment.dart b/lib/src/environment.dart index 681a8b745..b9840bec0 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: 608af187f35a7483a87d8a54e97793e776ba215c +// Checksum: 1a3e8a246997bac547c2c15e5c191aac2132cc5b // // ignore_for_file: unused_import @@ -230,7 +230,7 @@ final class Environment { {}, _importedModules, null, - null, + _nestedForwardedModules, [], _variables.toList(), _variableNodes.toList(), @@ -842,13 +842,15 @@ 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 modules = + i == 0 ? _importedModules.keys : _nestedForwardedModules?[i - 1]; + for (var module in modules ?? const >[]) { + for (var (name, value) in module.variables.pairs) { + configuration[name] = + ConfiguredValue.implicit(value, module.variableNodes[name]!); + } + } var values = _variables[i]; var nodes = _variableNodes[i]; for (var (name, value) in values.pairs) { diff --git a/pkg/sass-parser/CHANGELOG.md b/pkg/sass-parser/CHANGELOG.md index f3661143a..fad954c13 100644 --- a/pkg/sass-parser/CHANGELOG.md +++ b/pkg/sass-parser/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.32 + +* No user-visible changes. + ## 0.4.31 * No user-visible changes. diff --git a/pkg/sass-parser/package.json b/pkg/sass-parser/package.json index 561931527..2512d3950 100644 --- a/pkg/sass-parser/package.json +++ b/pkg/sass-parser/package.json @@ -1,6 +1,6 @@ { "name": "sass-parser", - "version": "0.4.31", + "version": "0.4.32", "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 b5626bbe6..9de3d228b 100644 --- a/pkg/sass_api/CHANGELOG.md +++ b/pkg/sass_api/CHANGELOG.md @@ -1,3 +1,7 @@ +## 15.12.3 + +* No user-visible changes. + ## 15.12.2 * No user-visible changes. diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml index 1e4eda01a..c35464512 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.12.2 +version: 15.12.3 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.93.2 + sass: 1.93.3 dev_dependencies: dartdoc: ^8.0.14 diff --git a/pubspec.yaml b/pubspec.yaml index d90577e21..817c3fc4e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: sass -version: 1.93.2 +version: 1.93.3 description: A Sass implementation in Dart. homepage: https://github.com/sass/dart-sass