feat(cli): let --package-lock-only be configurable

antongolub · Aug 22, 2020 · c457a18 · c457a18
1 parent 1d926bd
commit c457a18
Show file tree

Hide file tree

Showing 5 changed files with 639 additions and 606 deletions.
diff --git a/README.md b/README.md
@@ -65,6 +65,7 @@ success Already up-to-date.
 | Flag | Description | Default |
 |---|---|---|
 |`--verbose` | Switch log level to verbose/debug | false |
+|`--package-lock-only` | Run audit fix without modifying `node_modules` | false |
 |`--silent` | Disable log output | false |
 |`--loglevel` | Set custom [log level](https://docs.npmjs.com/misc/config#shorthands-and-other-cli-niceties)
 |`--only` | Set package [updating scope](https://docs.npmjs.com/cli/audit): `dev`/`prod`

diff --git a/src/main/ts/audit.ts b/src/main/ts/audit.ts
@@ -14,7 +14,7 @@ export const audit = (auditArgs: string[], cwd: string, silent: boolean) => {
     prefix: cwd,
   }
 
-  !silent && console.log(chalk.bold('invoke'), 'npm', ...auditArgs, '--prefix', cwd)
+  !silent && console.log(chalk.bold('invoke'), 'npm', 'audit', ...auditArgs, '--prefix', cwd)
 
   npm.load(config, (err) => {
     if (err) {

diff --git a/src/main/ts/index.ts b/src/main/ts/index.ts
@@ -60,8 +60,8 @@ const yarnLockToPkgLock: TCallback = ({temp}) => {
  */
 const npmAuditFix: TCallback = async({temp, flags}) => {
   const auditArgs = [
-    'audit', 'fix', '--package-lock-only',
-    ...formatFlags(flags, 'verbose', 'loglevel', 'only', 'force', 'audit-level', 'silent'),
+    'fix',
+    ...formatFlags(flags, 'package-lock-only', 'verbose', 'loglevel', 'only', 'force', 'audit-level', 'silent'),
   ]
 
   await audit(auditArgs, temp, flags.silent)

diff --git a/src/test/ts/index.ts b/src/test/ts/index.ts
@@ -67,7 +67,7 @@ describe('yarn-audit-fix', () => {
       expect(npm.load).toHaveBeenCalledWith({prefix: temp}, expect.any(Function))
 
       // @ts-ignore
-      expect(npm.commands.audit).toHaveBeenCalledWith(['audit', 'fix', '--package-lock-only', '--verbose'], expect.any(Function))
+      expect(npm.commands.audit).toHaveBeenCalledWith(['fix', '--verbose', '--package-lock-only'], expect.any(Function))
 
       // Updating yarn.lock from package-lock.json...
       expect(fs.copyFileSync).toHaveBeenCalledWith(join(temp, 'yarn.lock'), 'yarn.lock')
@@ -77,7 +77,7 @@ describe('yarn-audit-fix', () => {
 
     describe('runner', () => {
       it('invokes cmd queue with proper args', async() => {
-        await run({verbose: true, foo: 'bar'})
+        await run({verbose: true, foo: 'bar', ['package-lock-only']: true})
         checkFlow()
       })
 
@@ -123,7 +123,7 @@ describe('yarn-audit-fix', () => {
     describe('cli', () => {
       it('invokes cmd queue with proper args', () => {
         jest.isolateModules(() => {
-          process.argv.push('--verbose')
+          process.argv.push('--verbose --package-lock-only')
           require('../../main/ts/cli')
         })
       })