From d30364b3e2a99b0939dfecc24aa83059732bd134 Mon Sep 17 00:00:00 2001
From: Patrick Mowrer <pmowrer@gmail.com>
Date: Fri, 15 May 2020 15:43:34 -0400
Subject: [PATCH] fix(web-scripts): unknown command options were parsed twice

Upgrading `commander.js` to 5.x resulted in unknown options being parsed twice, breaking tasks in some scenarios.

For more details: https://github.com/tj/commander.js/pull/1138

Fixes #341
---
 packages/web-scripts/src/index.ts | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/packages/web-scripts/src/index.ts b/packages/web-scripts/src/index.ts
index 9d97d87d..14a8f538 100644
--- a/packages/web-scripts/src/index.ts
+++ b/packages/web-scripts/src/index.ts
@@ -56,14 +56,13 @@ program
   .option('--no-types', 'do not build types target')
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const { esm, types, cjs } = getOpts(cmd);
     const t: BuildTaskDesc = {
       name: 'build',
       esm,
       types,
       cjs,
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     handlePromiseResult(buildTask(t));
@@ -76,12 +75,11 @@ program
   .option('--config [path]', 'path to jest config')
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const { config } = getOpts(cmd);
     const t: TestTaskDesc = {
       name: 'test',
       config,
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     const result = testTask(t);
@@ -99,14 +97,13 @@ program
   .option('--no-stylecheck', "do not run Prettier's style check")
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const { stylecheck, typecheck, config } = getOpts(cmd);
     const t: LintTaskDesc = {
       name: 'lint',
       config,
       stylecheck,
       typecheck,
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     handlePromiseResult(lintTask(t));
@@ -123,13 +120,12 @@ program
   )
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const { config, path } = getOpts(cmd);
     const t: FormatTaskDesc = {
       name: 'format',
       config,
       path,
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     handleSpawnResult(formatTask(t));
@@ -146,7 +142,6 @@ program
   .option('--no-typecheck', 'Do not type check using TypeScript')
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const {
       tests,
       typecheck,
@@ -161,7 +156,7 @@ program
       jestConfig,
       eslintConfig,
       prettierConfig,
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     handlePromiseResult(precommitTask(t));
@@ -195,12 +190,11 @@ program
   )
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const { threshold } = getOpts(cmd);
     const t: AuditTaskDesc = {
       name: 'audit',
       threshold,
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     handlePromiseResult(auditTask(t));
@@ -217,12 +211,11 @@ program
   )
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const { path } = getOpts(cmd);
     const t: CommitTaskDesc = {
       name: 'commit',
       path,
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     try {
@@ -243,12 +236,11 @@ program
   )
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const { config } = getOpts(cmd);
     const t: CommitMsgTaskDesc = {
       name: 'commitmsg',
       config,
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     handleSpawnResult(commitMsgTask(t));
@@ -260,10 +252,9 @@ program
   .description('Run semantic-release')
   .action((...args) => {
     const cmd = getCommand(args);
-    const rest = getPositionalArgs(args);
     const t: ReleaseTaskDesc = {
       name: 'release',
-      restOptions: [...parseRestOptions(cmd), ...rest],
+      restOptions: parseRestOptions(cmd),
     };
 
     handleSpawnResult(releaseTask(t));
@@ -297,10 +288,6 @@ function getCommand(args: any[]): Command {
   return args[0] as Command;
 }
 
-function getPositionalArgs(args: any[]): string[] {
-  return args.slice(1) as string[];
-}
-
 function getOpts(cmd: Command): { [key: string]: any } {
   return cmd.opts();
 }