From 1c5f7b0e7fe9cb6b0af4fa03bc5fbfa9c5bc270c Mon Sep 17 00:00:00 2001 From: Ville Immonen Date: Thu, 8 Nov 2018 16:59:23 +0200 Subject: [PATCH] Run Prettier everywhere --- .prettierignore | 7 +++++ packages/dev-tools/common/state.js | 3 +- packages/dev-tools/components/GlobalToasts.js | 16 ++++++---- .../ProjectManagerPublishingSection.js | 3 +- .../components/ProjectManagerSection.js | 3 +- packages/dev-tools/components/SmallButton.js | 6 ++-- .../dev-tools/components/SmallSquareButton.js | 6 ++-- .../src/commands/build/AndroidBuilder.js | 8 +++-- .../src/commands/build/BaseBuilder.js | 18 +++++------ .../expo-cli/src/commands/build/IOSBuilder.js | 8 +++-- packages/expo-cli/src/commands/eject/Eject.js | 31 ++++++++++--------- packages/expo-cli/src/commands/push-creds.js | 12 +++++-- packages/expo-cli/src/commands/webhooks.js | 18 +++++------ packages/schemer/__tests__/test.js | 1 - packages/schemer/src/index.js | 8 +++-- 15 files changed, 91 insertions(+), 57 deletions(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..f91df04e30 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,7 @@ +/packages/dev-tools/.next +/packages/dev-tools/build +/packages/expo-cli/build +/packages/json-file/build +/packages/schemer/build +/packages/xdl/flow-typed +/packages/xdl/build diff --git a/packages/dev-tools/common/state.js b/packages/dev-tools/common/state.js index b137090d1d..b6ca677cba 100644 --- a/packages/dev-tools/common/state.js +++ b/packages/dev-tools/common/state.js @@ -379,7 +379,8 @@ export const publishProject = async (options, props) => { Successfully published to{' '} {url} - . + + . ), }, diff --git a/packages/dev-tools/components/GlobalToasts.js b/packages/dev-tools/components/GlobalToasts.js index 989202ad44..427e7e5590 100644 --- a/packages/dev-tools/components/GlobalToasts.js +++ b/packages/dev-tools/components/GlobalToasts.js @@ -104,12 +104,16 @@ export class Toast extends React.Component {
{this.props.name} diff --git a/packages/dev-tools/components/ProjectManagerPublishingSection.js b/packages/dev-tools/components/ProjectManagerPublishingSection.js index 940a39e164..9bfcc58853 100644 --- a/packages/dev-tools/components/ProjectManagerPublishingSection.js +++ b/packages/dev-tools/components/ProjectManagerPublishingSection.js @@ -267,7 +267,8 @@ export default class ProjectManagerPublishingSection extends React.Component { Once you publish your project, you will be able to view it at  https://expo.io/@{this.props.user.username}/{this.state.config.slug} - . + + .

  + /> +   {this.props.data.name} ); diff --git a/packages/dev-tools/components/SmallButton.js b/packages/dev-tools/components/SmallButton.js index e3e9440d51..b3852f32ae 100644 --- a/packages/dev-tools/components/SmallButton.js +++ b/packages/dev-tools/components/SmallButton.js @@ -45,9 +45,9 @@ export default class SmallButton extends React.Component { return ( + className={`${STYLES_SMALL_BUTTON} ${ + this.props.isActive ? STYLES_SMALL_BUTTON_ACTIVE : STYLES_SMALL_BUTTON_DEFAULT + }`}> {this.props.children} ); diff --git a/packages/dev-tools/components/SmallSquareButton.js b/packages/dev-tools/components/SmallSquareButton.js index a918bdf820..077b8eecca 100644 --- a/packages/dev-tools/components/SmallSquareButton.js +++ b/packages/dev-tools/components/SmallSquareButton.js @@ -34,9 +34,9 @@ export default class SmallButton extends React.Component { return ( + className={`${STYLES_SMALL_BUTTON} ${ + this.props.isActive ? STYLES_SMALL_BUTTON_ACTIVE : STYLES_SMALL_BUTTON_DEFAULT + }`}> {this.props.children} ); diff --git a/packages/expo-cli/src/commands/build/AndroidBuilder.js b/packages/expo-cli/src/commands/build/AndroidBuilder.js index b3e9fee8ad..52aa9618a5 100644 --- a/packages/expo-cli/src/commands/build/AndroidBuilder.js +++ b/packages/expo-cli/src/commands/build/AndroidBuilder.js @@ -85,7 +85,9 @@ export default class AndroidBuilder extends BaseBuilder { async collectAndValidateCredentials(options = {}) { const publicUrl = options.publicUrl; - const { args: { username, remoteFullPackageName: experienceName } } = publicUrl + const { + args: { username, remoteFullPackageName: experienceName }, + } = publicUrl ? await Exp.getThirdPartyInfoAsync(publicUrl) : await Exp.getPublishInfoAsync(this.projectDir); @@ -208,7 +210,9 @@ export default class AndroidBuilder extends BaseBuilder { async validateProject(options) { const publicUrl = options.publicUrl; - const { args: { sdkVersion } } = publicUrl + const { + args: { sdkVersion }, + } = publicUrl ? await Exp.getThirdPartyInfoAsync(publicUrl) : await Exp.getPublishInfoAsync(this.projectDir); await this.checkIfSdkIsSupported(sdkVersion, 'android'); diff --git a/packages/expo-cli/src/commands/build/BaseBuilder.js b/packages/expo-cli/src/commands/build/BaseBuilder.js index 4643659dbe..515584d6a8 100644 --- a/packages/expo-cli/src/commands/build/BaseBuilder.js +++ b/packages/expo-cli/src/commands/build/BaseBuilder.js @@ -63,14 +63,12 @@ export default class BaseBuilder { } } - async checkStatus( - { - platform = 'all', - current = true, - publicUrl, - sdkVersion, - }: { platform: string, current: boolean, publicUrl?: string } = {} - ): Promise { + async checkStatus({ + platform = 'all', + current = true, + publicUrl, + sdkVersion, + }: { platform: string, current: boolean, publicUrl?: string } = {}): Promise { await this._checkProjectConfig(); log('Checking if current build exists...\n'); @@ -187,7 +185,9 @@ ${job.id} throw new BuildError('No releases found. Please create one using `exp publish` first.'); } log( - `Using existing release on channel "${release.channel}":\n publicationId: ${release.publicationId}\n publishedTime: ${release.publishedTime}` + `Using existing release on channel "${release.channel}":\n publicationId: ${ + release.publicationId + }\n publishedTime: ${release.publishedTime}` ); return [release.publicationId]; } diff --git a/packages/expo-cli/src/commands/build/IOSBuilder.js b/packages/expo-cli/src/commands/build/IOSBuilder.js index 1169cd2e20..e1226fdf09 100644 --- a/packages/expo-cli/src/commands/build/IOSBuilder.js +++ b/packages/expo-cli/src/commands/build/IOSBuilder.js @@ -433,7 +433,9 @@ See https://docs.expo.io/versions/latest/guides/building-standalone-apps.html` if (this.options.revokeAppleProvisioningProfile) { await new Promise(r => setTimeout(() => r(), 400)); log.warn( - `ATTENTION: Revoking your Apple Provisioning Profile for ${credsMetadata.bundleIdentifier} is permanent` + `ATTENTION: Revoking your Apple Provisioning Profile for ${ + credsMetadata.bundleIdentifier + } is permanent` ); const revokeAttempt = await authFuncs.revokeProvisioningProfile( appleCredentials, @@ -627,7 +629,9 @@ See https://docs.expo.io/versions/latest/guides/building-standalone-apps.html` const creds = { ...credsStarter, ...credentialsCI }; this._areCredsMissing(creds); await Credentials.updateCredentialsForPlatform('ios', creds, credsMetadata); - log.warn(`Encrypted ${Object.keys(OBLIGATORY_CREDS_KEYS).join(', ')} and saved to expo servers`); + log.warn( + `Encrypted ${Object.keys(OBLIGATORY_CREDS_KEYS).join(', ')} and saved to expo servers` + ); } else if (clientHasAllNeededCreds === false) { const strategy = await prompt(runAsExpertQuestion); const isEnterprise = this.options.appleEnterpriseAccount !== undefined; diff --git a/packages/expo-cli/src/commands/eject/Eject.js b/packages/expo-cli/src/commands/eject/Eject.js index 16eb5f4e65..8e551cad81 100644 --- a/packages/expo-cli/src/commands/eject/Eject.js +++ b/packages/expo-cli/src/commands/eject/Eject.js @@ -162,11 +162,10 @@ Ejecting is permanent! Please be careful with your selection. // manually gets printed. const babelRcJson = JSON.parse(projectBabelRc); if (babelRcJson.presets && babelRcJson.presets.includes('babel-preset-expo')) { - babelRcJson.presets = babelRcJson.presets.map( - preset => - preset === 'babel-preset-expo' - ? 'babel-preset-react-native-stage-0/decorator-support' - : preset + babelRcJson.presets = babelRcJson.presets.map(preset => + preset === 'babel-preset-expo' + ? 'babel-preset-react-native-stage-0/decorator-support' + : preset ); await fse.writeFile(projectBabelPath, JSON.stringify(babelRcJson, null, 2)); newDevDependencies.push('babel-preset-react-native-stage-0'); @@ -212,7 +211,11 @@ from \`babel-preset-expo\` to \`babel-preset-react-native-stage-0/decorator-supp pkgJson.jest.preset = 'react-native'; } else { log( - `${chalk.bold('Warning')}: it looks like you've changed the Jest preset from jest-expo to ${pkgJson.jest.preset}. We recommend you make sure this Jest preset is compatible with ejected apps.` + `${chalk.bold( + 'Warning' + )}: it looks like you've changed the Jest preset from jest-expo to ${ + pkgJson.jest.preset + }. We recommend you make sure this Jest preset is compatible with ejected apps.` ); } } @@ -284,14 +287,14 @@ Please consider letting us know why you ejected in this survey: async function filesUsingExpoSdk(projectRoot: string): Promise> { const projectJsFiles = await findJavaScriptProjectFilesInRoot(projectRoot); - const jsFileContents = (await Promise.all( - projectJsFiles.map(f => fse.readFile(f)) - )).map((buf, i) => { - return { - filename: projectJsFiles[i], - contents: buf.toString(), - }; - }); + const jsFileContents = (await Promise.all(projectJsFiles.map(f => fse.readFile(f)))).map( + (buf, i) => { + return { + filename: projectJsFiles[i], + contents: buf.toString(), + }; + } + ); const filesUsingExpo = []; diff --git a/packages/expo-cli/src/commands/push-creds.js b/packages/expo-cli/src/commands/push-creds.js index b04e90f265..c113832e75 100644 --- a/packages/expo-cli/src/commands/push-creds.js +++ b/packages/expo-cli/src/commands/push-creds.js @@ -18,7 +18,9 @@ export default (program: any) => { log('Reading project configuration...'); - const { args: { remotePackageName } } = await Exp.getPublishInfoAsync(projectDir); + const { + args: { remotePackageName }, + } = await Exp.getPublishInfoAsync(projectDir); log('Logging in...'); @@ -38,7 +40,9 @@ export default (program: any) => { .command('push:android:show [project-dir]') .description('Print the value currently in use for FCM notifications for this project.') .asyncActionProjectDir(async (projectDir, options) => { - const { args: { remotePackageName } } = await Exp.getPublishInfoAsync(projectDir); + const { + args: { remotePackageName }, + } = await Exp.getPublishInfoAsync(projectDir); let user = await User.getCurrentUserAsync(); let apiClient = ApiV2.clientForUser(user); @@ -56,7 +60,9 @@ export default (program: any) => { .description('Deletes a previously uploaded FCM credential.') .asyncActionProjectDir(async (projectDir, options) => { log('Reading project configuration...'); - const { args: { remotePackageName } } = await Exp.getPublishInfoAsync(projectDir); + const { + args: { remotePackageName }, + } = await Exp.getPublishInfoAsync(projectDir); log('Logging in...'); let user = await User.getCurrentUserAsync(); diff --git a/packages/expo-cli/src/commands/webhooks.js b/packages/expo-cli/src/commands/webhooks.js index a7bb35b709..767d00b12c 100644 --- a/packages/expo-cli/src/commands/webhooks.js +++ b/packages/expo-cli/src/commands/webhooks.js @@ -22,9 +22,9 @@ export default program => { const options = _sanitizeOptions(_options); const secret = options.secret ? options.secret : await _askForSecret(); const webhookData = { ...options, secret }; - const { args: { remoteFullPackageName: experienceName } } = await Exp.getPublishInfoAsync( - projectDir - ); + const { + args: { remoteFullPackageName: experienceName }, + } = await Exp.getPublishInfoAsync(projectDir); log(`Setting ${webhookData.event} webhook and secret for ${experienceName}`); try { await Webhooks.setWebhookAsync(experienceName, webhookData); @@ -40,9 +40,9 @@ export default program => { .command('webhooks:show [project-dir]') .description(`Show webhooks for the project.`) .asyncActionProjectDir(async (projectDir, options) => { - const { args: { remoteFullPackageName: experienceName } } = await Exp.getPublishInfoAsync( - projectDir - ); + const { + args: { remoteFullPackageName: experienceName }, + } = await Exp.getPublishInfoAsync(projectDir); log(`Fetching webhooks for ${experienceName}`); @@ -71,9 +71,9 @@ export default program => { .description(`Clear a webhook associated with this project.`) .asyncActionProjectDir(async (projectDir, options) => { const event = _sanitizeEvent(options.event); - const { args: { remoteFullPackageName: experienceName } } = await Exp.getPublishInfoAsync( - projectDir - ); + const { + args: { remoteFullPackageName: experienceName }, + } = await Exp.getPublishInfoAsync(projectDir); log(`Clearing webhooks for ${experienceName}`); diff --git a/packages/schemer/__tests__/test.js b/packages/schemer/__tests__/test.js index 34db144c2c..56a1cb8426 100644 --- a/packages/schemer/__tests__/test.js +++ b/packages/schemer/__tests__/test.js @@ -70,7 +70,6 @@ describe('Manual Validation Individual Unit Tests', () => { expect(e.errors.length).toBe(1); } }); - }); describe('Individual Unit Tests', async () => { diff --git a/packages/schemer/src/index.js b/packages/schemer/src/index.js index d2cda2dce9..3c8dadce6f 100644 --- a/packages/schemer/src/index.js +++ b/packages/schemer/src/index.js @@ -200,7 +200,9 @@ export default class Schemer { new ValidationError({ errorCode: ErrorCodes.INVALID_CONTENT_TYPE, fieldPath, - message: `field '${fieldPath}' should point to ${meta.contentTypeHuman} but the file at '${data}' has type ${type}`, + message: `field '${fieldPath}' should point to ${ + meta.contentTypeHuman + } but the file at '${data}' has type ${type}`, data, meta, }) @@ -212,7 +214,9 @@ export default class Schemer { new ValidationError({ errorCode: ErrorCodes.INVALID_DIMENSIONS, fieldPath, - message: `'${fieldPath}' should have dimensions ${dimensions.width}x${dimensions.height}, but the file at '${data}' has dimensions ${width}x${height}`, + message: `'${fieldPath}' should have dimensions ${dimensions.width}x${ + dimensions.height + }, but the file at '${data}' has dimensions ${width}x${height}`, data, meta, })