Merge pull request #186 from webpack-contrib/fix/sources-content-missing

fix: sourcesContent missing in source maps
webpack-contrib · Mar 30, 2017 · 7a985cd · 7a985cd
2 parents 786aa59 + df28035
commit 7a985cd
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/src/getOptions.js b/src/getOptions.js
@@ -24,6 +24,16 @@ function getOptions(loaderContext) {
     options.plugins.push(createWebpackLessPlugin(loaderContext));
   }
 
+  if (options.sourceMap) {
+    if (typeof options.sourceMap === 'boolean') {
+      options.sourceMap = {};
+    }
+    if ('outputSourceFiles' in options.sourceMap === false) {
+      // Include source files as `sourceContents` as sane default since this makes source maps "just work" in most cases
+      options.sourceMap.outputSourceFiles = true;
+    }
+  }
+
   return options;
 }
 

diff --git a/test/helpers/createSpec.js b/test/helpers/createSpec.js
@@ -28,6 +28,7 @@ const lessOptions = {
     '--source-map',
     `--source-map-basepath=${projectPath}`,
     `--source-map-rootpath=${projectPath}`,
+    '--source-map-less-inline',
   ],
   'import-paths': [
     `--include-path=${path.resolve(fixturesPath, 'node_modules')}`,

diff --git a/test/index.test.js b/test/index.test.js
@@ -165,7 +165,7 @@ test('should transform urls', async () => {
   await compileAndCompare('url-path');
 });
 
-test('should generate source maps', async () => {
+test('should generate source maps with sourcesContent by default', async () => {
   let inspect;
   const rules = moduleRules.basic({ sourceMap: true }, {}, (i) => {
     inspect = i;
@@ -177,10 +177,30 @@ test('should generate source maps', async () => {
   ]);
   const [actualCss, actualMap] = inspect.arguments;
 
+  expect(Array.isArray(actualMap.sourcesContent)).toBe(true);
+  expect(actualMap.sourcesContent.length).toBe(2);
+
+  // We can't actually compare the sourcesContent because it's slightly different because of our import rewriting
+  delete actualMap.sourcesContent;
+  delete expectedMap.sourcesContent;
+
   expect(actualCss).toEqual(expectedCss);
   expect(actualMap).toEqual(expectedMap);
 });
 
+test('should be possible to override sourceMap.outputSourceFiles', async () => {
+  let inspect;
+  const rules = moduleRules.basic({ sourceMap: { outputSourceFiles: false } }, {}, (i) => {
+    inspect = i;
+  });
+
+  await compile('source-map', rules);
+
+  const [actualMap] = inspect.arguments;
+
+  expect(actualMap).not.toHaveProperty('sourcesContent');
+});
+
 test('should install plugins', async () => {
   let pluginInstalled = false;
   // Using prototype inheritance here since Less plugins are usually instances of classes