Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

<fix>(transformers): Fix asset resolution for web assets #1652

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/tools/transformer/referenced_uris.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
8 changes: 4 additions & 4 deletions test/tools/transformer/expression_generator_spec.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ main() {
import 'package:angular/angular.dart';

@Component(
templateUrl: 'lib/foo.html',
templateUrl: 'foo.html',
selector: 'my-component')
class FooComponent {}

Expand All @@ -79,7 +79,7 @@ main() {

main() {}
''',
'a|lib/foo.html': '''
'a|web/foo.html': '''
<div>{{template.contents}}</div>''',
'b|lib/bar.html': '''
<div>{{bar}}</div>''',
Expand All @@ -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')
Expand All @@ -113,7 +113,7 @@ main() {

main() {}
''',
'a|lib/foo.html': '''
'a|web/foo.html': '''
<div>{{template.foo}}</div>
<div>{{template.bar}}</div>''',
'a|web/index.html': '''
Expand Down