Merge pull request webpack#4693 from Travmatth/fix-4252-BannerPlugin-placeholder

sokra · web-flow · commit 6a26e9ba7f7f · 2017-04-23T12:57:02.000+02:00
Fix 4252 banner plugin placeholder
diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
@@ -8,10 +8,10 @@
 const ConcatSource = require("webpack-sources").ConcatSource;
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
-function wrapComment(str) {
+const wrapComment = (str) => {
 	if(!str.includes("\n")) return `/*! ${str} */`;
 	return `/*!\n * ${str.split("\n").join("\n * ")}\n */`;
-}
+};
 
 class BannerPlugin {
 	constructor(options) {
@@ -33,14 +33,36 @@ class BannerPlugin {
 			compilation.plugin("optimize-chunk-assets", (chunks, callback) => {
 				chunks.forEach((chunk) => {
 					if(options.entryOnly && !chunk.isInitial()) return;
-
 					chunk.files
 						.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options))
-						.forEach((file) =>
-							compilation.assets[file] = new ConcatSource(
-								banner, "\n", compilation.assets[file]
-							)
-						);
+						.forEach((file) => {
+							let basename;
+							let query = "";
+							let filename = file;
+							const hash = compilation.hash;
+							const querySplit = filename.indexOf("?");
+
+							if(querySplit >= 0) {
+								query = filename.substr(querySplit);
+								filename = filename.substr(0, querySplit);
+							}
+
+							if(filename.indexOf("/") < 0) {
+								basename = filename;
+							} else {
+								basename = filename.substr(filename.lastIndexOf("/") + 1);
+							}
+
+							const comment = compilation.getPath(banner, {
+								hash,
+								chunk,
+								filename,
+								basename,
+								query,
+							});
+
+							return compilation.assets[file] = new ConcatSource(comment, "\n", compilation.assets[file]);
+						});
 				});
 				callback();
 			});
diff --git a/test/configCases/plugins/banner-plugin-hashing/index.js b/test/configCases/plugins/banner-plugin-hashing/index.js
@@ -0,0 +1,52 @@
+const parseBanner = (banner) => {
+	return banner
+		.slice(4,-3)
+		.split(", ")
+		.map(n => n.split(":"))
+		.reduce((acc, val) => {
+			acc[val[0]] = val[1];
+			return acc;
+		}, {});
+};
+
+var source = require("fs")
+	.readFileSync(__filename, "utf-8")
+	.split("\n")
+	.slice(0,1)[0];
+
+const banner = parseBanner(source)
+const REGEXP_HASH = /^[A-Za-z0-9]{20}$/
+
+it("should interpolate file hash in chunk banner", () => {
+	REGEXP_HASH.test(banner["hash"]).should.be.true;
+});
+
+it("should interpolate chunkHash in chunk banner", () => {
+	REGEXP_HASH.test(banner["chunkhash"]).should.be.true;
+});
+
+it("should interpolate file into chunk banner", () => {
+	banner["file"].should.equal("dist/banner.js");
+});
+
+it("should interpolate name in chunk banner", () => {
+	banner["name"].should.equal("dist/banner");
+});
+
+it("should interpolate basename in chunk banner", () => {
+	banner["filebase"].should.equal("banner.js");
+});
+
+it("should interpolate query in chunk banner", () => {
+	banner["query"].should.equal("?value");
+});
+
+it("should parse entry into file in chunk banner", () => {
+	banner["file"].should.not.equal(banner["filebase"]);
+});
+
+it("should parse entry into name in chunk banner", () => {
+	banner["filebase"].should.not.equal(banner["name"]);
+});
+
+require.include("./test.js");
diff --git a/test/configCases/plugins/banner-plugin-hashing/test.config.js b/test/configCases/plugins/banner-plugin-hashing/test.config.js
@@ -0,0 +1,7 @@
+var fs = require("fs");
+
+module.exports = {
+	findBundle: function(i, options) {
+		return "./dist/banner.js";
+	}
+};
diff --git a/test/configCases/plugins/banner-plugin-hashing/test.js b/test/configCases/plugins/banner-plugin-hashing/test.js
@@ -0,0 +1,3 @@
+var foo = {};
+
+module.exports = foo;
diff --git a/test/configCases/plugins/banner-plugin-hashing/vendors.js b/test/configCases/plugins/banner-plugin-hashing/vendors.js
@@ -0,0 +1,3 @@
+var bar = {};
+
+module.exports = bar;
diff --git a/test/configCases/plugins/banner-plugin-hashing/webpack.config.js b/test/configCases/plugins/banner-plugin-hashing/webpack.config.js
@@ -0,0 +1,22 @@
+"use strict";
+
+const webpack = require("../../../../");
+
+module.exports = {
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	entry: {
+		"dist/banner": ["./index.js"],
+		vendors: ["./vendors.js"]
+	},
+	output: {
+		filename: "[name].js?value"
+	},
+	plugins: [
+		new webpack.BannerPlugin({
+			banner: "hash:[hash], chunkhash:[chunkhash], name:[name], filebase:[filebase], query:[query], file:[file]"
+		})
+	]
+};

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