Skip to content

Commit

Permalink
Merge branch 'release/0.5.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
eploko committed Mar 3, 2017
2 parents 2dfafdd + 14263b1 commit 5ecc03a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Every release, along with the migration instructions, if any, is documented on t
* [Victor Homyakov](https://github.com/victor-homyakov) for the propagation of the `cache` option.
* [VladimirTechMan](https://github.com/VladimirTechMan) for the propagation of the `optimize` option and updating things to be compatible with PEG.js 0.10.0.
* [ragtime](https://github.com/ragtime) for the propagation of the `allowedStartRules` and `trace` options.
* [Jan Varwig](https://github.com/janv) for the Webpack 2 compatibility fix.

## License

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pegjs-loader",
"version": "0.5.0",
"version": "0.5.1",
"description": "PEG.js loader for webpack",
"authors": [
"Andrey Subbotin <andrey@subbotin.me> (https://github.com/eploko)",
Expand All @@ -26,7 +26,7 @@
"homepage": "http://eploko.github.io/pegjs-loader",
"peerDependencies": {
"pegjs": "^0.10.0",
"webpack": "^1.12.2"
"webpack": "1 || 2 || ^2.1.0-beta || ^2.2.0-rc"
},
"dependencies": {
"loader-utils": "^0.2.5"
Expand Down

0 comments on commit 5ecc03a

Please sign in to comment.