Skip to content

Commit 1ed40e4

Browse files
TravmatthTravmatth
committed
minimum working test
1 parent 392b0c3 commit 1ed40e4

9 files changed

Lines changed: 61 additions & 13 deletions

File tree

‎lib/BannerPlugin.js‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,45 @@ function wrapComment(str) {
2929
*[N] the N-th match obtained from matching the current file name against options.regExp
3030
*/
3131

32+
const REGEXP_HASH = /\[hash:?(\d+)?\]/gi,
33+
REGEXP_CHUNKHASH = /\[chunkhash(?::(\d+))?\]/gi,
34+
REGEXP_NAME = /\[name\]/gi,
35+
REGEXP_ID = /\[id\]/gi,
36+
REGEXP_FILE = /\[file\]/gi,
37+
REGEXP_QUERY = /\[query\]/gi;
38+
39+
// withHashLength, getReplacer from lib/TemplatedPathPlugin.js
40+
const withHashLength = (replacer, handlerFn) => {
41+
return function(_, hashLength) {
42+
const length = hashLength && parseInt(hashLength, 10);
43+
if(length && handlerFn) {
44+
return handlerFn(length);
45+
}
46+
47+
const hash = replacer.apply(this, arguments);
48+
return length ? hash.slice(0, length) : hash;
49+
};
50+
};
51+
52+
const getReplacer = (value, allowEmpty) => {
53+
return function(match) {
54+
// last argument in replacer is the entire input string
55+
const input = arguments[arguments.length - 1];
56+
if(value === null || value === undefined) {
57+
if(!allowEmpty) throw new Error(`Path variable ${match} not implemented in this context: ${input}`);
58+
return "";
59+
} else {
60+
return `${value}`;
61+
}
62+
};
63+
};
64+
65+
66+
const interpolate = (banner, file, hash, chunkHash) => {
67+
return banner
68+
.replace(REGEXP_HASH, withHashLength(getReplacer(hash)))
69+
}
70+
3271
class BannerPlugin {
3372
constructor(options) {
3473
if(arguments.length > 1)
@@ -42,21 +81,19 @@ class BannerPlugin {
4281
}
4382

4483
apply(compiler) {
45-
const options = this.options;
46-
const banner = this.banner;
84+
const options = this.options,
85+
banner = this.banner;
4786

4887
compiler.plugin("compilation", (compilation) => {
49-
console.log('compilation: ', JSON.stringify(compilation));
5088
compilation.plugin("optimize-chunk-assets", (chunks, callback) => {
5189
chunks.forEach((chunk) => {
5290
if(options.entryOnly && !chunk.isInitial()) return;
53-
5491
chunk.files
5592
.filter(ModuleFilenameHelpers.matchObject.bind(undefined, options))
5693
.forEach((file) => {
57-
return compilation.assets[file] = new ConcatSource(
58-
banner, "\n", compilation.assets[file]
59-
)
94+
const chunkHash = chunk.renderedHash || chunk.hash
95+
const comment = interpolate(banner, file, compilation.hash, chunkHash)
96+
return compilation.assets[file] = new ConcatSource(comment, "\n", compilation.assets[file])
6097
});
6198
});
6299
callback();

‎test/ConfigTestCases.test.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,10 @@ describe("ConfigTestCases", () => {
125125
}
126126
}
127127
// give a free pass to compilation that generated an error
128-
if(!jsonStats.errors.length && filesCount !== optionsArr.length) return done(new Error("Should have found at least one bundle file per webpack config"));
128+
if(!jsonStats.errors.length && filesCount !== optionsArr.length) {
129+
const msg = "Should have found at least one bundle file per webpack config" + filesCount + " " + " " + optionsArr.length
130+
return done(new Error());
131+
}
129132
if(exportedTests < filesCount) return done(new Error("No tests exported by test case"));
130133
process.nextTick(done);
131134
});

‎test/configCases/plugins/banner-plugin-hashing/.index.js.swp‎

12 KB
Binary file not shown.

test/configCases/plugins/banner-plugin-placeholder/index.js renamed to test/configCases/plugins/banner-plugin-hashing/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
it("should interpolate file hash in bundle0 chunk", function() {
1+
it("should interpolate file hash in bundle0 chunk", function(done) {
22
var fs = require("fs");
33
var source = fs
44
.readFileSync(__filename, "utf-8")
55
.split("\n")
66
.slice(0,1)[0];
77

8+
//debugger
89
source.should.not.containEql("hash");
10+
done()
911
});
1012

1113
require.include("./test.js");

‎test/configCases/plugins/banner-plugin-hashing/test.config.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
var fs = require("fs");
2+
3+
module.exports = {
4+
findBundle: function(i, options) {
5+
return "./banner.js";
6+
}
7+
};

test/configCases/plugins/banner-plugin-placeholder/test.js renamed to test/configCases/plugins/banner-plugin-hashing/test.js

File renamed without changes.

test/configCases/plugins/banner-plugin-placeholder/vendors.js renamed to test/configCases/plugins/banner-plugin-hashing/vendors.js

File renamed without changes.

test/configCases/plugins/banner-plugin-placeholder/webpack.config.js renamed to test/configCases/plugins/banner-plugin-hashing/webpack.config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ module.exports = {
55
__filename: false
66
},
77
entry: {
8-
bundle0: ["./index.js"],
8+
banner: ["./index.js"],
99
vendors: ["./vendors.js"]
1010
},
1111
output: {
1212
filename: "[name].js"
1313
},
1414
plugins: [
1515
new webpack.BannerPlugin({
16-
banner: "[hash]",
17-
exclude: ["vendors.js"]
16+
banner: "[hash]"
1817
})
1918
]
2019
};

‎test/configCases/plugins/banner-plugin/webpack.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = {
1313
},
1414
plugins: [
1515
new webpack.BannerPlugin({
16-
banner: "[hash]",
16+
banner: "This is a value",
1717
exclude: ["vendors.js"]
1818
})
1919
]

0 commit comments

Comments
 (0)