fix: plugin options syntax

use [] instead of {}
rename `regExp` to `test`

Author: sokra

README.md

@@ -7,9 +7,9 @@ var CompressionPlugin = require("compression-webpack-plugin");
 module.exports = {
 	plugins: [
 		new CompressionPlugin({
-			asset: "{file}.gz",
+			asset: "[path].gz[query]",
 			algorithm: "gzip",
-			regExp: /\.js$|\.html$/,
+			test: /\.js$|\.html$/,
 			threshold: 10240,
 			minRatio: 0.8
 		})
@@ -19,9 +19,9 @@ module.exports = {
 
 Arguments:
 
-* `asset`: The target asset name. `{file}` is replaced with the original asset. Defaults to `"{file}.gz"`.
+* `asset`: The target asset name. `[file]` is replaced with the original asset. `[path]` is replaced with the path of the original asset and `[query]` with the query. Defaults to `"[path].gz[query]"`.
 * `algorithm`: Can be a `function(buf, callback)` or a string. For a string the algorithm is taken from `zlib` (or zopfli for `zopfli`). Defaults to `"gzip"`.
-* `regExp`: All assets matching this RegExp are processed. Defaults to every asset.
+* `test`: All assets matching this RegExp are processed. Defaults to every asset.
 * `threshold`: Only assets bigger than this size are processed. In bytes. Defaults to `0`.
 * `minRatio`: Only assets that compress better that this ratio are processed. Defaults to `0.8`.
 

index.js

@@ -5,11 +5,11 @@
 var async = require("async");
 var url = require('url');
 
-var RawSource = require("webpack/lib/RawSource");
+var RawSource = require("webpack-sources/lib/RawSource");
 
 function CompressionPlugin(options) {
 	options = options || {};
-	this.asset = options.asset || "{file}.gz";
+	this.asset = options.asset || "[path].gz[query]";
 	this.algorithm = options.algorithm || "gzip";
 	if(typeof this.algorithm === "string") {
 		if (this.algorithm === "zopfli") {
@@ -43,7 +43,7 @@ function CompressionPlugin(options) {
 			});
 		}
 	}
-	this.regExp = options.regExp;
+	this.test = options.test || options.regExp;
 	this.threshold = options.threshold || 0;
 	this.minRatio = options.minRatio || 0.8;
 }
@@ -53,7 +53,12 @@ CompressionPlugin.prototype.apply = function(compiler) {
 	compiler.plugin("this-compilation", function(compilation) {
 		compilation.plugin("optimize-assets", function(assets, callback) {
 			async.forEach(Object.keys(assets), function(file, callback) {
-				if(this.regExp && !this.regExp.test(file)) return callback();
+				if(Array.isArray(this.test)) {
+					if(this.test.every(function(t) {
+						return !t.test(file);
+					})) return callback();
+				} else if(this.test && !this.test.test(file))
+					return callback();
 				var asset = assets[file];
 				var content = asset.source();
 				if(!Buffer.isBuffer(content))
@@ -67,9 +72,9 @@ CompressionPlugin.prototype.apply = function(compiler) {
 					var sub = {
 						file: file,
 						path: parse.pathname,
-						query: parse.query
+						query: parse.query || ""
 					};
-					var newFile = this.asset.replace(/\{(file|path|query)\}/g, function(p0,p1) {
+					var newFile = this.asset.replace(/\[(file|path|query)\]/g, function(p0,p1) {
 						return sub[p1];
 					});
 					assets[newFile] = new RawSource(result);

package.json

@@ -3,11 +3,9 @@
   "version": "0.2.0",
   "author": "Tobias Koppers @sokra",
   "description": "Prepare compressed versions of assets to serve them with Content-Encoding",
-  "peerDependencies": {
-    "webpack": ">=0.11 <2"
-  },
   "dependencies": {
-    "async": "0.2.x"
+    "async": "0.2.x",
+    "webpack-sources": "^0.1.0"
   },
   "optionalDependencies": {
     "node-zopfli": "^1.3.4"