Merge branch 'main' into renovate/tester-packages

sounisi5011 · Dec 9, 2021 · a874646 · a874646
2 parents fa2ef04 + 77af985
commit a874646
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/packages/cli/run-if-supported/src/main.ts b/packages/cli/run-if-supported/src/main.ts
@@ -84,7 +84,7 @@ function createHelpText(opts: {
         helpTextLines.push([
             'Examples:',
             `  $ ${opts.binName} jest`,
-            `  $ ${opts.binName} jest --verbose`,
+            `  $ ${opts.binName} --verbose jest`,
         ]);
     }
     return helpTextLines.map(lines => lines.join('\n')).join('\n\n');

diff --git a/packages/cli/run-if-supported/tests/cli.ts b/packages/cli/run-if-supported/tests/cli.ts
@@ -39,7 +39,7 @@ describe('cli', () => {
                         '',
                         'Examples:',
                         `  $ ${binName} jest`,
-                        `  $ ${binName} jest --verbose`,
+                        `  $ ${binName} --verbose jest`,
                     ].join('\n'),
                     stderr: '',
                 }));

diff --git a/packages/encrypted-archive/src/utils/stream.ts b/packages/encrypted-archive/src/utils/stream.ts
@@ -40,8 +40,11 @@ export function writeFromIterableToStream<TStream extends stream.Writable>(
              * @see https://github.com/nodejs/node/blob/v14.17.0/lib/internal/streams/destroy.js#L178-L183
              * @see https://github.com/nodejs/node/blob/v15.14.0/lib/internal/streams/destroy.js#L362-L367
              * @see https://github.com/nodejs/node/blob/v16.1.0/lib/internal/streams/destroy.js#L367-L372
+             *
+             * Note: We should probably verify that error is an instance of the Error object,
+             *       but the Node.js source code doesn't do that check.
              */
-            stream.destroy(error);
+            stream.destroy(error as Error);
         }
     })();
     return stream;

diff --git a/packages/encrypted-archive/tsconfig.json b/packages/encrypted-archive/tsconfig.json
@@ -8,10 +8,6 @@
     "types": [],
 
     /* Emit */
-    "noEmit": true,
-
-    /* Type Checking */
-    /** @todo Comment out when this package is fixed */
-    "useUnknownInCatchVariables": false
+    "noEmit": true
   }
 }