Merge pull request #248 from hildjj/update-deps

Update deps

.github/workflows/node.js.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x, 16.x, 17.x]
+        node-version: [12.x, 14.x, 15.x, 16.x, 18.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     runs-on: ${{ matrix.os }}

CHANGELOG.md

@@ -3,7 +3,7 @@ Change Log
 
 This file documents all notable changes to Peggy.
 
-1.3.0
+2.0.0
 -----
 
 Released: TBD
@@ -18,6 +18,12 @@ Released: TBD
   results checking after each compilation stage.
   [@Mingun](https://github.com/peggyjs/peggy/pull/160)
 
+- Remove support for Node.js version 10.  When updating dependencies, too many
+  of the tools we use no longer work on the Node 10, which went out of
+  security maintenance more than a year ago.  Added support for Node.js
+  version 18.
+  [@hildjj](https://github.com/peggyjs/peggy/pull/248)
+
 ### Minor Changes
 
 - New CLI [@hildjj](https://github.com/peggyjs/peggy/pull/167)

README.md

@@ -958,7 +958,7 @@ changes in the grammar, for example, replacing proxy rules.
 Both the parser generator and generated parsers should run well in the following
 environments:
 
-- Node.js 10+
+- Node.js 12+
 - Internet Explorer 9+
 - Edge
 - Firefox

bin/peggy-cli.mjs

@@ -324,7 +324,9 @@ export class PeggyCLI extends Command {
 
   /**
    * Print error message to std.err, and either call process.exit or throw an
-   * exception if exitOverride() has been called.
+   * exception if exitOverride() has been called.  If opts.error is specified,
+   * it will be used to generate the error message, rather than using the
+   * message provided.
    *
    * @param {string} message The message to print.
    * @param {object} [opts] Options
@@ -353,9 +355,7 @@ export class PeggyCLI extends Command {
       }
     }
 
-    // Internal API, subject to change.  See:
-    // https://github.com/tj/commander.js/issues/1632
-    this._displayError(opts.exitCode, opts.code, `Error ${message}`);
+    super.error(`Error ${message}`, opts);
   }
 
   print(stream, ...args) {
@@ -468,8 +468,10 @@ export class PeggyCLI extends Command {
       if (inline) {
         // Note: hidden + inline makes no sense.
         const buf = Buffer.from(JSON.stringify(json));
+        // Use \x23 instead of # so that Jest won't treat this as a real
+        // source map URL for *this* file.
         resolve(sourceMap.code + `\
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,${buf.toString("base64")}
+//\x23 sourceMappingURL=data:application/json;charset=utf-8;base64,${buf.toString("base64")}
 `);
       } else {
         fs.writeFile(