build: test cherry-picking just the cache updates

nodejs · Mar 23, 2021 · 5c95073 · 5c95073
1 parent fc6c568
commit 5c95073
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 34 deletions.
diff --git a/lib/internal/source_map/source_map_cache.js b/lib/internal/source_map/source_map_cache.js
@@ -25,7 +25,6 @@ const { Buffer } = require('buffer');
 let debug = require('internal/util/debuglog').debuglog('source_map', (fn) => {
   debug = fn;
 });
-const { dirname, resolve } = require('path');
 const fs = require('fs');
 const { getOptionValue } = require('internal/options');
 const {
@@ -63,10 +62,8 @@ function getSourceMapsEnabled() {
 function maybeCacheSourceMap(filename, content, cjsModuleInstance) {
   const sourceMapsEnabled = getSourceMapsEnabled();
   if (!(process.env.NODE_V8_COVERAGE || sourceMapsEnabled)) return;
-  let basePath;
   try {
     filename = normalizeReferrerURL(filename);
-    basePath = dirname(fileURLToPath(filename));
   } catch (err) {
     // This is most likely an [eval]-wrapper, which is currently not
     // supported.
@@ -76,7 +73,7 @@ function maybeCacheSourceMap(filename, content, cjsModuleInstance) {
 
   const match = content.match(/\/[*/]#\s+sourceMappingURL=(?<sourceMappingURL>[^\s]+)/);
   if (match) {
-    const data = dataFromUrl(basePath, match.groups.sourceMappingURL);
+    const data = dataFromUrl(filename, match.groups.sourceMappingURL);
     const url = data ? null : match.groups.sourceMappingURL;
     if (cjsModuleInstance) {
       if (!Module) Module = require('internal/modules/cjs/loader').Module;
@@ -98,21 +95,21 @@ function maybeCacheSourceMap(filename, content, cjsModuleInstance) {
   }
 }
 
-function dataFromUrl(basePath, sourceMappingURL) {
+function dataFromUrl(sourceURL, sourceMappingURL) {
   try {
     const url = new URL(sourceMappingURL);
     switch (url.protocol) {
       case 'data:':
-        return sourceMapFromDataUrl(basePath, url.pathname);
+        return sourceMapFromDataUrl(sourceURL, url.pathname);
       default:
         debug(`unknown protocol ${url.protocol}`);
         return null;
     }
   } catch (err) {
     debug(err.stack);
     // If no scheme is present, we assume we are dealing with a file path.
-    const sourceMapFile = resolve(basePath, sourceMappingURL);
-    return sourceMapFromFile(sourceMapFile);
+    const mapURL = new URL(sourceMappingURL, sourceURL).href;
+    return sourceMapFromFile(mapURL);
   }
 }
 
@@ -128,11 +125,11 @@ function lineLengths(content) {
   });
 }
 
-function sourceMapFromFile(sourceMapFile) {
+function sourceMapFromFile(mapURL) {
   try {
-    const content = fs.readFileSync(sourceMapFile, 'utf8');
+    const content = fs.readFileSync(fileURLToPath(mapURL), 'utf8');
     const data = JSONParse(content);
-    return sourcesToAbsolute(dirname(sourceMapFile), data);
+    return sourcesToAbsolute(mapURL, data);
   } catch (err) {
     debug(err.stack);
     return null;
@@ -141,7 +138,7 @@ function sourceMapFromFile(sourceMapFile) {
 
 // data:[<mediatype>][;base64],<data> see:
 // https://tools.ietf.org/html/rfc2397#section-2
-function sourceMapFromDataUrl(basePath, url) {
+function sourceMapFromDataUrl(sourceURL, url) {
   const [format, data] = url.split(',');
   const splitFormat = format.split(';');
   const contentType = splitFormat[0];
@@ -151,7 +148,7 @@ function sourceMapFromDataUrl(basePath, url) {
       Buffer.from(data, 'base64').toString('utf8') : data;
     try {
       const parsedData = JSONParse(decodedData);
-      return sourcesToAbsolute(basePath, parsedData);
+      return sourcesToAbsolute(sourceURL, parsedData);
     } catch (err) {
       debug(err.stack);
       return null;
@@ -165,14 +162,10 @@ function sourceMapFromDataUrl(basePath, url) {
 // If the sources are not absolute URLs after prepending of the "sourceRoot",
 // the sources are resolved relative to the SourceMap (like resolving script
 // src in a html document).
-function sourcesToAbsolute(base, data) {
+function sourcesToAbsolute(baseURL, data) {
   data.sources = data.sources.map((source) => {
     source = (data.sourceRoot || '') + source;
-    if (!/^[\\/]/.test(source[0])) {
-      source = resolve(base, source);
-    }
-    if (!source.startsWith('file://')) source = `file://${source}`;
-    return source;
+    return new URL(source, baseURL).href;
   });
   // The sources array is now resolved to absolute URLs, sourceRoot should
   // be updated to noop.

diff --git a/test/parallel/test-source-map-enable.js b/test/parallel/test-source-map-enable.js
@@ -266,21 +266,6 @@ function nextdir() {
   );
 }
 
-/*
-{
-  const output = spawnSync(process.execPath, [
-    '--enable-source-maps',
-    require.resolve('../fixtures/source-map/webpack.js')
-  ]);
-  // Error in original context of source content:
-  assert.ok(
-    output.stderr.toString().match(/throw new Error\('oh no!'\)\r?\n.*\^/)
-  );
-  // Rewritten stack trace:
-  assert.ok(output.stderr.toString().includes('webpack:///webpack.js:14:9'));
-}
-*/
-
 function getSourceMapFromCache(fixtureFile, coverageDirectory) {
   const jsonFiles = fs.readdirSync(coverageDirectory);
   for (const jsonFile of jsonFiles) {