Skip to content

Commit f7f0342

Browse files
authored
Fix bug with implicit configuration (#2642)
Fixes #2641
1 parent ea9f7be commit f7f0342

File tree

8 files changed

+31
-5
lines changed

8 files changed

+31
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.92.1
2+
3+
* Fix a bug where variable definitions from one imported, forwarded module
4+
would not be passed as implicit configuration to a later imported, forwarded
5+
module.
6+
17
## 1.92.0
28

39
* **Breaking change:** Emit declarations, childless at-rules, and comments in

lib/src/async_environment.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,12 @@ final class AsyncEnvironment {
834834
/// environment.
835835
Configuration toImplicitConfiguration() {
836836
var configuration = <String, ConfiguredValue>{};
837+
for (var module in _importedModules.keys) {
838+
for (var (name, value) in module.variables.pairs) {
839+
configuration[name] =
840+
ConfiguredValue.implicit(value, module.variableNodes[name]!);
841+
}
842+
}
837843
for (var i = 0; i < _variables.length; i++) {
838844
var values = _variables[i];
839845
var nodes = _variableNodes[i];

lib/src/environment.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// DO NOT EDIT. This file was generated from async_environment.dart.
66
// See tool/grind/synchronize.dart for details.
77
//
8-
// Checksum: 72b802e4004aae8a84f7aa78ec728861339b846b
8+
// Checksum: 608af187f35a7483a87d8a54e97793e776ba215c
99
//
1010
// ignore_for_file: unused_import
1111

@@ -842,6 +842,12 @@ final class Environment {
842842
/// environment.
843843
Configuration toImplicitConfiguration() {
844844
var configuration = <String, ConfiguredValue>{};
845+
for (var module in _importedModules.keys) {
846+
for (var (name, value) in module.variables.pairs) {
847+
configuration[name] =
848+
ConfiguredValue.implicit(value, module.variableNodes[name]!);
849+
}
850+
}
845851
for (var i = 0; i < _variables.length; i++) {
846852
var values = _variables[i];
847853
var nodes = _variableNodes[i];

pkg/sass-parser/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.4.28
2+
3+
* No user-visible changes.
4+
15
## 0.4.27
26

37
* No user-visible changes.

pkg/sass-parser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sass-parser",
3-
"version": "0.4.27",
3+
"version": "0.4.28",
44
"description": "A PostCSS-compatible wrapper of the official Sass parser",
55
"repository": "sass/sass",
66
"author": "Google Inc.",

pkg/sass_api/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 15.11.0
2+
3+
* No user-visible changes.
4+
15
## 15.10.0
26

37
* No user-visible changes.

pkg/sass_api/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ name: sass_api
22
# Note: Every time we add a new Sass AST node, we need to bump the *major*
33
# version because it's a breaking change for anyone who's implementing the
44
# visitor interface(s).
5-
version: 15.10.0
5+
version: 15.11.0
66
description: Additional APIs for Dart Sass.
77
homepage: https://github.com/sass/dart-sass
88

99
environment:
1010
sdk: ">=3.6.0 <4.0.0"
1111

1212
dependencies:
13-
sass: 1.92.0
13+
sass: 1.92.1
1414

1515
dev_dependencies:
1616
dartdoc: ^8.0.14

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: sass
2-
version: 1.92.0
2+
version: 1.92.1
33
description: A Sass implementation in Dart.
44
homepage: https://github.com/sass/dart-sass
55

0 commit comments

Comments
 (0)