Merge pull request webpack#6788 from byzyk/fix/6779

sokra · web-flow · commit 3024078e1e8e · 2018-03-20T13:17:19.000+01:00
fix: Chunks is not iterable when using source maps with ProfilingPlugin
diff --git a/lib/debug/ProfilingPlugin.js b/lib/debug/ProfilingPlugin.js
@@ -305,16 +305,16 @@ const interceptAllParserHooks = (moduleFactory, tracer) => {
 };
 
 const makeInterceptorFor = (instance, tracer) => hookName => ({
-	register: ({ name, type, fn }) => {
+	register: ({ name, type, context, fn }) => {
 		const newFn = makeNewProfiledTapFn(hookName, tracer, {
 			name,
 			type,
 			fn
 		});
 		return {
-			// eslint-disable-line
 			name,
 			type,
+			context,
 			fn: newFn
 		};
 	}
diff --git a/test/configCases/source-map/source-map-with-profiling-plugin/index.js b/test/configCases/source-map/source-map-with-profiling-plugin/index.js
@@ -0,0 +1,8 @@
+it("bundle0 should include sourcemapped test.js", function() {
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename + ".map", "utf-8");
+	var map = JSON.parse(source);
+	map.sources.should.containEql("webpack:///./test.js");
+});
+
+require.include("./test.js");
diff --git a/test/configCases/source-map/source-map-with-profiling-plugin/test.js b/test/configCases/source-map/source-map-with-profiling-plugin/test.js
@@ -0,0 +1,3 @@
+var foo = {};
+
+module.exports = foo;
diff --git a/test/configCases/source-map/source-map-with-profiling-plugin/webpack.config.js b/test/configCases/source-map/source-map-with-profiling-plugin/webpack.config.js
@@ -0,0 +1,22 @@
+var webpack = require("../../../../");
+var path = require("path");
+var os = require("os");
+
+module.exports = {
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	entry: {
+		bundle0: ["./index.js"]
+	},
+	output: {
+		filename: "[name].js"
+	},
+	plugins: [
+		new webpack.debug.ProfilingPlugin({
+			outputPath: path.join(os.tmpdir(), "events.json")
+		})
+	],
+	devtool: "source-map"
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+var foo = {};`
	`2`	`+`
	`3`	`+module.exports = foo;`