diff --git a/lib/tools/transformer/referenced_uris.dart b/lib/tools/transformer/referenced_uris.dart index 25baf6ee3..0c1f38249 100644 --- a/lib/tools/transformer/referenced_uris.dart +++ b/lib/tools/transformer/referenced_uris.dart @@ -212,7 +212,10 @@ class _Processor { warn('Cannot cache non-package absolute URIs. $uri', reference); return null; } - var assetId = new AssetId(transform.primaryInput.id.package, uri); + // Everything else is a resource in the web directory according to pub; + // as all packages URIs were handled above. As specified in this + // [Barback Doc](http://goo.gl/YDMRc2) + var assetId = new AssetId(transform.primaryInput.id.package, 'web/$uri'); return new _CacheEntry(uri, reference, assetId); } diff --git a/test/tools/transformer/expression_generator_spec.dart b/test/tools/transformer/expression_generator_spec.dart index 874378110..9cdbce0be 100644 --- a/test/tools/transformer/expression_generator_spec.dart +++ b/test/tools/transformer/expression_generator_spec.dart @@ -68,7 +68,7 @@ main() { import 'package:angular/angular.dart'; @Component( - templateUrl: 'lib/foo.html', + templateUrl: 'foo.html', selector: 'my-component') class FooComponent {} @@ -79,7 +79,7 @@ main() { main() {} ''', - 'a|lib/foo.html': ''' + 'a|web/foo.html': '''
{{template.contents}}
''', 'b|lib/bar.html': '''
{{bar}}
''', @@ -99,7 +99,7 @@ main() { import 'package:angular/angular.dart'; @Component( - templateUrl: 'lib/foo.html', + templateUrl: 'foo.html', selector: 'my-component') class FooComponent extends BarComponent { @NgAttr('foo') @@ -113,7 +113,7 @@ main() { main() {} ''', - 'a|lib/foo.html': ''' + 'a|web/foo.html': '''
{{template.foo}}
{{template.bar}}
''', 'a|web/index.html': '''