finished intperpolate & tests

Travmatth · Travmatth · commit 64569322a7a2 · 2017-04-11T18:51:14.000-04:00
diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
@@ -5,7 +5,6 @@
 
 "use strict";
 
-const path = require("path");
 const ConcatSource = require("webpack-sources").ConcatSource;
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
@@ -25,8 +24,7 @@ function wrapComment(str) {
 const REGEXP_HASH = /\[hash:?(\d+)?\]/gi,
 			REGEXP_CHUNKHASH = /\[chunkhash:?(\d+)?\]/gi,
 			REGEXP_NAME = /\[name\]/gi,
-			REGEXP_EXT = /\[ext\]/gi,
-			REGEXP_PATH = /\[path\]/gi;
+			REGEXP_EXT = /\[ext\]/gi;
 
 // withHashLength, getReplacer from lib/TemplatedPathPlugin.js
 const withHashLength = (replacer, handlerFn) => {
@@ -62,7 +60,7 @@ const interpolate = (banner, file, hash, chunkHash) => {
 		.replace(REGEXP_HASH, withHashLength(getReplacer(hash)))
 		.replace(REGEXP_CHUNKHASH, withHashLength(getReplacer(chunkHash)))
 		.replace(REGEXP_NAME, name)
-		.replace(REGEXP_EXT, ext)
+		.replace(REGEXP_EXT, ext);
 }
 
 class BannerPlugin {
@@ -88,10 +86,9 @@ class BannerPlugin {
 					chunk.files
 						.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options))
 						.forEach((file) => {
-							const chunkHash = chunk.renderedHash || chunk.hash
-							const comment = interpolate(banner, file, compilation.hash, chunkHash)
-							console.log('comment: ', comment);
-							return compilation.assets[file] = new ConcatSource(comment, "\n", compilation.assets[file])
+							const chunkHash = chunk.renderedHash || chunk.hash;
+							const comment = interpolate(banner, file, compilation.hash, chunkHash);
+							return compilation.assets[file] = new ConcatSource(comment, "\n", compilation.assets[file]);
 						});
 				});
 				callback();
diff --git a/test/configCases/plugins/banner-plugin-hashing/.index.js.swp b/test/configCases/plugins/banner-plugin-hashing/.index.js.swp
diff --git a/test/configCases/plugins/banner-plugin-hashing/index.js b/test/configCases/plugins/banner-plugin-hashing/index.js
@@ -1,12 +1,12 @@
 const parseBanner = (banner) => {
 	return banner
-		.slice(4,-3) // remove comment syntax
-		.split(", ") // into key:val pairs
-		.map(n => n.split(":")) //[key, val]
+		.slice(4,-3)
+		.split(", ")
+		.map(n => n.split(":"))
 		.reduce((acc, val) => {
 			acc[val[0]] = val[1];
 			return acc;
-		}, {}); // { key: val }
+		}, {});
 };
 
 var source = require("fs")
@@ -16,12 +16,20 @@ var source = require("fs")
 
 const banner = parseBanner(source)
 
-it("should interpolate file hash in bundle0 chunk", function() {
-	banner["hash"].should.not.containEql("[hash]");
+it("should interpolate file hash in bundle0 chunk", () => {
+	banner["hash"].should.not.equal("[hash]");
 });
 
-it("should interpolate chunkHash in bundle0 chunk", function() {
-	banner["chunkhash"].should.not.containEql("[chunkhash]");
+it("should interpolate chunkHash in bundle0 chunk", () => {
+	banner["chunkhash"].should.not.equal("[chunkhash]");
+});
+
+it("should interpolate name in bundle0 chunk", () => {
+	banner["name"].should.not.equal("[name]");
+});
+
+it("should interpolate extension in bundle0 chunk", () => {
+	banner["ext"].should.not.equal("[ext]");
 });
 
 require.include("./test.js");
diff --git a/test/configCases/plugins/banner-plugin-hashing/webpack.config.js b/test/configCases/plugins/banner-plugin-hashing/webpack.config.js
@@ -13,7 +13,7 @@ module.exports = {
 	},
 	plugins: [
 		new webpack.BannerPlugin({
-			banner: "hash:[hash], chunkhash:[chunkhash], name:[name], ext:[ext]"
+			banner: "hash:[hash:10], chunkhash:[chunkhash:10], name:[name], ext:[ext]"
 		})
 	]
 };

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ module.exports = {`
`13`	`13`	`},`
`14`	`14`	`plugins: [`
`15`	`15`	`new webpack.BannerPlugin({`
`16`		`- banner: "hash:[hash], chunkhash:[chunkhash], name:[name], ext:[ext]"`
	`16`	`+ banner: "hash:[hash:10], chunkhash:[chunkhash:10], name:[name], ext:[ext]"`
`17`	`17`	`})`
`18`	`18`	`]`
`19`	`19`	`};`