fix LibraryIdentifier paths when initialization starts from an inline script in a subfolder
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 624f0eb..b9baa6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.0+1
+
+* Fix for `LibraryIdentifier` paths when initializer starts from inline scripts
+inside of subfolders.
+
## 0.6.0
* Added the `from` option to `run`. This should be a `Uri` pointing to a library
@@ -8,6 +13,7 @@
`web_components` package.
## 0.5.1+8
+
* Make sure to crawl the entire supertype chain for annotations, and run them
in reverse order.
diff --git a/lib/src/mirror_loader.dart b/lib/src/mirror_loader.dart
index 46ac819..0c482d3 100644
--- a/lib/src/mirror_loader.dart
+++ b/lib/src/mirror_loader.dart
@@ -183,7 +183,9 @@
}
if (uri.scheme == 'file' || uri.scheme.startsWith('http')) {
filePath = path.url.relative(uri.path,
- from: path.url.dirname(_root.uri.path));
+ from: _root.uri.path.endsWith('/')
+ ? _root.uri.path
+ : path.url.dirname(_root.uri.path));
} else if (uri.scheme == 'package') {
var segments = uri.pathSegments;
package = segments[0];
diff --git a/pubspec.yaml b/pubspec.yaml
index eb5e50c..21298d9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
name: initialize
-version: 0.6.0
+version: 0.6.0+1
author: Polymer.dart Authors <web@dartlang.org>
description: Generic building blocks for doing static initialization.
homepage: https://github.com/dart-lang/initialize