Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(451)

Unified Diff: lib/src/barback/dependency_computer.dart

Issue 1413713010: Fix error detection for a non-existent global script. (Closed) Base URL: git@github.com:dart-lang/pub.git@master
Patch Set: Fix test Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | lib/src/entrypoint.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/barback/dependency_computer.dart
diff --git a/lib/src/barback/dependency_computer.dart b/lib/src/barback/dependency_computer.dart
index 4134e8006e2fefe7e624f7a4d7e948c89c54759b..46d5f03e35bac83770bd465c65ad63403f0aa32a 100644
--- a/lib/src/barback/dependency_computer.dart
+++ b/lib/src/barback/dependency_computer.dart
@@ -43,6 +43,10 @@ class DependencyComputer {
/// This is precomputed before any package computers are loaded.
final _untransformedPackages = new Set<String>();
+ /// Creates a dependency computer for [graph].
+ ///
+ /// If [rootDevDependencies] is true, this includes the root package's dev
+ /// dependencies in the computation.
DependencyComputer(this._graph) {
for (var package in ordered(_graph.packages.keys)) {
if (_graph.transitiveDependencies(package).every((dependency) =>
@@ -185,8 +189,11 @@ class DependencyComputer {
}
}
- var dependencies = packageName == _graph.entrypoint.root.name ?
- package.immediateDependencies : package.dependencies;
+ var dependencies =
+ !_graph.entrypoint.isGlobal &&
+ packageName == _graph.entrypoint.root.name
+ ? package.immediateDependencies
+ : package.dependencies;
for (var dep in dependencies) {
try {
traversePackage(dep.name);
@@ -335,8 +342,11 @@ class _PackageDependencyComputer {
var externalDirectives = _getTransitiveExternalDirectives(library);
if (externalDirectives == null) {
var rootName = _dependencyComputer._graph.entrypoint.root.name;
- var dependencies = _package.name == rootName ?
- _package.immediateDependencies : _package.dependencies;
+ var dependencies =
+ !_dependencyComputer._graph.entrypoint.isGlobal &&
+ _package.name == rootName
+ ? _package.immediateDependencies
+ : _package.dependencies;
// If anything transitively imported/exported by [library] within this
// package is modified by a transformer, we don't know what it will
« no previous file with comments | « no previous file | lib/src/entrypoint.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698