chore: simplify cli structure and common tools (#201)

Summary:
---------

Cleaning up the `packages/cli` structure. This might be pretty disruptive to already open PRs :D.

- Renamed `core` -> `tools`
- Moved `util` to `tools`
- Flatten-out `server/util`
- Create `commands` dir and put all commands there

```
packages/cli/src
├── bin.js
├── cliEntry.js
├── commands
│   ├── bundle
│   ├── dependencies
│   ├── eject
│   ├── index.js
│   ├── info
│   ├── init
│   ├── install
│   ├── library
│   ├── link
│   ├── logAndroid
│   ├── logIOS
│   ├── runAndroid
│   ├── runIOS
│   ├── server
│   └── upgrade
├── index.js
└── tools
    ├── ...
``` 

Fixes #49

Test Plan:
----------

CI green

packages/cli/src/cliEntry.js

@@ -12,12 +12,12 @@ import childProcess from 'child_process';
 import commander from 'commander';
 import minimist from 'minimist';
 import path from 'path';
-import type { CommandT, ContextT } from './core/types.flow';
-import getCommands from './core/getCommands';
-import getLegacyConfig from './core/getLegacyConfig';
-import init from './init/init';
-import assertRequiredOptions from './util/assertRequiredOptions';
-import logger from './util/logger';
+import type { CommandT, ContextT } from './tools/types.flow';
+import getLegacyConfig from './tools/getLegacyConfig';
+import { getCommands } from './commands';
+import init from './commands/init/init';
+import assertRequiredOptions from './tools/assertRequiredOptions';
+import logger from './tools/logger';
 import pkg from '../package.json';
 
 commander

packages/cli/src/bundle/buildBundle.js → packages/cli/src/commands/bundle/buildBundle.js

@@ -12,10 +12,10 @@ import Server from 'metro/src/Server';
 import outputBundle from 'metro/src/shared/output/bundle';
 import path from 'path';
 import type { CommandLineArgs } from './bundleCommandLineArgs';
-import type { ContextT } from '../core/types.flow';
+import type { ContextT } from '../../tools/types.flow';
 import saveAssets from './saveAssets';
-import loadMetroConfig from '../util/loadMetroConfig';
-import logger from '../util/logger';
+import loadMetroConfig from '../../tools/loadMetroConfig';
+import logger from '../../tools/logger';
 
 async function buildBundle(
   args: CommandLineArgs,

packages/cli/src/bundle/saveAssets.js → packages/cli/src/commands/bundle/saveAssets.js

@@ -14,7 +14,7 @@ import fs from 'fs';
 import filterPlatformAssetScales from './filterPlatformAssetScales';
 import getAssetDestPathAndroid from './getAssetDestPathAndroid';
 import getAssetDestPathIOS from './getAssetDestPathIOS';
-import logger from '../util/logger';
+import logger from '../../tools/logger';
 
 function saveAssets(assets, platform, assetsDest) {
   if (!assetsDest) {

packages/cli/src/eject/eject.js → packages/cli/src/commands/eject/eject.js

@@ -9,8 +9,8 @@
 
 import path from 'path';
 import fs from 'fs';
-import copyProjectTemplateAndReplace from '../generator/copyProjectTemplateAndReplace';
-import logger from '../util/logger';
+import copyProjectTemplateAndReplace from '../../tools/generator/copyProjectTemplateAndReplace';
+import logger from '../../tools/logger';
 
 /**
  * The eject command re-creates the `android` and `ios` native folders. Because native code can be

packages/cli/src/core/getCommands.js → packages/cli/src/commands/index.js

@@ -4,27 +4,31 @@
 
 import path from 'path';
 
-import findPlugins from './findPlugins';
-import logger from '../util/logger';
+import findPlugins from '../tools/findPlugins';
+import logger from '../tools/logger';
 
-import type { CommandT, ProjectCommandT, LocalCommandT } from './types.flow';
+import type {
+  CommandT,
+  ProjectCommandT,
+  LocalCommandT,
+} from '../tools/types.flow';
 
-import server from '../server/server';
-import runIOS from '../runIOS/runIOS';
-import runAndroid from '../runAndroid/runAndroid';
-import library from '../library/library';
-import bundle from '../bundle/bundle';
-import ramBundle from '../bundle/ramBundle';
-import eject from '../eject/eject';
-import link from '../link/link';
-import unlink from '../link/unlink';
-import install from '../install/install';
-import uninstall from '../install/uninstall';
-import upgrade from '../upgrade/upgrade';
-import logAndroid from '../logAndroid/logAndroid';
-import logIOS from '../logIOS/logIOS';
-import dependencies from '../dependencies/dependencies';
-import info from '../info/info';
+import server from './server/server';
+import runIOS from './runIOS/runIOS';
+import runAndroid from './runAndroid/runAndroid';
+import library from './library/library';
+import bundle from './bundle/bundle';
+import ramBundle from './bundle/ramBundle';
+import eject from './eject/eject';
+import link from './link/link';
+import unlink from './link/unlink';
+import install from './install/install';
+import uninstall from './install/uninstall';
+import upgrade from './upgrade/upgrade';
+import logAndroid from './logAndroid/logAndroid';
+import logIOS from './logIOS/logIOS';
+import dependencies from './dependencies/dependencies';
+import info from './info/info';
 
 /**
  * List of built-in commands
@@ -97,18 +101,20 @@ const loadProjectCommands = (root: string): Array<ProjectCommandT> => {
 /**
  * Loads all the commands inside a given `root` folder
  */
-export default (root: string): Array<CommandT> => [
-  ...loadLocalCommands,
-  {
-    name: 'init',
-    func: () => {
-      logger.warn(
-        [
-          'Looks like a React Native project already exists in the current',
-          'folder. Run this command from a different folder or remove node_modules/react-native',
-        ].join('\n')
-      );
+export function getCommands(root: string): Array<CommandT> {
+  return [
+    ...loadLocalCommands,
+    {
+      name: 'init',
+      func: () => {
+        logger.warn(
+          [
+            'Looks like a React Native project already exists in the current',
+            'folder. Run this command from a different folder or remove node_modules/react-native',
+          ].join('\n')
+        );
+      },
     },
-  },
-  ...loadProjectCommands(root),
-];
+    ...loadProjectCommands(root),
+  ];
+}

packages/cli/src/info/info.js → packages/cli/src/commands/info/info.js

@@ -8,7 +8,7 @@
  */
 
 import envinfo from 'envinfo';
-import logger from '../util/logger';
+import logger from '../../tools/logger';
 
 const info = function getInfo(argv, ctx, options) {
   try {

packages/cli/src/init/init.js → packages/cli/src/commands/init/init.js

@@ -11,10 +11,10 @@ import fs from 'fs';
 import minimist from 'minimist';
 import path from 'path';
 import process from 'process';
-import printRunInstructions from '../generator/printRunInstructions';
-import { createProjectFromTemplate } from '../generator/templates';
-import PackageManager from '../util/PackageManager';
-import logger from '../util/logger';
+import printRunInstructions from '../../tools/generator/printRunInstructions';
+import { createProjectFromTemplate } from '../../tools/generator/templates';
+import PackageManager from '../../tools/PackageManager';
+import logger from '../../tools/logger';
 
 /**
  * Creates the template for a React Native project given the provided

packages/cli/src/install/install.js → packages/cli/src/commands/install/install.js

@@ -7,9 +7,9 @@
  * @flow
  */
 
-import type { ContextT } from '../core/types.flow';
-import logger from '../util/logger';
-import PackageManager from '../util/PackageManager';
+import type { ContextT } from '../../tools/types.flow';
+import logger from '../../tools/logger';
+import PackageManager from '../../tools/PackageManager';
 import link from '../link/link';
 
 async function install(args: Array<string>, ctx: ContextT) {

packages/cli/src/install/uninstall.js → packages/cli/src/commands/install/uninstall.js

@@ -7,9 +7,9 @@
  * @flow
  */
 
-import type { ContextT } from '../core/types.flow';
-import logger from '../util/logger';
-import PackageManager from '../util/PackageManager';
+import type { ContextT } from '../../tools/types.flow';
+import logger from '../../tools/logger';
+import PackageManager from '../../tools/PackageManager';
 import link from '../link/unlink';
 
 async function uninstall(args: Array<string>, ctx: ContextT) {

packages/cli/src/library/library.js → packages/cli/src/commands/library/library.js

@@ -9,10 +9,10 @@
 
 import fs from 'fs';
 import path from 'path';
-import copyAndReplace from '../util/copyAndReplace';
-import isValidPackageName from '../util/isValidPackageName';
-import walk from '../util/walk';
-import logger from '../util/logger';
+import copyAndReplace from '../../tools/copyAndReplace';
+import isValidPackageName from '../../tools/isValidPackageName';
+import walk from '../../tools/walk';
+import logger from '../../tools/logger';
 
 /**
  * Creates a new native library with the given name

packages/cli/src/link/__tests__/getDependencyConfig-test.js → packages/cli/src/commands/link/__tests__/getDependencyConfig-test.js

@@ -17,7 +17,7 @@ const platforms = {
   },
 };
 
-jest.setMock('../../core/getPackageConfiguration', folder => {
+jest.setMock('../../../tools/getPackageConfiguration', folder => {
   if (folder === '/root/node_modules/abcd') {
     throw new Error('Cannot require');
   }

packages/cli/src/link/__tests__/link-test.js → packages/cli/src/commands/link/__tests__/link-test.js

@@ -9,7 +9,7 @@
  */
 
 jest.mock('chalk', () => ({ grey: str => str }));
-jest.mock('../../util/logger');
+jest.mock('../../../tools/logger');
 
 const context = {
   root: process.cwd(),
@@ -145,7 +145,7 @@ describe('link', () => {
     );
     jest.doMock('../ios/registerNativeModule.js', () => jest.fn());
 
-    jest.doMock('../../core/getAssets', () => projectAssets);
+    jest.doMock('../../../tools/getAssets', () => projectAssets);
 
     const copyAssets = jest.fn();
 
@@ -157,7 +157,7 @@ describe('link', () => {
     link(['react-native-blur'], context, {}).then(() => {
       expect(copyAssets.mock.calls).toHaveLength(2);
       expect(copyAssets.mock.calls[0][0]).toEqual(dependencyAssets);
-      jest.unmock('../../core/getAssets');
+      jest.unmock('../../../tools/getAssets');
       done();
     });
   });
@@ -224,7 +224,7 @@ describe('link', () => {
       commands: {},
     }));
 
-    jest.doMock('../../core/getPlatforms', () => {
+    jest.doMock('../../../tools/getPlatforms', () => {
       const fn = () => ({
         ios: { linkConfig: require('../ios').default },
         android: { linkConfig: require('../android').default },
@@ -256,7 +256,7 @@ describe('link', () => {
 
   it('should link only for specific platforms if --platforms is used', async () => {
     jest.doMock('../getProjectDependencies', () => () => ['react-native-maps']);
-    jest.doMock('../../core/getPackageConfiguration', () => () => ({
+    jest.doMock('../../../tools/getPackageConfiguration', () => () => ({
       assets: [],
     }));
 
@@ -273,7 +273,7 @@ describe('link', () => {
       register: registerIOSNativeModule,
     });
 
-    jest.doMock('../../core/getPlatforms', () => {
+    jest.doMock('../../../tools/getPlatforms', () => {
       const fn = () => ({
         android: { linkConfig: genericAndroidLinkConfig },
         ios: { linkConfig: genericIOSLinkConfig },

packages/cli/src/link/getDependencyConfig.js → packages/cli/src/commands/link/getDependencyConfig.js

@@ -7,12 +7,12 @@ import type {
   PlatformsT,
   ContextT,
   DependenciesConfig,
-} from '../core/types.flow';
+} from '../../tools/types.flow';
 
-import getPackageConfiguration from '../core/getPackageConfiguration';
-import getParams from '../core/getParams';
-import getHooks from '../core/getHooks';
-import getAssets from '../core/getAssets';
+import getPackageConfiguration from '../../tools/getPackageConfiguration';
+import getParams from '../../tools/getParams';
+import getHooks from '../../tools/getHooks';
+import getAssets from '../../tools/getAssets';
 
 export default function getDependencyConfig(
   ctx: ContextT,

packages/cli/src/link/getProjectConfig.js → packages/cli/src/commands/link/getProjectConfig.js

@@ -2,9 +2,13 @@
  * @flow
  */
 
-import type { PlatformsT, ContextT, ProjectConfigT } from '../core/types.flow';
+import type {
+  PlatformsT,
+  ContextT,
+  ProjectConfigT,
+} from '../../tools/types.flow';
 
-import getPackageConfiguration from '../core/getPackageConfiguration';
+import getPackageConfiguration from '../../tools/getPackageConfiguration';
 
 export default function getProjectConfig(
   ctx: ContextT,

packages/cli/src/link/ios/createGroupWithMessage.js → packages/cli/src/commands/link/ios/createGroupWithMessage.js

@@ -7,7 +7,7 @@
  * @format
  */
 
-import log from '../../util/logger';
+import log from '../../../tools/logger';
 import createGroup from './createGroup';
 import getGroup from './getGroup';
 

packages/cli/src/link/ios/unlinkAssets.js → packages/cli/src/commands/link/ios/unlinkAssets.js

@@ -10,7 +10,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import xcode from 'xcode';
 import { difference } from 'lodash';
-import log from '../../util/logger';
+import log from '../../../tools/logger';
 
 import groupFilesByType from '../groupFilesByType';
 import getPlist from './getPlist';

packages/cli/src/link/link.js → packages/cli/src/commands/link/link.js

@@ -8,19 +8,19 @@
  */
 
 import { pick } from 'lodash';
-import type { ContextT } from '../core/types.flow';
+import type { ContextT } from '../../tools/types.flow';
 
 import promiseWaterfall from './promiseWaterfall';
-import logger from '../util/logger';
+import logger from '../../tools/logger';
 import getDependencyConfig from './getDependencyConfig';
 import commandStub from './commandStub';
 import promisify from './promisify';
 import getProjectConfig from './getProjectConfig';
 import linkDependency from './linkDependency';
 import linkAssets from './linkAssets';
 import linkAll from './linkAll';
-import findReactNativeScripts from '../util/findReactNativeScripts';
-import getPlatforms from '../core/getPlatforms';
+import findReactNativeScripts from '../../tools/findReactNativeScripts';
+import getPlatforms from '../../tools/getPlatforms';
 
 type FlagsType = {
   platforms?: Array<string>,

packages/cli/src/link/linkAll.js → packages/cli/src/commands/link/linkAll.js

@@ -2,9 +2,13 @@
 
 import { uniqBy, flatten } from 'lodash';
 import path from 'path';
-import type { ContextT, PlatformsT, ProjectConfigT } from '../core/types.flow';
-import logger from '../util/logger';
-import getAssets from '../core/getAssets';
+import type {
+  ContextT,
+  PlatformsT,
+  ProjectConfigT,
+} from '../../tools/types.flow';
+import logger from '../../tools/logger';
+import getAssets from '../../tools/getAssets';
 import getProjectDependencies from './getProjectDependencies';
 import getDependencyConfig from './getDependencyConfig';
 import promiseWaterfall from './promiseWaterfall';

packages/cli/src/link/linkAssets.js → packages/cli/src/commands/link/linkAssets.js

@@ -1,9 +1,9 @@
 // @flow
 
 import { isEmpty } from 'lodash';
-import type { PlatformsT, ProjectConfigT } from '../core/types.flow';
+import type { PlatformsT, ProjectConfigT } from '../../tools/types.flow';
 
-import logger from '../util/logger';
+import logger from '../../tools/logger';
 
 const linkAssets = (
   platforms: PlatformsT,

packages/cli/src/link/linkDependency.js → packages/cli/src/commands/link/linkDependency.js

@@ -4,10 +4,10 @@ import type {
   PlatformsT,
   ProjectConfigT,
   DependenciesConfig,
-} from '../core/types.flow';
-import logger from '../util/logger';
+} from '../../tools/types.flow';
+import logger from '../../tools/logger';
 import pollParams from './pollParams';
-import { getPlatformName } from '../core/getPlatforms';
+import { getPlatformName } from '../../tools/getPlatforms';
 
 const linkDependency = async (
   platforms: PlatformsT,