fixups

packages/cli/src/commands/index.ts

@@ -2,20 +2,15 @@ import {Command} from '@react-native-community/cli-types';
 
 // @ts-ignore - JS file
 import server from './server/server';
-// @ts-ignore - JS file
 import bundle from './bundle/bundle';
-// @ts-ignore - JS file
 import ramBundle from './bundle/ramBundle';
-// @ts-ignore - JS file
-import link from './link/link'; // eslint-disable-line import/namespace, import/default
-// @ts-ignore - JS file
-import unlink from './link/unlink'; // eslint-disable-line import/namespace, import/default
+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 info from './info/info';
 import config from './config/config';
-// @ts-ignore - JS file
 import init from './init';
 // @ts-ignore - JS file
 import doctor from './doctor';

packages/cli/src/commands/install/install.ts

@@ -7,8 +7,7 @@
  */
 import {logger} from '@react-native-community/cli-tools';
 import * as PackageManager from '../../tools/packageManager';
-// @ts-ignore FIXME after converting link/link
-import link from '../link/link'; // eslint-disable-line import/namespace, import/default
+import link from '../link/link';
 // @ts-ignore FIXME after converting tools/config
 import loadConfig from '../../tools/config'; // eslint-disable-line import/namespace, import/default
 

packages/cli/src/commands/install/uninstall.ts

@@ -8,8 +8,7 @@
 import {Config} from '@react-native-community/cli-types';
 import {logger} from '@react-native-community/cli-tools';
 import * as PackageManager from '../../tools/packageManager';
-// @ts-ignore FIXME after converting link/unlink
-import unlink from '../link/unlink'; // eslint-disable-line import/namespace, import/default
+import unlink from '../link/unlink';
 
 async function uninstall(args: Array<string>, ctx: Config): Promise<void> {
   const name = args[0];

packages/cli/src/commands/link/__tests__/link-test.ts

@@ -1,5 +1,5 @@
 import {func as link} from '../link';
-import loadConfig from '../../../tools/config';
+import loadConfig from '../../../tools/config'; // eslint-disable-line import/namespace, import/default
 import makeHook from '../makeHook';
 jest.mock('chalk', () => ({grey: str => str, bold: str => str}));
 jest.mock('../../../tools/config');

packages/cli/src/commands/link/__tests__/makeHook-test.ts

@@ -7,14 +7,12 @@ afterAll(() => {
 describe('makeHook', () => {
   it('invokes the command', async () => {
     const hook = makeHook('echo');
-    // $FlowFixMe - execa weird Promise-like return value
     const result = await hook();
     expect(result.cmd).toBe('echo');
   });
 
   it('invokes the command with multiple arguments', async () => {
     const hook = makeHook('node -p "1;"');
-    // $FlowFixMe - execa weird Promise-like return value
     const result = await hook();
     expect(result.cmd).toBe('node -p "1;"');
   });

packages/cli/src/commands/link/link.ts

@@ -37,6 +37,7 @@ const link = async (
   let project = ctx.project;
 
   if (opts.platforms) {
+    // @ts-ignore
     platforms = pick(platforms, opts.platforms);
     logger.debug('Skipping selected platforms');
   }

packages/cli/src/commands/link/linkAll.ts

@@ -60,7 +60,7 @@ const linkAll = async (
       ),
     );
     try {
-      await linkAssets(config.platforms, config.project, assets);
+      linkAssets(config.platforms, config.project, assets);
     } catch (error) {
       throw new CLIError('Linking assets failed.', error);
     }

packages/cli/src/commands/link/linkAssets.ts

@@ -2,11 +2,11 @@ import {isEmpty} from 'lodash';
 import {Config} from '@react-native-community/cli-types';
 import {logger} from '@react-native-community/cli-tools';
 
-const linkAssets = (
+export default function linkAssets(
   platforms: Config['platforms'],
   project: Config['project'],
   assets: Array<string>,
-): void => {
+): void {
   if (isEmpty(assets)) {
     return;
   }
@@ -22,11 +22,9 @@ const linkAssets = (
     }
 
     logger.info(`Linking assets to ${platform} project`);
-    // $FlowFixMe: We check for existence of project[platform]
+
     linkConfig.copyAssets(assets, project[platform]);
   });
 
   logger.success('Assets have been successfully linked to your project');
-};
-
-export default linkAssets;
+}

packages/cli/src/commands/link/linkDependency.ts

@@ -8,11 +8,11 @@ import {logger} from '@react-native-community/cli-tools';
 import pollParams from './pollParams';
 import {getPlatformName} from './getPlatformName';
 
-const linkDependency = async (
+export default async function linkDependency(
   platforms: Config['platforms'],
   project: Config['project'],
   dependency: Config['dependencies']['key'],
-): Promise<void | null> => {
+): Promise<void | null> {
   const params = await pollParams(dependency.params);
 
   Object.keys(platforms || {}).forEach(platform => {
@@ -34,10 +34,8 @@ const linkDependency = async (
     }
 
     const isInstalled = linkConfig.isInstalled(
-      // $FlowFixMe
       projectConfig,
       name,
-      // $FlowFixMe
       dependencyConfig,
     );
 
@@ -53,7 +51,7 @@ const linkDependency = async (
     logger.info(
       `Linking "${chalk.bold(name)}" ${getPlatformName(platform)} dependency`,
     );
-    // $FlowFixMe
+
     linkConfig.register(name, dependencyConfig, params, projectConfig);
 
     logger.info(
@@ -62,6 +60,4 @@ const linkDependency = async (
       )}" has been successfully linked`,
     );
   });
-};
-
-export default linkDependency;
+}

packages/cli/src/commands/link/unlink.ts

@@ -45,10 +45,8 @@ const unlinkDependency = (
     }
 
     const isInstalled = linkConfig.isInstalled(
-      // $FlowFixMe
       projectConfig,
       packageName,
-      // $FlowFixMe
       dependencyConfig,
     );
 
@@ -65,9 +63,7 @@ const unlinkDependency = (
 
     linkConfig.unregister(
       packageName,
-      // $FlowFixMe
       dependencyConfig,
-      // $FlowFixMe
       projectConfig,
       otherDependencies,
     );
@@ -95,6 +91,7 @@ const unlink = async (
   let platforms = ctx.platforms;
 
   if (opts.platforms) {
+    // @ts-ignore
     platforms = pick(platforms, opts.platforms);
     logger.debug('Skipping selected platforms');
   }
@@ -159,7 +156,7 @@ const unlink = async (
     }
 
     logger.info(`Unlinking assets from ${platform} project`);
-    // $FlowFixMe
+
     linkConfig.unlinkAssets(assets, projectConfig);
   });