fix: fix commander usage of args for positional args

spotify · Jan 3, 2020 · 1a1eb5a · 1a1eb5a
1 parent 3bf99c6
commit 1a1eb5a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/...s/__fixtures__/postinstall/0/package.json → ...tinstallTasks/__fixtures__/0/package.json b/...s/__fixtures__/postinstall/0/package.json → ...tinstallTasks/__fixtures__/0/package.json
diff --git a/.../__fixtures__/postinstall/12/package.json → ...installTasks/__fixtures__/12/package.json b/.../__fixtures__/postinstall/12/package.json → ...installTasks/__fixtures__/12/package.json
diff --git a/.../__fixtures__/postinstall/30/package.json → ...installTasks/__fixtures__/30/package.json b/.../__fixtures__/postinstall/30/package.json → ...installTasks/__fixtures__/30/package.json
diff --git a/...web-scripts/src/Tasks/Postinstall.test.ts → .../src/Tasks/PostinstallTasks/index.test.ts b/...web-scripts/src/Tasks/Postinstall.test.ts → .../src/Tasks/PostinstallTasks/index.test.ts
@@ -1,5 +1,6 @@
-import { postinstallTask } from './PostinstallTasks';
-import { THIS_ROOT } from '../Paths';
+import { join } from 'path';
+
+import { postinstallTask } from '.';
 
 // @ts-ignore
 jest.spyOn(process, 'exit').mockImplementation(c => c);
@@ -36,7 +37,7 @@ describe('web-scripts postinstall', () => {
   `(
     'return status code $status when audited dependencies have $violations violations and $threshold threshold',
     async ({ violations, threshold, status }) => {
-      const source = `${THIS_ROOT}/src/Tasks/__fixtures__/postinstall/${violations}`;
+      const source = join(__dirname, '__fixtures__', violations.toString());
 
       await postinstallTask({
         name: 'postinstall',

diff --git a/...web-scripts/src/Tasks/PostinstallTasks.ts → ...ripts/src/Tasks/PostinstallTasks/index.ts b/...web-scripts/src/Tasks/PostinstallTasks.ts → ...ripts/src/Tasks/PostinstallTasks/index.ts
@@ -1,8 +1,8 @@
 import { default as spawn } from 'cross-spawn-promise';
 import { default as Debug } from 'debug';
 
-import { PostinstallTaskDesc } from '../SharedTypes';
-import { CONSUMING_ROOT } from '../Paths';
+import { PostinstallTaskDesc } from '../../SharedTypes';
+import { CONSUMING_ROOT } from '../../Paths';
 
 const dbg = Debug('web-scripts:postinstall'); // eslint-disable-line new-cap
 

diff --git a/packages/web-scripts/src/index.ts b/packages/web-scripts/src/index.ts
@@ -271,11 +271,11 @@ function handleSpawnResult(result: SpawnSyncReturns<Buffer>) {
 }
 
 function getCommand(args: any[]): Command {
-  return args[args.length - 1] as Command;
+  return args[0] as Command;
 }
 
 function getPositionalArgs(args: any[]): string[] {
-  return args.slice(0, args.length - 1) as string[];
+  return args.slice(1) as string[];
 }
 
 function getOpts(cmd: Command): { [key: string]: any } {