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
This commit is contained in:
Pascal Hartig
2019-07-18 12:52:08 -07:00
committed by Facebook Github Bot
parent 09c615ce6a
commit d81a037962
8 changed files with 10 additions and 10 deletions

View File

@@ -8,7 +8,7 @@
import styled from '../styled/index.js'; import styled from '../styled/index.js';
import {Component} from 'react'; import {Component} from 'react';
const PropTypes = require('prop-types'); import PropTypes from 'prop-types';
const ButtonGroupContainer = styled('div')({ const ButtonGroupContainer = styled('div')({
display: 'inline-flex', display: 'inline-flex',

View File

@@ -11,7 +11,7 @@ import type {TooltipOptions} from './TooltipProvider.js';
import styled from '../styled/index.js'; import styled from '../styled/index.js';
import {Component} from 'react'; import {Component} from 'react';
const PropTypes = require('prop-types'); import PropTypes from 'prop-types';
const TooltipContainer = styled('div')({ const TooltipContainer = styled('div')({
display: 'contents', display: 'contents',

View File

@@ -9,7 +9,7 @@ import styled from '../styled/index.js';
import {colors} from './colors.js'; import {colors} from './colors.js';
import {Component} from 'react'; import {Component} from 'react';
const PropTypes = require('prop-types'); import PropTypes from 'prop-types';
const defaultOptions = { const defaultOptions = {
backgroundColor: colors.blueGrey, backgroundColor: colors.blueGrey,

View File

@@ -5,7 +5,7 @@
* @format * @format
*/ */
const naturalCompare = require('string-natural-compare'); import naturalCompare from 'string-natural-compare';
export function getSortedKeys(obj: Object): Array<string> { export function getSortedKeys(obj: Object): Array<string> {
return Object.keys(obj).sort(naturalCompare); return Object.keys(obj).sort(naturalCompare);

View File

@@ -23,7 +23,7 @@ import {colors} from '../colors.js';
import FlexRow from '../FlexRow.js'; import FlexRow from '../FlexRow.js';
const invariant = require('invariant'); import invariant from 'invariant';
type MenuTemplate = Array<MenuItemConstructorOptions>; type MenuTemplate = Array<MenuItemConstructorOptions>;

View File

@@ -8,13 +8,13 @@
import type {Logger} from '../fb-interfaces/Logger'; import type {Logger} from '../fb-interfaces/Logger';
import Server from '../server'; import Server from '../server';
import {promisify} from 'util'; import {promisify} from 'util';
const fs = require('fs'); import fs from 'fs';
import { import {
openssl, openssl,
isInstalled as opensslInstalled, isInstalled as opensslInstalled,
} from './openssl-wrapper-with-promises'; } from './openssl-wrapper-with-promises';
const path = require('path'); import path from 'path';
const tmp = require('tmp'); import tmp from 'tmp';
const tmpFile = promisify(tmp.file); const tmpFile = promisify(tmp.file);
const tmpDir = promisify(tmp.dir); const tmpDir = promisify(tmp.dir);
import iosUtil from '../fb-stubs/iOSContainerUtility'; import iosUtil from '../fb-stubs/iOSContainerUtility';

View File

@@ -5,7 +5,7 @@
* @format * @format
*/ */
const os = require('os'); import os from 'os';
export type Info = { export type Info = {
arch: string, arch: string,

View File

@@ -6,7 +6,7 @@
*/ */
import {exec as opensslWithCallback} from 'openssl-wrapper'; 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> { export function openssl(action: string, options: {}): Promise<string> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {