Merge pull request #4 from VladimirTechMan/master

eploko · web-flow · commit 7a65f1c447e8 · 2016-10-07T18:38:01.000+03:00
Updating pegjs-loader to work with pegjs 0.10.0
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   },
   "homepage": "http://eploko.github.io/pegjs-loader",
   "peerDependencies": {
-    "pegjs": "^0.9.0",
+    "pegjs": "^0.10.0",
     "webpack": "^1.12.2"
   },
   "dependencies": {
diff --git a/src/index.js b/src/index.js
@@ -31,5 +31,6 @@ export default function loader(source) {
     pegOptions.allowedStartRules = allowedStartRules;
   }
 
-  return `module.exports = ${pegjs.buildParser(source, pegOptions)};`;
+  const methodName = (typeof pegjs.generate === 'function') ? 'generate' : 'buildParser';
+  return `module.exports = ${pegjs[methodName](source, pegOptions)};`;
 }

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,6 @@ export default function loader(source) {`
`31`	`31`	`pegOptions.allowedStartRules = allowedStartRules;`
`32`	`32`	`}`
`33`	`33`
`34`		- return `module.exports = ${pegjs.buildParser(source, pegOptions)};`;
	`34`	`+ const methodName = (typeof pegjs.generate === 'function') ? 'generate' : 'buildParser';`
	`35`	+ return `module.exports = ${pegjs[methodName](source, pegOptions)};`;
`35`	`36`	`}`