From 9c6f54e374894492070cc417216f1120e594fad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Tue, 5 Mar 2019 21:03:14 +0100 Subject: [PATCH 1/2] fix: change diff links for upgrade command --- .../upgrade/__tests__/upgrade.test.js | 32 +++++++++---------- packages/cli/src/commands/upgrade/upgrade.js | 6 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js b/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js index 438a6f60d..fdce7eceb 100644 --- a/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js +++ b/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js @@ -4,7 +4,7 @@ import path from 'path'; import fs from 'fs'; import snapshotDiff from 'snapshot-diff'; import upgrade from '../upgrade'; -import {fetch} from '../helpers'; +import { fetch } from '../helpers'; import logger from '../../../tools/logger'; jest.mock('https'); @@ -18,26 +18,26 @@ jest.mock('execa', () => { stdout: '{"react": "16.6.3"}', }); } - return Promise.resolve({stdout: ''}); + return Promise.resolve({ stdout: '' }); }); return module; }); jest.mock( '/project/root/node_modules/react-native/package.json', - () => ({name: 'react-native', version: '0.57.8'}), - {virtual: true}, + () => ({ name: 'react-native', version: '0.57.8' }), + { virtual: true } ); jest.mock( '/project/root/package.json', - () => ({name: 'TestApp', dependencies: {'react-native': '^0.57.8'}}), - {virtual: true}, + () => ({ name: 'TestApp', dependencies: { 'react-native': '^0.57.8' } }), + { virtual: true } ); jest.mock('../../../tools/PackageManager', () => jest.fn(() => ({ install: args => { mockPushLog('$ yarn add', ...args); }, - })), + })) ); jest.mock('../helpers', () => ({ ...jest.requireActual('../helpers'), @@ -88,21 +88,21 @@ test('uses latest version of react-native when none passed', async () => { test('errors when invalid version passed', async () => { await upgrade.func(['next'], ctx, opts); expect(logger.error).toBeCalledWith( - 'Provided version "next" is not allowed. Please pass a valid semver version', + 'Provided version "next" is not allowed. Please pass a valid semver version' ); }); test('errors when older version passed', async () => { await upgrade.func([olderVersion], ctx, opts); expect(logger.error).toBeCalledWith( - `Trying to upgrade from newer version "${currentVersion}" to older "${olderVersion}"`, + `Trying to upgrade from newer version "${currentVersion}" to older "${olderVersion}"` ); }); test('warns when dependency upgrade version is in semver range', async () => { await upgrade.func([currentVersion], ctx, opts); expect(logger.warn).toBeCalledWith( - `Specified version "${currentVersion}" is already installed in node_modules and it satisfies "^0.57.8" semver range. No need to upgrade`, + `Specified version "${currentVersion}" is already installed in node_modules and it satisfies "^0.57.8" semver range. No need to upgrade` ); }); @@ -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... @@ -149,7 +149,7 @@ success Upgraded React Native to v0.58.4 🎉. Now you can review and commit the expect( snapshotDiff(samplePatch, fs.writeFileSync.mock.calls[0][1], { contextLines: 1, - }), + }) ).toMatchSnapshot('RnDiffApp is replaced with app name (TestApp)'); }); test('cleans up if patching fails,', async () => { @@ -167,26 +167,26 @@ test('cleans up if patching fails,', async () => { stderr: 'error: .flowconfig: does not exist in index\n', }); } - return Promise.resolve({stdout: ''}); + return Promise.resolve({ stdout: '' }); }); try { await upgrade.func([newVersion], ctx, opts); } catch (error) { expect(error.message).toBe( - 'Upgrade failed. Please see the messages above for details', + 'Upgrade failed. Please see the messages above for details' ); } 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..b73a08e1f 100644 --- a/packages/cli/src/commands/upgrade/upgrade.js +++ b/packages/cli/src/commands/upgrade/upgrade.js @@ -14,7 +14,7 @@ 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 +52,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 +187,7 @@ 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; From b46042800663a5cb64a2f92e5a186eb8cc8cca44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Tue, 5 Mar 2019 21:14:21 +0100 Subject: [PATCH 2/2] use prettier without @format pragma --- package.json | 3 +++ .../commands/runAndroid/runOnAllDevices.js | 1 - .../upgrade/__tests__/upgrade.test.js | 26 +++++++++---------- packages/cli/src/commands/upgrade/upgrade.js | 6 +++-- 4 files changed, 20 insertions(+), 16 deletions(-) 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 fdce7eceb..fbd09d97c 100644 --- a/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js +++ b/packages/cli/src/commands/upgrade/__tests__/upgrade.test.js @@ -4,7 +4,7 @@ import path from 'path'; import fs from 'fs'; import snapshotDiff from 'snapshot-diff'; import upgrade from '../upgrade'; -import { fetch } from '../helpers'; +import {fetch} from '../helpers'; import logger from '../../../tools/logger'; jest.mock('https'); @@ -18,26 +18,26 @@ jest.mock('execa', () => { stdout: '{"react": "16.6.3"}', }); } - return Promise.resolve({ stdout: '' }); + return Promise.resolve({stdout: ''}); }); return module; }); jest.mock( '/project/root/node_modules/react-native/package.json', - () => ({ name: 'react-native', version: '0.57.8' }), - { virtual: true } + () => ({name: 'react-native', version: '0.57.8'}), + {virtual: true}, ); jest.mock( '/project/root/package.json', - () => ({ name: 'TestApp', dependencies: { 'react-native': '^0.57.8' } }), - { virtual: true } + () => ({name: 'TestApp', dependencies: {'react-native': '^0.57.8'}}), + {virtual: true}, ); jest.mock('../../../tools/PackageManager', () => jest.fn(() => ({ install: args => { mockPushLog('$ yarn add', ...args); }, - })) + })), ); jest.mock('../helpers', () => ({ ...jest.requireActual('../helpers'), @@ -88,21 +88,21 @@ test('uses latest version of react-native when none passed', async () => { test('errors when invalid version passed', async () => { await upgrade.func(['next'], ctx, opts); expect(logger.error).toBeCalledWith( - 'Provided version "next" is not allowed. Please pass a valid semver version' + 'Provided version "next" is not allowed. Please pass a valid semver version', ); }); test('errors when older version passed', async () => { await upgrade.func([olderVersion], ctx, opts); expect(logger.error).toBeCalledWith( - `Trying to upgrade from newer version "${currentVersion}" to older "${olderVersion}"` + `Trying to upgrade from newer version "${currentVersion}" to older "${olderVersion}"`, ); }); test('warns when dependency upgrade version is in semver range', async () => { await upgrade.func([currentVersion], ctx, opts); expect(logger.warn).toBeCalledWith( - `Specified version "${currentVersion}" is already installed in node_modules and it satisfies "^0.57.8" semver range. No need to upgrade` + `Specified version "${currentVersion}" is already installed in node_modules and it satisfies "^0.57.8" semver range. No need to upgrade`, ); }); @@ -149,7 +149,7 @@ success Upgraded React Native to v0.58.4 🎉. Now you can review and commit the expect( snapshotDiff(samplePatch, fs.writeFileSync.mock.calls[0][1], { contextLines: 1, - }) + }), ).toMatchSnapshot('RnDiffApp is replaced with app name (TestApp)'); }); test('cleans up if patching fails,', async () => { @@ -167,13 +167,13 @@ test('cleans up if patching fails,', async () => { stderr: 'error: .flowconfig: does not exist in index\n', }); } - return Promise.resolve({ stdout: '' }); + return Promise.resolve({stdout: ''}); }); try { await upgrade.func([newVersion], ctx, opts); } catch (error) { expect(error.message).toBe( - 'Upgrade failed. Please see the messages above for details' + 'Upgrade failed. Please see the messages above for details', ); } expect(flushOutput()).toMatchInlineSnapshot(` diff --git a/packages/cli/src/commands/upgrade/upgrade.js b/packages/cli/src/commands/upgrade/upgrade.js index b73a08e1f..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/react-native-community/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...'); @@ -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/react-native-community/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;