Skip to content

Commit 82087ef

Browse files
authored
fix: change diff links for upgrade command (#206)
* fix: change diff links for upgrade command * use prettier without @Format pragma
1 parent 885f2c2 commit 82087ef

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
"es6": true,
3838
"jest": true,
3939
"node": true
40+
},
41+
"rules": {
42+
"prettier/prettier": [2, "fb"]
4043
}
4144
},
4245
"jest": {

packages/cli/src/commands/runAndroid/runOnAllDevices.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* @flow
88
*/
99

10-
1110
import {spawnSync, execFileSync} from 'child_process';
1211
import logger from '../../tools/logger';
1312
import adb from './adb';

packages/cli/src/commands/upgrade/__tests__/upgrade.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ test('fetches regular patch, adds remote, applies patch, installs deps, removes
129129
expect(flushOutput()).toMatchInlineSnapshot(`
130130
"info Fetching diff between v0.57.8 and v0.58.4...
131131
[fs] write tmp-upgrade-rn.patch
132-
$ execa git remote add tmp-rn-diff-purge https://github.com/pvinis/rn-diff-purge.git
132+
$ execa git remote add tmp-rn-diff-purge https://github.com/react-native-community/rn-diff-purge.git
133133
$ execa git fetch --no-tags tmp-rn-diff-purge
134134
$ execa git apply --check tmp-upgrade-rn.patch --exclude=package.json -p2 --3way
135135
info Applying diff...
@@ -179,14 +179,14 @@ test('cleans up if patching fails,', async () => {
179179
expect(flushOutput()).toMatchInlineSnapshot(`
180180
"info Fetching diff between v0.57.8 and v0.58.4...
181181
[fs] write tmp-upgrade-rn.patch
182-
$ execa git remote add tmp-rn-diff-purge https://github.com/pvinis/rn-diff-purge.git
182+
$ execa git remote add tmp-rn-diff-purge https://github.com/react-native-community/rn-diff-purge.git
183183
$ execa git fetch --no-tags tmp-rn-diff-purge
184184
$ execa git apply --check tmp-upgrade-rn.patch --exclude=package.json -p2 --3way
185185
info Applying diff (excluding: package.json, .flowconfig)...
186186
$ execa git apply tmp-upgrade-rn.patch --exclude=package.json --exclude=.flowconfig -p2 --3way
187187
error: .flowconfig: does not exist in index
188188
error Automatically applying diff failed
189-
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
189+
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
190190
info You may find release notes helpful: https://github.com/facebook/react-native/releases/tag/v0.58.4
191191
[fs] unlink tmp-upgrade-rn.patch
192192
warn Continuing after failure. Most of the files are upgraded but you will need to deal with some conflicts manually

packages/cli/src/commands/upgrade/upgrade.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ type FlagsT = {
1414
legacy: boolean,
1515
};
1616

17-
const rnDiffPurgeUrl = 'https://github.com/pvinis/rn-diff-purge';
17+
const rnDiffPurgeUrl =
18+
'https://github.com/react-native-community/rn-diff-purge';
1819

1920
const getLatestRNVersion = async (): Promise<string> => {
2021
logger.info('No version passed. Fetching latest...');
@@ -52,7 +53,7 @@ const getPatch = async (currentVersion, newVersion, projectDir) => {
5253
`Failed to fetch diff for react-native@${newVersion}. Maybe it's not released yet?`,
5354
);
5455
logger.info(
55-
'For available releases to diff see: https://github.com/pvinis/rn-diff-purge#version-changes',
56+
'For available releases to diff see: https://github.com/react-native-community/rn-diff-purge#version-changes',
5657
);
5758
return null;
5859
}
@@ -187,7 +188,8 @@ async function upgrade(argv: Array<string>, ctx: ContextT, args: FlagsT) {
187188
if (args.legacy) {
188189
return legacyUpgrade.func(argv, ctx);
189190
}
190-
const rnDiffGitAddress = 'https://github.com/pvinis/rn-diff-purge.git';
191+
const rnDiffGitAddress =
192+
'https://github.com/react-native-community/rn-diff-purge.git';
191193
const tmpRemote = 'tmp-rn-diff-purge';
192194
const tmpPatchFile = 'tmp-upgrade-rn.patch';
193195
const projectDir = ctx.root;

0 commit comments

Comments
 (0)