chore: move shared types to root; moar link styles; bye promiseWaterf…

…all (#312) * chore: move shared types to root; moar link styles; bye promiseWaterfall * fix test * add alias for global types * bump Flow to 0.97 * add lint annotation to bin * enable babel module resolver plugin * import inquirer prompt type
react-native-community · Apr 16, 2019 · 708211a · 708211a
1 parent 4036fc5
commit 708211a
Show file tree

Hide file tree

Showing 41 changed files with 304 additions and 240 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,19 +1,31 @@
 module.exports = {
-  extends: '@react-native-community',
+  extends: ['@react-native-community', 'plugin:import/errors'],
   env: {
     node: true,
   },
   rules: {
     'prettier/prettier': [2, 'fb'],
   },
+  // @todo: remove once we cover whole codebase with types
+  plugins: ['eslint-plugin-import'],
   settings: {
     react: {
       version: 'latest',
     },
+    'import/resolver': {
+      alias: {
+        map: [['types', './types/index.js']],
+      },
+    },
   },
   overrides: [
     {
-      files: ['**/__mocks__/**', '**/__fixtures__/**', '**/__e2e__/**', 'jest/**'],
+      files: [
+        '**/__mocks__/**',
+        '**/__fixtures__/**',
+        '**/__e2e__/**',
+        'jest/**',
+      ],
       env: {
         jest: true,
       },

diff --git a/.flowconfig b/.flowconfig
@@ -27,6 +27,7 @@ esproposal.export_star_as=enable
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
+module.name_mapper='types' -> '<PROJECT_ROOT>/types/index.js'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe

diff --git a/babel.config.js b/babel.config.js
@@ -13,5 +13,13 @@ module.exports = {
   plugins: [
     require.resolve('@babel/plugin-transform-strict-mode'),
     [require.resolve('@babel/plugin-transform-modules-commonjs'), {lazy: true}],
+    [
+      require.resolve('babel-plugin-module-resolver', {
+        root: ['.'],
+        alias: {
+          types: './types',
+        },
+      }),
+    ],
   ],
 };
diff --git a/package.json b/package.json
@@ -23,10 +23,13 @@
     "@babel/preset-flow": "^7.0.0",
     "@react-native-community/eslint-config": "^0.0.3",
     "babel-jest": "^24.6.0",
+    "babel-plugin-module-resolver": "^3.2.0",
     "chalk": "^2.4.2",
     "eslint": "^5.10.0",
+    "eslint-import-resolver-alias": "^1.1.2",
+    "eslint-plugin-import": "^2.17.0",
     "execa": "^1.0.0",
-    "flow-bin": "^0.96.0",
+    "flow-bin": "^0.97.0",
     "flow-typed": "^2.5.1",
     "glob": "^7.1.3",
     "jest": "^24.6.0",

diff --git a/packages/cli/src/bin.js b/packages/cli/src/bin.js
@@ -9,6 +9,7 @@
  * @flow
  */
 
+// eslint-disable-next-line import/default
 import cliEntry from '.';
 
 cliEntry.run();
diff --git a/packages/cli/src/cliEntry.js b/packages/cli/src/cliEntry.js
@@ -12,7 +12,7 @@ import childProcess from 'child_process';
 import commander from 'commander';
 import path from 'path';
 
-import type {CommandT, ConfigT} from './tools/config/types.flow';
+import type {CommandT, ConfigT} from 'types';
 
 import commands from './commands';
 import init from './commands/init/initCompat';

diff --git a/packages/cli/src/commands/bundle/buildBundle.js b/packages/cli/src/commands/bundle/buildBundle.js
@@ -13,7 +13,7 @@ import outputBundle from 'metro/src/shared/output/bundle';
 import path from 'path';
 import chalk from 'chalk';
 import type {CommandLineArgs} from './bundleCommandLineArgs';
-import type {ConfigT} from '../../tools/config/types.flow';
+import type {ConfigT} from 'types';
 import saveAssets from './saveAssets';
 import loadMetroConfig from '../../tools/loadMetroConfig';
 import {logger} from '@react-native-community/cli-tools';

diff --git a/packages/cli/src/commands/config/config.js b/packages/cli/src/commands/config/config.js
@@ -1,7 +1,7 @@
 /**
  * @flow
  */
-import {type ConfigT} from '../../tools/config/types.flow';
+import {type ConfigT} from 'types';
 export default {
   name: 'config',
   description: 'Print CLI configuration',

diff --git a/packages/cli/src/commands/index.js b/packages/cli/src/commands/index.js
@@ -1,7 +1,7 @@
 /**
  * @flow
  */
-import {type CommandT} from '../tools/config/types.flow';
+import {type CommandT} from 'types';
 
 import server from './server/server';
 import library from './library/library';

diff --git a/packages/cli/src/commands/info/info.js b/packages/cli/src/commands/info/info.js
@@ -9,7 +9,7 @@
 
 import envinfo from 'envinfo';
 import {logger} from '@react-native-community/cli-tools';
-import type {ConfigT} from '../../tools/config/types.flow';
+import type {ConfigT} from 'types';
 
 const info = async function getInfo(
   argv: Array<string>,

diff --git a/packages/cli/src/commands/init/errors/DirectoryAlreadyExistsError.js b/packages/cli/src/commands/init/errors/DirectoryAlreadyExistsError.js
@@ -1,6 +1,4 @@
 // @flow
-import path from 'path';
-
 export default class DirectoryAlreadyExistsError extends Error {
   constructor(directory: string) {
     super(

diff --git a/packages/cli/src/commands/init/init.js b/packages/cli/src/commands/init/init.js
@@ -2,7 +2,7 @@
 import fs from 'fs-extra';
 import minimist from 'minimist';
 import semver from 'semver';
-import type {ConfigT} from '../../tools/config/types.flow';
+import type {ConfigT} from 'types';
 import {validateProjectName} from './validate';
 import DirectoryAlreadyExistsError from './errors/DirectoryAlreadyExistsError';
 import printRunInstructions from './printRunInstructions';

diff --git a/packages/cli/src/commands/install/install.js b/packages/cli/src/commands/install/install.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {ConfigT} from '../../tools/config/types.flow';
+import type {ConfigT} from 'types';
 import {logger} from '@react-native-community/cli-tools';
 import * as PackageManager from '../../tools/packageManager';
 import link from '../link/link';

diff --git a/packages/cli/src/commands/install/uninstall.js b/packages/cli/src/commands/install/uninstall.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import type {ConfigT} from '../../tools/config/types.flow';
+import type {ConfigT} from 'types';
 import {logger} from '@react-native-community/cli-tools';
 import * as PackageManager from '../../tools/packageManager';
 import link from '../link/unlink';

diff --git a/packages/cli/src/commands/link/__tests__/link-test.js b/packages/cli/src/commands/link/__tests__/link-test.js
@@ -55,8 +55,8 @@ describe('link', () => {
   });
 
   it('should register native module when android/ios projects are present', done => {
-    const prelink = jest.fn().mockImplementation(cb => cb());
-    const postlink = jest.fn().mockImplementation(cb => cb());
+    const prelink = jest.fn();
+    const postlink = jest.fn();
     const registerNativeModule = jest.fn();
 
     const config = {

diff --git a/packages/cli/src/commands/link/__tests__/promiseWaterfall-test.js b/packages/cli/src/commands/link/__tests__/promiseWaterfall-test.js
diff --git a/packages/cli/src/commands/link/commandStub.js b/packages/cli/src/commands/link/commandStub.js
diff --git a/packages/cli/src/commands/link/link.js b/packages/cli/src/commands/link/link.js
@@ -8,15 +8,9 @@
  */
 
 import {pick} from 'lodash';
-
-import {type ConfigT} from '../../tools/config/types.flow';
-
-import promiseWaterfall from './promiseWaterfall';
 import {logger, CLIError} from '@react-native-community/cli-tools';
-import commandStub from './commandStub';
-import promisify from './promisify';
+import {type ConfigT} from 'types';
 import getPlatformName from './getPlatformName';
-
 import linkDependency from './linkDependency';
 import linkAssets from './linkAssets';
 import linkAll from './linkAll';
@@ -31,7 +25,11 @@ type FlagsType = {
  * @param args If optional argument [packageName] is provided,
  *             only that package is processed.
  */
-function link([rawPackageName]: Array<string>, ctx: ConfigT, opts: FlagsType) {
+async function link(
+  [rawPackageName]: Array<string>,
+  ctx: ConfigT,
+  opts: FlagsType,
+) {
   let platforms = ctx.platforms;
   let project = ctx.project;
 
@@ -68,19 +66,21 @@ function link([rawPackageName]: Array<string>, ctx: ConfigT, opts: FlagsType) {
 
   logger.debug(`Package to link: ${rawPackageName}`);
 
-  const tasks = [
-    () => promisify(dependency.hooks.prelink || commandStub),
-    () => linkDependency(platforms, project, dependency),
-    () => promisify(dependency.hooks.postlink || commandStub),
-    () => linkAssets(platforms, project, dependency.assets),
-  ];
-
-  return promiseWaterfall(tasks).catch(err => {
+  try {
+    if (dependency.hooks.prelink) {
+      await dependency.hooks.prelink();
+    }
+    await linkDependency(platforms, project, dependency);
+    if (dependency.hooks.postlink) {
+      await dependency.hooks.postlink();
+    }
+    await linkAssets(platforms, project, dependency.assets);
+  } catch (error) {
     throw new CLIError(
-      `Something went wrong while linking. Reason: ${err.message}`,
-      err,
+      `Something went wrong while linking. Reason: ${error.message}`,
+      error,
     );
-  });
+  }
 }
 
 export const func = link;

diff --git a/packages/cli/src/commands/link/linkAll.js b/packages/cli/src/commands/link/linkAll.js
@@ -2,14 +2,10 @@
  * @flow
  */
 
-import {uniqBy, flatMap} from 'lodash';
+import {uniqBy} from 'lodash';
 import path from 'path';
 
-import type {ConfigT} from '../../tools/config/types.flow';
-
-import promiseWaterfall from './promiseWaterfall';
-import commandStub from './commandStub';
-import promisify from './promisify';
+import type {ConfigT} from 'types';
 
 import linkAssets from './linkAssets';
 import linkDependency from './linkDependency';
@@ -19,7 +15,7 @@ import {CLIError} from '@react-native-community/cli-tools';
 const dedupeAssets = (assets: Array<string>): Array<string> =>
   uniqBy(assets, asset => path.basename(asset));
 
-function linkAll(config: ConfigT) {
+async function linkAll(config: ConfigT) {
   const projectAssets = config.assets;
 
   const assets = dedupeAssets(
@@ -29,22 +25,24 @@ function linkAll(config: ConfigT) {
     ),
   );
 
-  const tasks = flatMap(
-    config.dependencies,
-    dependency => [
-      () => promisify(dependency.hooks.prelink || commandStub),
-      () => linkDependency(config.platforms, config.project, dependency),
-      () => promisify(dependency.hooks.postlink || commandStub),
-    ],
-    () => linkAssets(config.platforms, config.project, assets),
-  );
-
-  return promiseWaterfall(tasks).catch(err => {
+  try {
+    Object.keys(config.dependencies).forEach(async key => {
+      const dependency = config.dependencies[key];
+      if (dependency.hooks.prelink) {
+        await dependency.hooks.prelink();
+      }
+      await linkDependency(config.platforms, config.project, dependency);
+      if (dependency.hooks.postlink) {
+        await dependency.hooks.postlink();
+      }
+    });
+    await linkAssets(config.platforms, config.project, assets);
+  } catch (error) {
     throw new CLIError(
-      `Something went wrong while linking. Reason: ${err.message}`,
-      err,
+      `Something went wrong while linking. Reason: ${error.message}`,
+      error,
     );
-  });
+  }
 }
 
 export default linkAll;
diff --git a/packages/cli/src/commands/link/linkAssets.js b/packages/cli/src/commands/link/linkAssets.js
@@ -1,7 +1,7 @@
 // @flow
 
 import {isEmpty} from 'lodash';
-import type {PlatformsT, ProjectConfigT} from '../../tools/config/types.flow';
+import type {PlatformsT, ProjectConfigT} from 'types';
 
 import {logger} from '@react-native-community/cli-tools';
 

diff --git a/packages/cli/src/commands/link/linkDependency.js b/packages/cli/src/commands/link/linkDependency.js
@@ -1,10 +1,6 @@
 // @flow
 
-import type {
-  DependencyConfigT,
-  ProjectConfigT,
-  PlatformsT,
-} from '../../tools/config/types.flow';
+import type {DependencyConfigT, ProjectConfigT, PlatformsT} from 'types';
 import {logger} from '@react-native-community/cli-tools';
 import pollParams from './pollParams';
 import getPlatformName from './getPlatformName';
@@ -34,8 +30,10 @@ const linkDependency = async (
     }
 
     const isInstalled = linkConfig.isInstalled(
+      // $FlowFixMe
       projectConfig,
       name,
+      // $FlowFixMe
       dependencyConfig,
     );
 
@@ -47,7 +45,7 @@ const linkDependency = async (
     }
 
     logger.info(`Linking "${name}" ${getPlatformName(platform)} dependency`);
-
+    // $FlowFixMe
     linkConfig.register(name, dependencyConfig, params, projectConfig);
 
     logger.info(