diff --git a/package.json b/package.json index 4689b5538..0ee2153c1 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,9 @@ "es6": true, "jest": true, "node": true + }, + "rules": { + "prettier/prettier": [2, "fb"] } }, "jest": { diff --git a/packages/cli/src/commands/runAndroid/runOnAllDevices.js b/packages/cli/src/commands/runAndroid/runOnAllDevices.js index 043d89f32..993cf72a4 100644 --- a/packages/cli/src/commands/runAndroid/runOnAllDevices.js +++ b/packages/cli/src/commands/runAndroid/runOnAllDevices.js @@ -7,7 +7,6 @@ * @flow */ - import {spawnSync, execFileSync} from 'child_process'; import logger from '../../tools/logger'; import adb from './adb'; diff --git a/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js b/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js index 438a6f60d..fbd09d97c 100644 --- a/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js +++ b/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js @@ -129,7 +129,7 @@ test('fetches regular patch, adds remote, applies patch, installs deps, removes expect(flushOutput()).toMatchInlineSnapshot(` "info Fetching diff between v0.57.8 and v0.58.4... [fs] write tmp-upgrade-rn.patch -$ execa git remote add tmp-rn-diff-purge https://github.com/pvinis/rn-diff-purge.git +$ execa git remote add tmp-rn-diff-purge https://github.com/react-native-community/rn-diff-purge.git $ execa git fetch --no-tags tmp-rn-diff-purge $ execa git apply --check tmp-upgrade-rn.patch --exclude=package.json -p2 --3way info Applying diff... @@ -179,14 +179,14 @@ test('cleans up if patching fails,', async () => { expect(flushOutput()).toMatchInlineSnapshot(` "info Fetching diff between v0.57.8 and v0.58.4... [fs] write tmp-upgrade-rn.patch -$ execa git remote add tmp-rn-diff-purge https://github.com/pvinis/rn-diff-purge.git +$ execa git remote add tmp-rn-diff-purge https://github.com/react-native-community/rn-diff-purge.git $ execa git fetch --no-tags tmp-rn-diff-purge $ execa git apply --check tmp-upgrade-rn.patch --exclude=package.json -p2 --3way info Applying diff (excluding: package.json, .flowconfig)... $ execa git apply tmp-upgrade-rn.patch --exclude=package.json --exclude=.flowconfig -p2 --3way error: .flowconfig: does not exist in index error Automatically applying diff failed -info Here's the diff we tried to apply: https://github.com/pvinis/rn-diff-purge/compare/version/0.57.8...version/0.58.4 +info Here's the diff we tried to apply: https://github.com/react-native-community/rn-diff-purge/compare/version/0.57.8...version/0.58.4 info You may find release notes helpful: https://github.com/facebook/react-native/releases/tag/v0.58.4 [fs] unlink tmp-upgrade-rn.patch warn Continuing after failure. Most of the files are upgraded but you will need to deal with some conflicts manually diff --git a/packages/cli/src/commands/upgrade/upgrade.js b/packages/cli/src/commands/upgrade/upgrade.js index 14512eb12..c22720b3d 100644 --- a/packages/cli/src/commands/upgrade/upgrade.js +++ b/packages/cli/src/commands/upgrade/upgrade.js @@ -14,7 +14,8 @@ type FlagsT = { legacy: boolean, }; -const rnDiffPurgeUrl = 'https://github.com/pvinis/rn-diff-purge'; +const rnDiffPurgeUrl = + 'https://github.com/react-native-community/rn-diff-purge'; const getLatestRNVersion = async (): Promise => { logger.info('No version passed. Fetching latest...'); @@ -52,7 +53,7 @@ const getPatch = async (currentVersion, newVersion, projectDir) => { `Failed to fetch diff for react-native@${newVersion}. Maybe it's not released yet?`, ); logger.info( - 'For available releases to diff see: https://github.com/pvinis/rn-diff-purge#version-changes', + 'For available releases to diff see: https://github.com/react-native-community/rn-diff-purge#version-changes', ); return null; } @@ -187,7 +188,8 @@ async function upgrade(argv: Array, ctx: ContextT, args: FlagsT) { if (args.legacy) { return legacyUpgrade.func(argv, ctx); } - const rnDiffGitAddress = 'https://github.com/pvinis/rn-diff-purge.git'; + const rnDiffGitAddress = + 'https://github.com/react-native-community/rn-diff-purge.git'; const tmpRemote = 'tmp-rn-diff-purge'; const tmpPatchFile = 'tmp-upgrade-rn.patch'; const projectDir = ctx.root;