Merge branch 'release/0.3.0'

eploko · eploko · commit 356a1693dad3 · 2016-01-22T16:36:55.000+03:00
diff --git a/README.md b/README.md
@@ -47,15 +47,18 @@ You can pass options to PEG.js as [query parameters](http://webpack.github.io/do
   * `cache` — if `true`, makes the parser cache results, avoiding exponential
     parsing time in pathological cases but making the parser slower (default:
     `false`)
-    
+
+  * `optimize` - whether to optimize the built parser either for `speed` or
+    `size` (default: `speed`)
+
 ``` js
 module.exports = {
   ...
   module: {
     loaders: [
       {
         test: /\.pegjs$/,
-        loader: 'pegjs-loader?cache=true'
+        loader: 'pegjs-loader?cache=true&optimize=size'
       }
     ]
   }
@@ -73,4 +76,4 @@ Every release, along with the migration instructions, if any, is documented on t
 
 ## License
 
-MIT (http://www.opensource.org/licenses/mit-license.php)
+MIT (http://www.opensource.org/licenses/mit-license.php)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pegjs-loader",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "PEG.js loader for webpack",
   "authors": [
     "Andrey Subbotin <andrey@subbotin.me> (https://github.com/eploko)",

Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,18 @@ You can pass options to PEG.js as [query parameters](http://webpack.github.io/do`
`47`	`47`	* `cache` — if `true`, makes the parser cache results, avoiding exponential
`48`	`48`	`parsing time in pathological cases but making the parser slower (default:`
`49`	`49`	`false`)
`50`		`-`
	`50`	`+`
	`51`	+ * `optimize` - whether to optimize the built parser either for `speed` or
	`52`	+ `size` (default: `speed`)
	`53`	`+`
`51`	`54`	``` js
`52`	`55`	`module.exports = {`
`53`	`56`	`...`
`54`	`57`	`module: {`
`55`	`58`	`loaders: [`
`56`	`59`	`{`
`57`	`60`	`test: /\.pegjs$/,`
`58`		`- loader: 'pegjs-loader?cache=true'`
	`61`	`+ loader: 'pegjs-loader?cache=true&optimize=size'`
`59`	`62`	`}`
`60`	`63`	`]`
`61`	`64`	`}`
`@@ -73,4 +76,4 @@ Every release, along with the migration instructions, if any, is documented on t`
`73`	`76`
`74`	`77`	`## License`
`75`	`78`
`76`		`-MIT (http://www.opensource.org/licenses/mit-license.php)`
	`79`	`+MIT (http://www.opensource.org/licenses/mit-license.php)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pegjs-loader",`
`3`		`- "version": "0.2.2",`
	`3`	`+ "version": "0.3.0",`
`4`	`4`	`"description": "PEG.js loader for webpack",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Andrey Subbotin <[email protected]> (https://github.com/eploko)",`