fix

Author: cspotcode

package-lock.json

@@ -18,7 +18,6 @@
     "/source-map-support.js"
   ],
   "dependencies": {
-    "@jridgewell/resolve-uri": "^3.0.6",
     "@jridgewell/trace-mapping": "0.3.9"
   },
   "devDependencies": {

package.json

@@ -1,5 +1,4 @@
 const { TraceMap, originalPositionFor, AnyMap } = require('@jridgewell/trace-mapping');
-const resolveUri = require('@jridgewell/resolve-uri');
 var path = require('path');
 const { fileURLToPath, pathToFileURL } = require('url');
 var util = require('util');
@@ -251,19 +250,51 @@ sharedData.internalRetrieveFileHandlers.push(function(path) {
 // Support URLs relative to a directory, but be careful about a protocol prefix
 // in case we are in the browser (i.e. directories may start with "http://" or "file:///")
 function supportRelativeURL(file, url) {
-  // We want to preserve path style.
-  // resolveUri cannot handle windows paths.
-  // Therefore, special-case when output will be a windows path
-  if(process.platform === 'win32') {
-    if(path.isAbsolute(file) && !isAbsoluteUrl(url) && !isSchemeRelativeUrl(url)) {
-      const dir = path.dirname(file);
-      return path.resolve(dir, url);
+  if(!file) return url;
+  // given that this happens within error formatting codepath, probably best to
+  // fallback instead of throwing if anything goes wrong
+  try {
+    // if should output a URL
+    if(isAbsoluteUrl(file) || isSchemeRelativeUrl(file)) {
+        if(isAbsoluteUrl(url) || isSchemeRelativeUrl(url)) {
+            return new URL(url, file).toString();
+        }
+        if(path.isAbsolute(url)) {
+            return new URL(pathToFileURL(url), file).toString();
+        }
+        // url is relative path or URL
+        return new URL(url.replace(/\\/g, '/'), file).toString();
+    }
+    // if should output a path (unless URL is something like https://)
+    if(path.isAbsolute(file)) {
+        if(isFileUrl(url)) {
+            return fileURLToPath(url);
+        }
+        if(isSchemeRelativeUrl(url)) {
+            return fileURLToPath(new URL(url, 'file://'));
+        }
+        if(isAbsoluteUrl(url)) {
+            // url is a non-file URL
+            // Go with the URL
+            return url;
+        }
+        if(path.isAbsolute(url)) {
+            return url;
+            // Normalize at all?  decodeURI or normalize slashes?
+        }
+        // url is relative path or URL
+        return path.join(file, '..', decodeURI(url));
     }
-    if(isFileUrl(file) && path.isAbsolute(url)) {
-      url = pathToFileURL(url).toString();
+    // If we get here, file is relative.
+    // Shouldn't happen since node identifies modules with absolute paths or URLs.
+    // But we can take a stab at returning something meaningful anyway.
+    if(isAbsoluteUrl(url) || isSchemeRelativeUrl(url)) {
+        return url;
     }
+    return path.join(file, '..', url);
+  } catch(e) {
+      return url;
   }
-  return resolveUri(url, file);
 }
 
 function retrieveSourceMapURL(source) {

source-map-support.js

@@ -1072,3 +1072,6 @@ describe('uninstall', function() {
     assert(peInvocations >= 1);
   });
 });
+// Without this, the code under test sees stuff in the test cases above and tries to load source-maps
+// This causes confusing red herrings while debugging.
+//#sourceMappingURL=test.js.map-intentionally-does-not-exist