From d263bea817f1c343a9ef20cd003f08018172b60d Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Thu, 18 Jun 2020 11:13:31 +0200
Subject: [PATCH] Don't imply --wrap es6 from --es6

---
 cli/pbjs.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cli/pbjs.js b/cli/pbjs.js
index ede8cb00a..76372d863 100644
--- a/cli/pbjs.js
+++ b/cli/pbjs.js
@@ -194,9 +194,8 @@ exports.main = function main(args, callback) {
         return resolved;
     };
 
-    // Use es6 syntax if not explicitly specified on the command line and the es6 wrapper is used
-    if (argv.wrap === "es6" || argv.es6) {
-        argv.wrap = "es6";
+    // `--wrap es6` implies `--es6` but not the other way around. You can still use e.g. `--es6 --wrap commonjs`
+    if (argv.wrap === "es6") {
         argv.es6 = true;
     }