source maps sanitization relaxing

systemjs · May 18, 2016 · b124515 · b124515
1 parent 36f995e
commit b124515
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/lib/esm.js b/lib/esm.js
@@ -55,13 +55,14 @@
                 // sanitize sourceMap if an object not a JSON string
                 var sourceMap = load.metadata.sourceMap;
                 if (sourceMap && typeof sourceMap == 'object') {
-                  var originalName = load.name.split('!')[0];
+                  var originalName = load.address.split('!')[0];
 
                   // force set the filename of the original file
-                  sourceMap.file = originalName + '!transpiled';
+                  if (!sourceMap.file || sourceMap.file == load.address)
+                    sourceMap.file = originalName + '!transpiled';
 
                   // force set the sources list if only one source
-                  if (!sourceMap.sources || sourceMap.sources.length <= 1)
+                  if (!sourceMap.sources || sourceMap.sources.length <= 1 && (!sourceMap.sources[0] || sourceMap.sources[0] == load.address))
                     sourceMap.sources = [originalName];
                 }
 

diff --git a/lib/plugins.js b/lib/plugins.js
@@ -203,13 +203,14 @@
             if (typeof sourceMap != 'object')
               throw new Error('load.metadata.sourceMap must be set to an object.');
 
-            var originalName = load.name.split('!')[0];
+            var originalName = load.address.split('!')[0];
 
             // force set the filename of the original file
-            sourceMap.file = originalName + '!transpiled';
+            if (!sourceMap.file || sourceMap.file == load.address)
+              sourceMap.file = originalName + '!transpiled';
 
             // force set the sources list if only one source
-            if (!sourceMap.sources || sourceMap.sources.length <= 1)
+            if (!sourceMap.sources || sourceMap.sources.length <= 1 && (!sourceMap.sources[0] || sourceMap.sources[0] == load.address))
               sourceMap.sources = [originalName];
           }