Merge pull request #698 from tromey/relative-source-urls

Compute sourceRoot when only relative URLs are seen

Author: tromey

packages/devtools-source-map/src/tests/fixtures/noroot2.js

@@ -0,0 +1,2 @@
+/* Doesn't really matter what is in here.  */
+// # sourceMappingURL=noroot2.js.map

packages/devtools-source-map/src/tests/fixtures/noroot2.js.map

@@ -50,6 +50,11 @@ describe("source maps", () => {
       const urls = await setupBundleFixture("noroot");
       expect(urls).toEqual(["http://example.com/heart.js"]);
     });
+
+    test("Non-existing sourceRoot resolution with relative URLs", async () => {
+      const urls = await setupBundleFixture("noroot2");
+      expect(urls).toEqual(["http://example.com/heart.js"]);
+    });
   });
 
   describe("hasMappedSource", async () => {

packages/devtools-source-map/src/tests/source-map.js

@@ -11,6 +11,8 @@ const { SourceMapConsumer } = require("source-map");
 
 const path = require("./path");
 
+const URL_ISH = new RegExp("^[a-z]+:/");
+
 import type {
   Location,
   Source,
@@ -28,10 +30,17 @@ function _setSourceMapRoot(
   absSourceMapURL: string,
   source: Source
 ) {
-  // No need to do this fiddling if we won't be fetching any sources over the
-  // wire.
+  // No need to do this fiddling if we won't be fetching any sources
+  // over the wire.  However, we do still want to if any of the source
+  // URLs are relative.  What's difficult is that we want to pretend
+  // that some non-URLs, like "webpack:/whatever", are actually URLs.
   if (sourceMap.hasContentsOfAllSources()) {
-    return;
+    const allURLsAreAbsolute = sourceMap.sources.every(sourceName => {
+      return URL_ISH.test(sourceName);
+    });
+    if (allURLsAreAbsolute) {
+      return;
+    }
   }
 
   // If it's already a URL, just leave it alone.