Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug with implicit dependencies #1348

Merged
merged 2 commits into from Jun 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,8 @@
## 1.34.2

* Fix a bug that could prevent some members from being found in certain files
that use a mix of imports and the module system.

## 1.34.1

* Fix a bug where `--update` would always compile any file that depends on a
Expand Down
13 changes: 10 additions & 3 deletions lib/src/async_environment.dart
Expand Up @@ -210,12 +210,19 @@ class AsyncEnvironment {
/// Returns a new environment to use for an imported file.
///
/// The returned environment shares this environment's variables, functions,
/// and mixins, but not its modules.
/// and mixins, but excludes most modules (except for global modules that
/// result from importing a file with forwards).
AsyncEnvironment forImport() => AsyncEnvironment._(
{},
{},
{},
{},
{
for (var module in _globalModules)
if (module is ForwardedModuleView) module
},
{
for (var entry in _globalModuleNodes.entries)
if (entry.key is ForwardedModuleView) entry.key: entry.value
},
null,
null,
null,
Expand Down
15 changes: 11 additions & 4 deletions lib/src/environment.dart
Expand Up @@ -5,7 +5,7 @@
// DO NOT EDIT. This file was generated from async_environment.dart.
// See tool/grind/synchronize.dart for details.
//
// Checksum: 588f0864bb1f889586178c799d91696341ecf218
// Checksum: 0411d2d782920c2d8293eacf178941c192670e75
//
// ignore_for_file: unused_import

Expand Down Expand Up @@ -217,12 +217,19 @@ class Environment {
/// Returns a new environment to use for an imported file.
///
/// The returned environment shares this environment's variables, functions,
/// and mixins, but not its modules.
/// and mixins, but excludes most modules (except for global modules that
/// result from importing a file with forwards).
Environment forImport() => Environment._(
{},
{},
{},
{},
{
for (var module in _globalModules)
if (module is ForwardedModuleView) module
},
{
for (var entry in _globalModuleNodes.entries)
if (entry.key is ForwardedModuleView) entry.key: entry.value
},
null,
null,
null,
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
@@ -1,5 +1,5 @@
name: sass
version: 1.34.1
version: 1.34.2-dev
description: A Sass implementation in Dart.
author: Sass Team
homepage: https://github.com/sass/dart-sass
Expand Down