fix(tracing): ensure that moduleids after 2nd trace do not contain pr…

…efixes
JeroenVinke · Apr 6, 2017 · 05fcdf7 · 05fcdf7
1 parent bff36da
commit 05fcdf7
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/lib/build/amodro-trace/lib/loader/Loader.js b/lib/build/amodro-trace/lib/loader/Loader.js
@@ -33,6 +33,14 @@ function __exec(contents, r, d, c) {
   eval(contents);
 }
 
+function normalizeModuleId(moduleId) {
+  if (parse.hasPrefix(moduleId)) {
+    moduleId = moduleId.split('!')[1];
+  }
+
+  return moduleId;
+}
+
 // Patch requirejs to work for build purposes.
 (function() {
   var hasProp = lang.hasProp,
@@ -164,6 +172,8 @@ function __exec(contents, r, d, c) {
 
     var oldNameToUrl = context.nameToUrl;
     context.nameToUrl = function (moduleName, ext, skipExt) {
+      moduleName = normalizeModuleId(moduleName);
+
       var url = oldNameToUrl.call(context, moduleName, ext, skipExt);
       return context.normalizePath(url);
     };