Merge pull request #140 from xg-wang/sources

Fix sources: ["0"], output the correct source

Author: stefanpenner

lib/get-sourcemap-content.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const srcURL = require('source-map-url');
+
+module.exports = function getSourceMapContent(src, inFileDirname, relativePath, silent) {
+  let urls = [];
+  let matchedUrl;
+  while ((matchedUrl = srcURL.getFrom(src)) !== null) {
+    urls.push(matchedUrl);
+    src = srcURL.removeFrom(src);
+  }
+  if (urls.length) {
+    for (let i = urls.length - 1; i >= 0; --i) {
+      let sourceMapPath = path.join(inFileDirname, urls[i]);
+      if (fs.existsSync(sourceMapPath)) {
+        return JSON.parse(fs.readFileSync(sourceMapPath));
+      }
+    }
+    if (!silent) {
+      console.warn(
+        `[WARN] (broccoli-uglify-sourcemap) ${urls
+          .map(u => `"${u}"`)
+          .join(', ')} referenced in "${relativePath}" could not be found`
+      );
+    }
+  }
+};

lib/process-file.js

@@ -5,7 +5,7 @@ const defaults = require('lodash.defaultsdeep');
 const fs = require('fs');
 const mkdirp = require('mkdirp');
 const path = require('path');
-const srcURL = require('source-map-url');
+const getSourceMapContent = require('./get-sourcemap-content');
 
 const terser = require('terser');
 
@@ -38,14 +38,9 @@ module.exports = function processFile(inFile, outFile, relativePath, outDir, sil
 
     let sourceMap = { filename, url };
 
-    if (srcURL.existsIn(src)) {
-      let url = srcURL.getFrom(src);
-      let sourceMapPath = path.join(path.dirname(inFile), url);
-      if (fs.existsSync(sourceMapPath)) {
-        sourceMap.content = JSON.parse(fs.readFileSync(sourceMapPath));
-      } else if (!silent) {
-        console.warn(`[WARN] (broccoli-uglify-sourcemap) "${url}" referenced in "${relativePath}" could not be found`);
-      }
+    let content = getSourceMapContent(src, path.dirname(inFile), relativePath, silent);
+    if (content) {
+      sourceMap.content = content;
     }
 
     options = defaults(options, { sourceMap });
@@ -71,11 +66,22 @@ module.exports = function processFile(inFile, outFile, relativePath, outDir, sil
     let newSourceMap = JSON.parse(result.map);
 
     newSourceMap.sources = newSourceMap.sources.map(function(path) {
-      // If out output file has the same name as one of our original
-      // sources, they will shadow eachother in Dev Tools. So instead we
-      // alter the reference to the upstream file.
       if (path === relativePath) {
-        path = path.replace(/\.js$/, '-orig.js');
+        // If out output file has the same name as one of our original
+        // sources, they will shadow eachother in Dev Tools. So instead we
+        // alter the reference to the upstream file.
+        return path.replace(/\.js$/, '-orig.js');
+      } else if (path === '0') {
+        // In [terser-js](https://github.com/terser-js/terser#source-map-options),
+        // sources are always 0 if old sourcemaps are not provided.
+        // The value passed for `sourceMap.url` is only used to set
+        // `//# sourceMappingURL=out.js.map` in `result.code`.
+        // The value of `filename` is only used to set `file` attribute
+        // in source map file.
+        // In broccoli-uglify-sourcemap we know in this case we are generating
+        // sourcemap for the file we are processing, changing 0 to the actual
+        // file gives us the correct source.
+        return relativePath;
       }
       return path;
     });