fix: webpack protocol

Author: cap-Bernardito

src/index.js

@@ -82,6 +82,9 @@ export default async function loader(input, inputMap) {
           : null;
       const skipReading = originalSourceContent !== null;
 
+      // We do not skipReading here, because we need absolute paths in sources.
+      // This is necessary so that for sourceMaps with the same file structure in sources, name collisions do not occur.
+      // https://github.com/webpack-contrib/source-map-loader/issues/51
       try {
         ({ sourceURL, sourceContent } = await fetchFromURL(
           this,

src/utils.js

@@ -160,16 +160,14 @@ async function fetchFromURL(
       return { sourceContent };
     }
 
+    if (skipReading) {
+      return { sourceURL: url };
+    }
+
     if (protocol === 'file:') {
       const pathFromURL = urlUtils.fileURLToPath(url);
-
       const sourceURL = path.normalize(pathFromURL);
-
-      let sourceContent;
-
-      if (!skipReading) {
-        sourceContent = await fetchFromFilesystem(loaderContext, sourceURL);
-      }
+      const sourceContent = await fetchFromFilesystem(loaderContext, sourceURL);
 
       return { sourceURL, sourceContent };
     }

test/__snapshots__/loader.test.js.snap

@@ -128,12 +128,7 @@ anInvalidDirective = \\"\\\\n/*# sourceMappingURL=data:application/json;base64,\
 }
 `;
 
-exports[`source-map-loader should process css sourceMap: warnings 1`] = `
-Array [
-  "ModuleWarning: Module Warning (from \`replaced original path\`):
-Failed to parse source map: \\"webpack:///./src/app/app.scss\\" URL is not supported",
-]
-`;
+exports[`source-map-loader should process css sourceMap: warnings 1`] = `Array []`;
 
 exports[`source-map-loader should process css sourceMap: warnings 2`] = `
 Array [
@@ -310,6 +305,28 @@ Failed to parse source map: \\"ftp://exampleurl.com\\" URL is not supported",
 ]
 `;
 
+exports[`source-map-loader should skip file protocol path if sourcesContent is set: css 1`] = `
+"// Some content
+ "
+`;
+
+exports[`source-map-loader should skip file protocol path if sourcesContent is set: errors 1`] = `Array []`;
+
+exports[`source-map-loader should skip file protocol path if sourcesContent is set: map 1`] = `
+Object {
+  "mappings": "CAAC,IAAI,IAAM,SAAUA,GAClB,OAAOA",
+  "sources": Array [
+    "file:///external normal-file2.js",
+  ],
+  "sourcesContent": Array [
+    "export default 3;",
+  ],
+  "version": 3,
+}
+`;
+
+exports[`source-map-loader should skip file protocol path if sourcesContent is set: warnings 1`] = `Array []`;
+
 exports[`source-map-loader should skip invalid base64 SourceMap: css 1`] = `
 "without SourceMap
 // @sourceMappingURL=data:application/source-map;base64,\\"something invalid\\"
@@ -325,6 +342,34 @@ Failed to parse source map from 'undefined': SyntaxError: Unexpected end of JSON
 ]
 `;
 
+exports[`source-map-loader should skip webpack protocol path if sourcesContent is set: css 1`] = `
+"!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){\\"undefined\\"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:\\"Module\\"}),Object.defineProperty(e,\\"__esModule\\",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&\\"object\\"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,\\"default\\",{enumerable:!0,value:e}),2&t&&\\"string\\"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,\\"a\\",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p=\\"\\",r(r.s=0)}([function(e,t,r){\\"use strict\\";r.r(t),t.default=3}]);
+"
+`;
+
+exports[`source-map-loader should skip webpack protocol path if sourcesContent is set: errors 1`] = `Array []`;
+
+exports[`source-map-loader should skip webpack protocol path if sourcesContent is set: map 1`] = `
+Object {
+  "file": "main.js",
+  "mappings": "aACE,IAAIA,EAAmB,GAGvB,SAASC,EAAoBC,GAG5B,GAAGF,EAAiBE,GACnB,OAAOF,EAAiBE,GAAUC,QAGnC,IAAIC,EAASJ,EAAiBE,GAAY,CACzCG,EAAGH,EACHI,GAAG,EACHH,QAAS,IAUV,OANAI,EAAQL,GAAUM,KAAKJ,EAAOD,QAASC,EAAQA,EAAOD,QAASF,GAG/DG,EAAOE,GAAI,EAGJF,EAAOD,QAKfF,EAAoBQ,EAAIF,EAGxBN,EAAoBS,EAAIV,EAGxBC,EAAoBU,EAAI,SAASR,EAASS,EAAMC,GAC3CZ,EAAoBa,EAAEX,EAASS,IAClCG,OAAOC,eAAeb,EAASS,EAAM,CAAEK,YAAY,EAAMC,IAAKL,KAKhEZ,EAAoBkB,EAAI,SAAShB,GACX,oBAAXiB,QAA0BA,OAAOC,aAC1CN,OAAOC,eAAeb,EAASiB,OAAOC,YAAa,CAAEC,MAAO,WAE7DP,OAAOC,eAAeb,EAAS,aAAc,CAAEmB,OAAO,KAQvDrB,EAAoBsB,EAAI,SAASD,EAAOE,GAEvC,GADU,EAAPA,IAAUF,EAAQrB,EAAoBqB,IAC/B,EAAPE,EAAU,OAAOF,EACpB,GAAW,EAAPE,GAA8B,iBAAVF,GAAsBA,GAASA,EAAMG,WAAY,OAAOH,EAChF,IAAII,EAAKX,OAAOY,OAAO,MAGvB,GAFA1B,EAAoBkB,EAAEO,GACtBX,OAAOC,eAAeU,EAAI,UAAW,CAAET,YAAY,EAAMK,MAAOA,IACtD,EAAPE,GAA4B,iBAATF,EAAmB,IAAI,IAAIM,KAAON,EAAOrB,EAAoBU,EAAEe,EAAIE,EAAK,SAASA,GAAO,OAAON,EAAMM,IAAQC,KAAK,KAAMD,IAC9I,OAAOF,GAIRzB,EAAoB6B,EAAI,SAAS1B,GAChC,IAAIS,EAAST,GAAUA,EAAOqB,WAC7B,WAAwB,OAAOrB,EAAgB,SAC/C,WAA8B,OAAOA,GAEtC,OADAH,EAAoBU,EAAEE,EAAQ,IAAKA,GAC5BA,GAIRZ,EAAoBa,EAAI,SAASiB,EAAQC,GAAY,OAAOjB,OAAOkB,UAAUC,eAAe1B,KAAKuB,EAAQC,IAGzG/B,EAAoBkC,EAAI,GAIjBlC,EAAoBA,EAAoBmC,EAAI,G,+BClFrD,OAAe",
+  "names": Array [],
+  "sources": Array [
+    "webpack:///webpack/bootstrap",
+    "webpack:///./src/index.js",
+    "webpack:///external \\"$\\"",
+  ],
+  "sourcesContent": Array [
+    " //webpack bootstrap;",
+    "export default 3;",
+    "module.exports = $;",
+  ],
+  "version": 3,
+}
+`;
+
+exports[`source-map-loader should skip webpack protocol path if sourcesContent is set: warnings 1`] = `Array []`;
+
 exports[`source-map-loader should support absolute paths to sourcemaps: css 1`] = `
 "// Some content 
  "

test/fixtures/file-broken-protocol-path.js

@@ -0,0 +1,2 @@
+// Some content
+ // # sourceMappingURL=file-broken-protocol-path.js.map

test/fixtures/file-broken-protocol-path.js.map

@@ -154,6 +154,32 @@ describe('source-map-loader', () => {
     expect(getErrors(stats)).toMatchSnapshot('errors');
   });
 
+  it('should skip file protocol path if sourcesContent is set', async () => {
+    const testId = 'file-broken-protocol-path.js';
+    const compiler = getCompiler(testId);
+    const stats = await compile(compiler);
+    const codeFromBundle = getCodeFromBundle(stats, compiler);
+
+    expect(codeFromBundle.map).toBeDefined();
+    expect(normalizeMap(codeFromBundle.map)).toMatchSnapshot('map');
+    expect(codeFromBundle.css).toMatchSnapshot('css');
+    expect(getWarnings(stats)).toMatchSnapshot('warnings');
+    expect(getErrors(stats)).toMatchSnapshot('errors');
+  });
+
+  it('should skip webpack protocol path if sourcesContent is set', async () => {
+    const testId = 'webpack/main.js';
+    const compiler = getCompiler(testId);
+    const stats = await compile(compiler);
+    const codeFromBundle = getCodeFromBundle(stats, compiler);
+
+    expect(codeFromBundle.map).toBeDefined();
+    expect(normalizeMap(codeFromBundle.map)).toMatchSnapshot('map');
+    expect(codeFromBundle.css).toMatchSnapshot('css');
+    expect(getWarnings(stats)).toMatchSnapshot('warnings');
+    expect(getErrors(stats)).toMatchSnapshot('errors');
+  });
+
   it('should use last SourceMap directive', async () => {
     const testId = 'multi-source-map.js';
     const compiler = getCompiler(testId);