[WIP] Change require to imports (alt) (#150)

* refactor(imports): replaces most uses of require by import * fix: fixes export and revert wrong change * fix: fix import order * fix: revert export change * fix: revert global-cli/index * fix: typo
react-native-community · Feb 5, 2019 · ef220e2 · ef220e2
1 parent b7d2c8f
commit ef220e2
Show file tree

Hide file tree

Showing 129 changed files with 455 additions and 460 deletions.
diff --git a/packages/cli/src/__mocks__/fs.js b/packages/cli/src/__mocks__/fs.js
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const path = require('path');
-const MemoryFS = require('metro-memory-fs');
+import path from 'path';
+import MemoryFS from 'metro-memory-fs';
 
 let fs;
 

diff --git a/packages/cli/src/bin.js b/packages/cli/src/bin.js
@@ -9,9 +9,9 @@
  * @format
  */
 
-const chalk = require('chalk');
-const isInstalledGlobally = require('./util/isInstalledGlobally');
-const logger = require('./util/logger');
+import chalk from 'chalk';
+import isInstalledGlobally from './util/isInstalledGlobally';
+import logger from './util/logger';
 
 if (isInstalledGlobally()) {
   logger.error(

diff --git a/packages/cli/src/bundle/assetPathUtils.js b/packages/cli/src/bundle/assetPathUtils.js
@@ -81,7 +81,7 @@ function getBasePath(asset: PackagerAsset) {
   return basePath;
 }
 
-module.exports = {
+export default {
   getAndroidAssetSuffix,
   getAndroidResourceFolderName,
   getAndroidResourceIdentifier,

diff --git a/packages/cli/src/bundle/buildBundle.js b/packages/cli/src/bundle/buildBundle.js
@@ -7,16 +7,15 @@
  * @flow
  */
 
-import type { ContextT } from '../core/types.flow';
-import type { CommandLineArgs } from './bundleCommandLineArgs';
-
-const Server = require('metro/src/Server');
+import Server from 'metro/src/Server';
 
-const outputBundle = require('metro/src/shared/output/bundle');
-const path = require('path');
-const saveAssets = require('./saveAssets');
-const loadMetroConfig = require('../util/loadMetroConfig');
-const logger = require('../util/logger');
+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 saveAssets from './saveAssets';
+import loadMetroConfig from '../util/loadMetroConfig';
+import logger from '../util/logger';
 
 async function buildBundle(
   args: CommandLineArgs,

diff --git a/packages/cli/src/bundle/bundle.js b/packages/cli/src/bundle/bundle.js
@@ -7,8 +7,8 @@
  * @format
  */
 
-const buildBundle = require('./buildBundle');
-const bundleCommandLineArgs = require('./bundleCommandLineArgs');
+import buildBundle from './buildBundle';
+import bundleCommandLineArgs from './bundleCommandLineArgs';
 
 /**
  * Builds the bundle starting to look for dependencies at the given entry path.
@@ -25,3 +25,7 @@ module.exports = {
   // Used by `ramBundle.js`
   withOutput: bundleWithOutput,
 };
+
+const withOutput = bundleWithOutput;
+
+export { withOutput };
diff --git a/packages/cli/src/bundle/bundleCommandLineArgs.js b/packages/cli/src/bundle/bundleCommandLineArgs.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-const path = require('path');
+import path from 'path';
 
 export type CommandLineArgs = {
   assetsDest?: string,

diff --git a/packages/cli/src/bundle/getAssetDestPathAndroid.js b/packages/cli/src/bundle/getAssetDestPathAndroid.js
@@ -8,10 +8,10 @@
  * @flow strict
  */
 
+import path from 'path';
 import type { PackagerAsset } from './assetPathUtils';
 
-const path = require('path');
-const assetPathUtils = require('./assetPathUtils');
+import assetPathUtils from './assetPathUtils';
 
 function getAssetDestPathAndroid(asset: PackagerAsset, scale: number): string {
   const androidFolder = assetPathUtils.getAndroidResourceFolderName(

diff --git a/packages/cli/src/bundle/getAssetDestPathIOS.js b/packages/cli/src/bundle/getAssetDestPathIOS.js
@@ -8,10 +8,9 @@
  * @flow strict
  */
 
+import path from 'path';
 import type { PackagerAsset } from './assetPathUtils';
 
-const path = require('path');
-
 function getAssetDestPathIOS(asset: PackagerAsset, scale: number): string {
   const suffix = scale === 1 ? '' : `@${scale}x`;
   const fileName = `${asset.name + suffix}.${asset.type}`;

diff --git a/packages/cli/src/bundle/ramBundle.js b/packages/cli/src/bundle/ramBundle.js
@@ -6,10 +6,10 @@
  *
  * @format
  */
-const outputUnbundle = require('metro/src/shared/output/RamBundle');
+import outputUnbundle from 'metro/src/shared/output/RamBundle';
 
-const bundleWithOutput = require('./bundle').withOutput;
-const bundleCommandLineArgs = require('./bundleCommandLineArgs');
+import { withOutput as bundleWithOutput } from './bundle';
+import bundleCommandLineArgs from './bundleCommandLineArgs';
 
 /**
  * Builds the bundle starting to look for dependencies at the given entry path.

diff --git a/packages/cli/src/bundle/saveAssets.js b/packages/cli/src/bundle/saveAssets.js
@@ -7,14 +7,14 @@
  * @format
  */
 
-const mkdirp = require('mkdirp');
-const path = require('path');
-const fs = require('fs');
+import mkdirp from 'mkdirp';
+import path from 'path';
+import fs from 'fs';
 
-const filterPlatformAssetScales = require('./filterPlatformAssetScales');
-const getAssetDestPathAndroid = require('./getAssetDestPathAndroid');
-const getAssetDestPathIOS = require('./getAssetDestPathIOS');
-const logger = require('../util/logger');
+import filterPlatformAssetScales from './filterPlatformAssetScales';
+import getAssetDestPathAndroid from './getAssetDestPathAndroid';
+import getAssetDestPathIOS from './getAssetDestPathIOS';
+import logger from '../util/logger';
 
 function saveAssets(assets, platform, assetsDest) {
   if (!assetsDest) {

diff --git a/packages/cli/src/cliEntry.js b/packages/cli/src/cliEntry.js
@@ -8,19 +8,18 @@
  * @flow
  */
 
+import chalk from 'chalk';
+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';
-
-const chalk = require('chalk');
-const childProcess = require('child_process');
-const commander = require('commander');
-const minimist = require('minimist');
-const path = require('path');
-const getCommands = require('./core/getCommands');
-const getLegacyConfig = require('./core/getLegacyConfig');
-const init = require('./init/init');
-const assertRequiredOptions = require('./util/assertRequiredOptions');
-const logger = require('./util/logger');
-const pkg = require('../package.json');
+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 pkg from '../package.json';
 
 commander.version(pkg.version);
 

diff --git a/packages/cli/src/core/__fixtures__/dependencies.js b/packages/cli/src/core/__fixtures__/dependencies.js
@@ -7,9 +7,10 @@
  * @format
  */
 
+import path from 'path';
+import android from './android';
+
 const fs = jest.requireActual('fs');
-const path = require('path');
-const android = require('./android');
 
 const pjson = fs.readFileSync(path.join(__dirname, 'files', 'package.json'));
 

diff --git a/packages/cli/src/core/__fixtures__/ios.js b/packages/cli/src/core/__fixtures__/ios.js
@@ -7,8 +7,9 @@
  * @format
  */
 
+import path from 'path';
+
 const fs = jest.requireActual('fs');
-const path = require('path');
 
 exports.valid = {
   'demoProject.xcodeproj': {

diff --git a/packages/cli/src/core/__fixtures__/projects.js b/packages/cli/src/core/__fixtures__/projects.js
@@ -7,8 +7,8 @@
  * @format
  */
 
-const android = require('./android');
-const ios = require('./ios');
+import android from './android';
+import ios from './ios';
 
 const flat = {
   android: android.valid,

diff --git a/packages/cli/src/core/android/findAndroidAppFolder.js b/packages/cli/src/core/android/findAndroidAppFolder.js
@@ -7,8 +7,8 @@
  * @format
  */
 
-const fs = require('fs');
-const path = require('path');
+import fs from 'fs';
+import path from 'path';
 
 /**
  * @param  {String} folder Folder to seek in

diff --git a/packages/cli/src/core/android/findManifest.js b/packages/cli/src/core/android/findManifest.js
@@ -7,8 +7,8 @@
  * @format
  */
 
-const glob = require('glob');
-const path = require('path');
+import glob from 'glob';
+import path from 'path';
 
 /**
  * Find an android application path in the folder

diff --git a/packages/cli/src/core/android/findPackageClassName.js b/packages/cli/src/core/android/findPackageClassName.js
@@ -7,9 +7,9 @@
  * @format
  */
 
-const fs = require('fs');
-const glob = require('glob');
-const path = require('path');
+import fs from 'fs';
+import glob from 'glob';
+import path from 'path';
 
 /**
  * Gets package's class name (class that implements ReactPackage)

diff --git a/packages/cli/src/core/android/index.js b/packages/cli/src/core/android/index.js
@@ -7,11 +7,11 @@
  * @format
  */
 
-const path = require('path');
-const findAndroidAppFolder = require('./findAndroidAppFolder');
-const findManifest = require('./findManifest');
-const findPackageClassName = require('./findPackageClassName');
-const readManifest = require('./readManifest');
+import path from 'path';
+import findAndroidAppFolder from './findAndroidAppFolder';
+import findManifest from './findManifest';
+import findPackageClassName from './findPackageClassName';
+import readManifest from './readManifest';
 
 const getPackageName = manifest => manifest.attr.package;
 

diff --git a/packages/cli/src/core/android/readManifest.js b/packages/cli/src/core/android/readManifest.js
@@ -7,8 +7,8 @@
  * @format
  */
 
-const fs = require('fs');
-const xml = require('xmldoc');
+import fs from 'fs';
+import xml from 'xmldoc';
 
 /**
  * @param  {String} manifestPath

diff --git a/packages/cli/src/core/findPlugins.js b/packages/cli/src/core/findPlugins.js
@@ -7,8 +7,8 @@
  * @flow
  */
 
-const path = require('path');
-const { union, uniq, flatten } = require('lodash');
+import path from 'path';
+import { union, uniq, flatten } from 'lodash';
 
 const RNPM_PLUGIN_PATTERNS = [/^rnpm-plugin-/, /^@(.*)\/rnpm-plugin-/];
 

diff --git a/packages/cli/src/core/getAssets.js b/packages/cli/src/core/getAssets.js
@@ -2,9 +2,9 @@
  * @flow
  */
 
-const glob = require('glob');
-const path = require('path');
-const getPackageConfiguration = require('./getPackageConfiguration');
+import glob from 'glob';
+import path from 'path';
+import getPackageConfiguration from './getPackageConfiguration';
 
 const findAssetsInFolder = folder =>
   glob.sync(path.join(folder, '**'), { nodir: true });

diff --git a/packages/cli/src/core/getCommands.js b/packages/cli/src/core/getCommands.js
@@ -2,11 +2,11 @@
  * @flow
  */
 
+import path from 'path';
 import type { CommandT, ProjectCommandT, LocalCommandT } from './types.flow';
 
-const path = require('path');
-const findPlugins = require('./findPlugins');
-const logger = require('../util/logger');
+import findPlugins from './findPlugins';
+import logger from '../util/logger';
 
 /**
  * List of built-in commands

diff --git a/packages/cli/src/core/getHooks.js b/packages/cli/src/core/getHooks.js
@@ -2,8 +2,8 @@
  * @flow
  */
 
-const { spawn } = require('child_process');
-const getPackageConfiguration = require('./getPackageConfiguration');
+import { spawn } from 'child_process';
+import getPackageConfiguration from './getPackageConfiguration';
 
 function makeCommand(command) {
   return cb => {

diff --git a/packages/cli/src/core/getLegacyConfig.js b/packages/cli/src/core/getLegacyConfig.js
@@ -1,14 +1,14 @@
 /**
  * @flow
  */
-const path = require('path');
-const util = require('util');
-
-const getPlatforms = require('./getPlatforms');
-const getPackageConfiguration = require('./getPackageConfiguration');
-const getHooks = require('./getHooks');
-const getAssets = require('./getAssets');
-const getParams = require('./getParams');
+import path from 'path';
+import util from 'util';
+
+import getPlatforms from './getPlatforms';
+import getPackageConfiguration from './getPackageConfiguration';
+import getHooks from './getHooks';
+import getAssets from './getAssets';
+import getParams from './getParams';
 
 const generateDeprecationMessage = api =>
   `${api} is deprecated and will be removed soon. Please check release notes on how to upgrade`;

diff --git a/packages/cli/src/core/getPackageConfiguration.js b/packages/cli/src/core/getPackageConfiguration.js
@@ -1,10 +1,9 @@
 /**
  * @flow
  */
+import path from 'path';
 import type { PackageConfigurationT } from './types.flow';
 
-const path = require('path');
-
 /**
  * Returns configuration of the CLI from `package.json`.
  */

diff --git a/packages/cli/src/core/getParams.js b/packages/cli/src/core/getParams.js
@@ -2,7 +2,7 @@
  * @flow
  */
 
-const getPackageConfiguration = require('./getPackageConfiguration');
+import getPackageConfiguration from './getPackageConfiguration';
 
 module.exports = function getParams(root: string) {
   const config = getPackageConfiguration(root);

diff --git a/packages/cli/src/core/getPlatforms.js b/packages/cli/src/core/getPlatforms.js
@@ -2,10 +2,10 @@
  * @flow
  */
 
+import path from 'path';
 import type { PlatformsT } from './types.flow';
 
-const path = require('path');
-const findPlugins = require('./findPlugins');
+import findPlugins from './findPlugins';
 
 /**
  * Support for `ios` and `android` platforms is built-in

diff --git a/packages/cli/src/core/ios/findPodfilePath.js b/packages/cli/src/core/ios/findPodfilePath.js
@@ -7,8 +7,8 @@
  * @format
  */
 
-const fs = require('fs');
-const path = require('path');
+import fs from 'fs';
+import path from 'path';
 
 module.exports = function findPodfilePath(projectFolder) {
   const podFilePath = path.join(projectFolder, '..', 'Podfile');