From d81a037962f7bf948e87607484e8be5780e90de7 Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@fb.com>
Date: Thu, 18 Jul 2019 12:52:08 -0700
Subject: [PATCH] Convert some CommonJS constructs to ES6

Summary:
Tried to automate this with [cjs-to-es6](https://github.com/nolanlawson/cjs-to-es6) but it only
works on vanilla JS files without any special Flow syntax. I converted some places
manually but we can just do the rest as we modify the files.

Reviewed By: jknoxville

Differential Revision: D16340187

fbshipit-source-id: b55c7ce2d719876e47e85f5f3fce13b8c8ae4010
---
 src/ui/components/ButtonGroup.js           | 2 +-
 src/ui/components/Tooltip.js               | 2 +-
 src/ui/components/TooltipProvider.js       | 2 +-
 src/ui/components/data-inspector/utils.js  | 2 +-
 src/ui/components/table/TableHead.js       | 2 +-
 src/utils/CertificateProvider.js           | 6 +++---
 src/utils/info.js                          | 2 +-
 src/utils/openssl-wrapper-with-promises.js | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ui/components/ButtonGroup.js b/src/ui/components/ButtonGroup.js
index a38ae83cd..988481385 100644
--- a/src/ui/components/ButtonGroup.js
+++ b/src/ui/components/ButtonGroup.js
@@ -8,7 +8,7 @@
 import styled from '../styled/index.js';
 import {Component} from 'react';
 
-const PropTypes = require('prop-types');
+import PropTypes from 'prop-types';
 
 const ButtonGroupContainer = styled('div')({
   display: 'inline-flex',
diff --git a/src/ui/components/Tooltip.js b/src/ui/components/Tooltip.js
index 0ab84bf18..f241331c8 100644
--- a/src/ui/components/Tooltip.js
+++ b/src/ui/components/Tooltip.js
@@ -11,7 +11,7 @@ import type {TooltipOptions} from './TooltipProvider.js';
 import styled from '../styled/index.js';
 import {Component} from 'react';
 
-const PropTypes = require('prop-types');
+import PropTypes from 'prop-types';
 
 const TooltipContainer = styled('div')({
   display: 'contents',
diff --git a/src/ui/components/TooltipProvider.js b/src/ui/components/TooltipProvider.js
index c935b6de6..f35a0e3e1 100644
--- a/src/ui/components/TooltipProvider.js
+++ b/src/ui/components/TooltipProvider.js
@@ -9,7 +9,7 @@ import styled from '../styled/index.js';
 import {colors} from './colors.js';
 import {Component} from 'react';
 
-const PropTypes = require('prop-types');
+import PropTypes from 'prop-types';
 
 const defaultOptions = {
   backgroundColor: colors.blueGrey,
diff --git a/src/ui/components/data-inspector/utils.js b/src/ui/components/data-inspector/utils.js
index b8fd751b6..0700b5755 100644
--- a/src/ui/components/data-inspector/utils.js
+++ b/src/ui/components/data-inspector/utils.js
@@ -5,7 +5,7 @@
  * @format
  */
 
-const naturalCompare = require('string-natural-compare');
+import naturalCompare from 'string-natural-compare';
 
 export function getSortedKeys(obj: Object): Array<string> {
   return Object.keys(obj).sort(naturalCompare);
diff --git a/src/ui/components/table/TableHead.js b/src/ui/components/table/TableHead.js
index b20961099..9e6e11668 100644
--- a/src/ui/components/table/TableHead.js
+++ b/src/ui/components/table/TableHead.js
@@ -23,7 +23,7 @@ import {colors} from '../colors.js';
 
 import FlexRow from '../FlexRow.js';
 
-const invariant = require('invariant');
+import invariant from 'invariant';
 
 type MenuTemplate = Array<MenuItemConstructorOptions>;
 
diff --git a/src/utils/CertificateProvider.js b/src/utils/CertificateProvider.js
index f571a9f76..6172ef34a 100644
--- a/src/utils/CertificateProvider.js
+++ b/src/utils/CertificateProvider.js
@@ -8,13 +8,13 @@
 import type {Logger} from '../fb-interfaces/Logger';
 import Server from '../server';
 import {promisify} from 'util';
-const fs = require('fs');
+import fs from 'fs';
 import {
   openssl,
   isInstalled as opensslInstalled,
 } from './openssl-wrapper-with-promises';
-const path = require('path');
-const tmp = require('tmp');
+import path from 'path';
+import tmp from 'tmp';
 const tmpFile = promisify(tmp.file);
 const tmpDir = promisify(tmp.dir);
 import iosUtil from '../fb-stubs/iOSContainerUtility';
diff --git a/src/utils/info.js b/src/utils/info.js
index e2e00a334..de744607c 100644
--- a/src/utils/info.js
+++ b/src/utils/info.js
@@ -5,7 +5,7 @@
  * @format
  */
 
-const os = require('os');
+import os from 'os';
 
 export type Info = {
   arch: string,
diff --git a/src/utils/openssl-wrapper-with-promises.js b/src/utils/openssl-wrapper-with-promises.js
index 5d21452a5..1b0cf5213 100644
--- a/src/utils/openssl-wrapper-with-promises.js
+++ b/src/utils/openssl-wrapper-with-promises.js
@@ -6,7 +6,7 @@
  */
 
 import {exec as opensslWithCallback} from 'openssl-wrapper';
-const child_process = require('child_process');
+import child_process from 'child_process';
 
 export function openssl(action: string, options: {}): Promise<string> {
   return new Promise((resolve, reject) => {