Merge pull request #144 from mzgoddard/direct-source-map-plugin

Fetch the source map options from a manual SourceMapDevToolPlugin

Author: mzgoddard

lib/devtool-options.js

@@ -1,5 +1,6 @@
 module.exports = function(options) {
   var devtool = options.devtool;
+  // options.devtool is turned into the options for SourceMapDevToolPlugin
   if(devtool && (devtool.indexOf("sourcemap") >= 0 || devtool.indexOf("source-map") >= 0)) {
     var hidden = devtool.indexOf("hidden") >= 0;
     var inline = devtool.indexOf("inline") >= 0;
@@ -24,4 +25,15 @@ module.exports = function(options) {
       noSources: noSources,
     };
   }
+
+  // A SourceMapDevToolPlugin was manually set on the compiler's plugins
+  if (options.plugins) {
+    var plugins = options.plugins;
+    for (var i = 0; i < plugins.length; i++) {
+      var plugin = plugins[i];
+      if (plugin.sourceMapFilename) {
+        return plugin.options;
+      }
+    }
+  }
 };

tests/fixtures/plugin-source-map-1dep/fib.js

@@ -0,0 +1,3 @@
+module.exports = function(n) {
+  return n + (n > 0 ? n - 1 : 0);
+};

tests/fixtures/plugin-source-map-1dep/index.js

@@ -0,0 +1,3 @@
+var fib = require('./fib');
+
+console.log(fib(3));

tests/fixtures/plugin-source-map-1dep/webpack.config.js

@@ -0,0 +1,32 @@
+var SourceMapDevToolPlugin = require('webpack').SourceMapDevToolPlugin;
+
+var HardSourceWebpackPlugin = require('../../..');
+
+module.exports = {
+  context: __dirname,
+  entry: './index.js',
+  output: {
+    path: __dirname + '/tmp',
+    filename: 'main.js',
+  },
+  recordsPath: __dirname + '/tmp/cache/records.json',
+  plugins: [
+    new HardSourceWebpackPlugin({
+      cacheDirectory: 'cache',
+      environmentHash: {
+        root: __dirname + '/../../..',
+      },
+    }),
+    new SourceMapDevToolPlugin({
+      filename: '[file].map[query]',
+      moduleFilenameTemplate: undefined,
+      fallbackModuleFilenameTemplate: undefined,
+      append: null,
+      module: true,
+      columns: false,
+      lineToLine: false,
+      noSources: false,
+      test: /\.(js|css)(\.out)?($|\?)/i,
+    }),
+  ],
+};

tests/plugins-webpack-1.js

@@ -31,6 +31,7 @@ describe('plugin webpack use', function() {
   itCompilesTwice('plugin-child-compiler-resolutions');
   itCompilesTwice('plugin-logger-child-no-memory');
   itCompilesTwice('plugin-serializer-json-base-1dep');
+  itCompilesTwice('plugin-source-map-1dep');
 
   itCompilesHardModules('plugin-dll', ['./fib.js']);
   itCompilesHardModules('plugin-dll-reference', ['./index.js']);