Fix normalization of relative paths inside of deep relative imports

lib/build/import_inliner.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 library web_components.build.import_inliner;
 
 import 'dart:async';
 import 'dart:collection' show LinkedHashMap;
 import 'package:barback/barback.dart';
 import 'package:code_transformers/assets.dart';
 import 'package:code_transformers/messages/build_logger.dart';
@@ skipping 86 matching lines @@
 
     // Add all the other imports!
     imports.forEach((AssetId asset, ImportData data) {
       if (asset == primaryInput) return;
       var document = data.document;
       // Remove all dart script tags.
       document
           .querySelectorAll('script[type="$dartType"]')
           .forEach((script) => script.remove());
       // Normalize urls in attributes and inline css.
-      new _UrlNormalizer(primaryInput, asset, logger).visit(document);
+      new _UrlNormalizer(data.fromId, asset, logger).visit(document);
       // Replace the import with its contents by appending the nodes
       // immediately before the import one at a time, and then removing the
       // import from the document.
       var element = data.element;
       var parent = element.parent;
       document.head.nodes
           .toList(growable: false)
           .forEach((child) => parent.insertBefore(child, element));
       document.body.nodes
           .toList(growable: false)
@@ skipping 141 matching lines @@
       return href;
     }
     if (uri.isAbsolute) return href;
     if (uri.scheme.isNotEmpty) return href;
     if (uri.host.isNotEmpty) return href;
     if (uri.path.isEmpty) return href; // Implies standalone ? or # in URI.
     if (path.isAbsolute(hrefToParse)) return href;
 
     var id = uriToAssetId(sourceId, hrefToParse, logger, span);
     if (id == null) return href;
-    var primaryId = primaryInput;
 
     // Build the new path, placing back any suffixes that we stripped earlier.
     var prefix =
         (firstFolder == -1) ? id.path : id.path.substring(0, id.path.length);
     var suffix = (firstFolder == -1) ? '' : href.substring(firstFolder);
     var newPath = '$prefix$suffix';
 
     if (newPath.startsWith('lib/')) {
       return '${topLevelPath}packages/${id.package}/${newPath.substring(4)}';
     }
 
     if (newPath.startsWith('asset/')) {
       return '${topLevelPath}assets/${id.package}/${newPath.substring(6)}';
     }
 
-    if (primaryId.package != id.package) {
+    if (primaryInput.package != id.package) {
       // Technically we shouldn't get there
       logger.error(internalErrorDontKnowHowToImport
-              .create({'target': id, 'source': primaryId, 'extra': ''}),
+              .create({'target': id, 'source': primaryInput, 'extra': ''}),
           span: span);
       return href;
     }
 
     var builder = path.url;
     return builder.normalize(builder.relative(builder.join('/', newPath),
-        from: builder.join('/', builder.dirname(primaryId.path))));
+        from: builder.join('/', builder.dirname(primaryInput.path))));
   }
 }
 
 /// Returns true if this is a valid custom element name. See:
 /// <http://w3c.github.io/webcomponents/spec/custom/#dfn-custom-element-type>
 bool isCustomTagName(String name) {
   if (name == null || !name.contains('-')) return false;
   return !invalidTagNames.containsKey(name);
 }
 
@@ skipping 32 matching lines @@
   '_href', // in a, area, link, base, command
   'icon',
   '_icon', // in command
   'manifest',
   '_manifest', // in html
   'poster',
   '_poster', // in video
   'src',
   '_src', // in audio, embed, iframe, img, input, script, source, track,video
 ];