Fixes peggyjs#72. Use correct version information and correct URL in …

…generated code

lib/compiler/passes/generate-js.js

@@ -3,6 +3,7 @@
 const asts = require("../asts");
 const js = require("../js");
 const op = require("../opcodes");
+const VERSION = require('../../version')
 
 // Generates parser JavaScript code.
 function generateJS(ast, options) {
@@ -1203,9 +1204,9 @@ function generateJS(ast, options) {
   function generateWrapper(toplevelCode) {
     function generateGeneratedByComment() {
       return [
-        "// Generated by Peggy 0.11.0.",
+        `// Generated by Peggy ${VERSION}.`,
         "//",
-        "// https://github.com/peggyjs/peggy"
+        "// https://peggyjs.org/"
       ].join("\n");
     }
 

lib/peg.js

@@ -3,10 +3,11 @@
 const GrammarError = require("./grammar-error");
 const compiler = require("./compiler");
 const parser = require("./parser");
+const VERSION = require("./version");
 
 const peg = {
   // Peggy version (filled in by /tools/release).
-  VERSION: "1.0.0",
+  VERSION,
   GrammarError: GrammarError,
   parser: parser,
   compiler: compiler,

lib/version.js

@@ -0,0 +1,3 @@
+"use strict";
+
+module.exports = "1.0.0";

package.json

@@ -30,8 +30,8 @@
     "prebrowser:build": "npm run parser",
     "browser:build": "browserify lib/peg.js -s peggy -o browser/peggy.min.js",
     "postbrowser:build": "tools/header browser/* && cp browser/peggy.min.js docs/vendor/peggy/peggy.min.js",
-    "benchmark:build": "browserify benchmark/browser.stub.js -o docs/js/benchmark-bundle.min.js",
-    "test:build": "browserify test/browser.stub.js -o docs/js/test-bundle.min.js",
+    "benchmark:build": "browserify benchmark/browser.stub.js -o docs/js/benchmark-bundle.min.js && tools/header docs/js/benchmark-bundle.min.js",
+    "test:build": "browserify test/browser.stub.js -o docs/js/test-bundle.min.js && tools/header docs/js/test-bundle.min.js",
     "parser": "bin/peggy -o lib/parser.js --format commonjs src/parser.pegjs"
   },
   "devDependencies": {
@@ -68,4 +68,4 @@
       ]
     ]
   }
-}
+}

tools/header

@@ -5,12 +5,12 @@
 // Pass list of files on command line.
 
 const fs = require("fs");
-const pkg = require("../package.json");
+const version = require("../lib/version.js");
 
 const header = `\
-// peggy ${pkg.version}
+// peggy ${version}
 //
-// https://github.com/peggyjs/peggy
+// https://peggyjs.org/
 //
 // Copyright (c) ${new Date().getFullYear()}- the Peggy authors
 // Licensed under the MIT License.

tools/release

@@ -58,10 +58,12 @@ async function main() {
   await fs.writeFile(pkg, JSON.stringify(pjson, null, 2));
 
   // update VERSION in lib/peg.js
-  const pn = path.join(root, "lib", "peg.js");
-  let pegTxt = await fs.readFile(pn, "utf8");
-  pegTxt = pegTxt.replace(/^(\s+)VERSION: "[^"]*",$/m, `$1VERSION: "${VERSION}",`);
-  await fs.writeFile(pn, pegTxt);
+  const vjs = path.join(root, 'lib', 'version.js');
+  await fs.writeFile(vjs, `\
+"use strict";
+
+module.exports = "${VERSION}";
+`)
 
   // build
   await e("npm run build");
@@ -70,7 +72,7 @@ async function main() {
   await e("npm run test:node");
 
   // add files
-  await e(`git add ${pkg} ${pn} docs/js/benchmark-bundle.min.js docs/js/test-bundle.min.js docs/vendor/peggy/peggy.min.js`);
+  await e(`git add ${pkg} ${vjs} docs/js/benchmark-bundle.min.js docs/js/test-bundle.min.js docs/vendor/peggy/peggy.min.js`);
 
   // check in
   await e(`git commit -m "Update for v${VERSION}"`);