Merge branch 'release/0.5.2'

Author: eploko

README.md

@@ -44,16 +44,19 @@ Then you only need to write: `require("./parser.pegjs")`.
 
 You can pass options to PEG.js as [query parameters](http://webpack.github.io/docs/using-loaders.html#query-parameters). The following options are supported:
 
+  * `allowedStartRules` - The rules the built parser will be allowed to start
+    parsing from (default: the first rule in the grammar).
+
   * `cache` — If `true`, makes the parser cache results, avoiding exponential
     parsing time in pathological cases but making the parser slower (default:
     `false`).
 
+  * `dependencies` - Parser dependencies, the value is an object which maps variables used to access the
+    dependencies in the parser to module IDs used to load them (default: `{}`).
+
   * `optimize` - Whether to optimize the built parser either for `speed` or
     `size` (default: `speed`).
 
-  * `allowedStartRules` - The rules the built parser will be allowed to start
-    parsing from (default: the first rule in the grammar).
-
   * `trace` - If `true`, the tracing support in the built parser is enabled
     (default: `false`).
 
@@ -82,6 +85,7 @@ Every release, along with the migration instructions, if any, is documented on t
 * [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.
+* [retorquere](https://github.com/retorquere) for the propagation of the `dependencies` option.
 
 ## License
 

package.json

@@ -1,56 +1,56 @@
 {
-  "name": "pegjs-loader",
-  "version": "0.5.1",
-  "description": "PEG.js loader for webpack",
-  "authors": [
-    "Andrey Subbotin <andrey@subbotin.me> (https://github.com/eploko)",
-    "Victor Homyakov (https://github.com/victor-homyakov)"
-  ],
-  "license": "MIT",
-  "main": "lib/index.js",
-  "jsnext:main": "src/index.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/eploko/pegjs-loader"
-  },
-  "keywords": [
-    "webpack",
-    "pegjs",
-    "peg.js",
-    "peg",
-    "loader"
-  ],
-  "bugs": {
-    "url": "https://github.com/eploko/pegjs-loader/issues"
-  },
-  "homepage": "http://eploko.github.io/pegjs-loader",
-  "peerDependencies": {
-    "pegjs": "^0.10.0",
-    "webpack": "1 || 2 || ^2.1.0-beta || ^2.2.0-rc"
-  },
-  "dependencies": {
-    "loader-utils": "^0.2.5"
-  },
-  "devDependencies": {
-    "babel": "^5.5.8",
-    "babel-core": "^5.6.18",
-    "babel-eslint": "^4.1.0",
-    "babel-loader": "^5.1.4",
-    "eslint": "^1.7.1",
-    "eslint-config-airbnb": "^0.1.0",
-    "eslint-plugin-react": "^3.6.3",
-    "rimraf": "^2.3.4",
-    "webpack": "1.12.2"
-  },
-  "scripts": {
-    "clean": "rimraf lib",
-    "lint": "eslint src",
-    "check": "npm run lint",
-    "build:lib": "babel src --out-dir lib",
-    "build": "npm run build:lib",
-    "preversion": "npm run clean && npm run check",
-    "version": "npm run build",
-    "postversion": "git push && git push --tags && npm run clean",
-    "prepublish": "npm run clean && npm run build"
-  }
-}
+    "name": "pegjs-loader",
+    "version": "0.5.2",
+    "description": "PEG.js loader for webpack",
+    "authors": [
+        "Andrey Subbotin <andrey@subbotin.me> (https://github.com/eploko)",
+        "Victor Homyakov (https://github.com/victor-homyakov)"
+    ],
+    "license": "MIT",
+    "main": "lib/index.js",
+    "jsnext:main": "src/index.js",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/eploko/pegjs-loader"
+    },
+    "keywords": [
+        "webpack",
+        "pegjs",
+        "peg.js",
+        "peg",
+        "loader"
+    ],
+    "bugs": {
+        "url": "https://github.com/eploko/pegjs-loader/issues"
+    },
+    "homepage": "http://eploko.github.io/pegjs-loader",
+    "peerDependencies": {
+        "pegjs": "^0.10.0",
+        "webpack": "> 1"
+    },
+    "dependencies": {
+        "loader-utils": "^0.2.5"
+    },
+    "devDependencies": {
+        "babel": "^5.5.8",
+        "babel-core": "^5.6.18",
+        "babel-eslint": "^4.1.0",
+        "babel-loader": "^5.1.4",
+        "eslint": "^1.7.1",
+        "eslint-config-airbnb": "^0.1.0",
+        "eslint-plugin-react": "^3.6.3",
+        "rimraf": "^2.3.4",
+        "webpack": "1.12.2"
+    },
+    "scripts": {
+        "clean": "rimraf lib",
+        "lint": "eslint src",
+        "check": "npm run lint",
+        "build:lib": "babel src --out-dir lib",
+        "build": "npm run build:lib",
+        "preversion": "npm run clean && npm run check",
+        "version": "npm run build",
+        "postversion": "git push && git push --tags && npm run clean",
+        "prepublish": "npm run clean && npm run build"
+    }
+}

src/index.js

@@ -10,6 +10,7 @@ export default function loader(source) {
   const cacheParserResults = !!query.cache;
   const optimizeParser = query.optimize || 'speed';
   const trace = !!query.trace;
+  const dependencies = JSON.parse(query.dependencies || '{}');
 
   let allowedStartRules;
   if (typeof query.allowedStartRules === 'string') {
@@ -22,15 +23,17 @@ export default function loader(source) {
 
   // Description of PEG.js options: https://github.com/pegjs/pegjs#javascript-api
   const pegOptions = {
-    output: 'source',
     cache: cacheParserResults,
+    dependencies: dependencies,
+    format: 'commonjs',
     optimize: optimizeParser,
+    output: 'source',
     trace: trace,
   };
   if (allowedStartRules.length > 0) {
     pegOptions.allowedStartRules = allowedStartRules;
   }
 
   const methodName = (typeof pegjs.generate === 'function') ? 'generate' : 'buildParser';
-  return `module.exports = ${pegjs[methodName](source, pegOptions)};`;
+  return pegjs[methodName](source, pegOptions);
 }