From aafccdf622905f161390525c4e183e589510097f Mon Sep 17 00:00:00 2001 From: Eli White Date: Wed, 12 Jul 2017 19:22:43 -0700 Subject: [PATCH] Revert D5409825: [RN] Convert easy files to Prettier Differential Revision: D5409825 fbshipit-source-id: f797a40b58bc6bcc6ae53ed820a10ab49d3f10f5 --- babel-preset/configs/hmr.js | 22 ++--- babel-preset/configs/internal.js | 4 +- babel-preset/configs/main.js | 12 +-- babel-preset/index.js | 2 - babel-preset/lib/resolvePlugins.js | 2 - babel-preset/plugins.js | 4 +- ...transform-regenerator-runtime-insertion.js | 8 +- .../transforms/transform-symbol-member.js | 20 ++--- bots/code-analysis-bot.js | 39 ++++----- cli.js | 2 - jest/mockComponent.js | 4 +- jest/preprocessor.js | 18 ++-- jest/setup.js | 84 +++++++++---------- lib/InitializeJavaScriptAppEngine.js | 1 - lib/RCTEventEmitter.js | 1 - lib/TextInputState.js | 1 - lib/UIManager.js | 1 - lib/UIManagerStatTracker.js | 1 - lib/View.js | 1 - lib/deepDiffer.js | 1 - lib/deepFreezeAndThrowOnMutationInDev.js | 1 - lib/flattenStyle.js | 1 - react-native-cli/index.js | 2 - react-native-git-upgrade/cli.js | 6 +- react-native-git-upgrade/index.js | 43 +++++----- react-native-git-upgrade/yarn.js | 5 +- rn-cli.config.js | 2 - 27 files changed, 122 insertions(+), 166 deletions(-) diff --git a/babel-preset/configs/hmr.js b/babel-preset/configs/hmr.js index c3145477f..0fff0fc9a 100644 --- a/babel-preset/configs/hmr.js +++ b/babel-preset/configs/hmr.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; @@ -18,8 +16,8 @@ var transformPath = require.resolve(hmrTransform); module.exports = function(options, filename) { var transform = filename - ? './' + path.relative(path.dirname(filename), transformPath) // packager can't handle absolute paths - : hmrTransform; + ? './' + path.relative(path.dirname(filename), transformPath) // packager can't handle absolute paths + : hmrTransform; // Fix the module path to use '/' on Windows. if (path.sep === '\\') { @@ -31,15 +29,13 @@ module.exports = function(options, filename) { [ 'react-transform', { - transforms: [ - { - transform: transform, - imports: ['react'], - locals: ['module'], - }, - ], + transforms: [{ + transform: transform, + imports: ['react'], + locals: ['module'], + }] }, - ], - ]), + ] + ]) }; }; diff --git a/babel-preset/configs/internal.js b/babel-preset/configs/internal.js index 5bddba1d3..53830b0d6 100644 --- a/babel-preset/configs/internal.js +++ b/babel-preset/configs/internal.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; @@ -15,4 +13,4 @@ var resolvePlugins = require('../lib/resolvePlugins'); module.exports = function(options) { // For future internal pipeline usage return null; -}; +} diff --git a/babel-preset/configs/main.js b/babel-preset/configs/main.js index 6491694a7..eb814e6eb 100644 --- a/babel-preset/configs/main.js +++ b/babel-preset/configs/main.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; @@ -27,10 +25,7 @@ var base = { 'transform-es2015-computed-properties', 'check-es2015-constants', 'transform-es2015-destructuring', - [ - 'transform-es2015-modules-commonjs', - {strict: false, allowTopLevelThis: true}, - ], + ['transform-es2015-modules-commonjs', { strict: false, allowTopLevelThis: true }], 'transform-es2015-parameters', 'transform-es2015-shorthand-properties', 'transform-es2015-spread', @@ -42,7 +37,7 @@ var base = { 'transform-react-display-name', 'transform-react-jsx', 'transform-regenerator', - ['transform-es2015-for-of', {loose: true}], + ['transform-es2015-for-of', { loose: true }], require('../transforms/transform-regenerator-runtime-insertion'), require('../transforms/transform-symbol-member'), ]), @@ -50,9 +45,10 @@ var base = { var devTools = Object.assign({}, base); devTools.plugins = devTools.plugins.concat( - resolvePlugins(['transform-react-jsx-source']), + resolvePlugins(['transform-react-jsx-source']) ); + module.exports = function(options) { var withDevTools = options.withDevTools; if (withDevTools == null) { diff --git a/babel-preset/index.js b/babel-preset/index.js index c5bf83dce..a1e2956ed 100644 --- a/babel-preset/index.js +++ b/babel-preset/index.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; diff --git a/babel-preset/lib/resolvePlugins.js b/babel-preset/lib/resolvePlugins.js index b2058df2b..742ea0a78 100644 --- a/babel-preset/lib/resolvePlugins.js +++ b/babel-preset/lib/resolvePlugins.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; diff --git a/babel-preset/plugins.js b/babel-preset/plugins.js index f79d0fd89..07e3ec3a6 100644 --- a/babel-preset/plugins.js +++ b/babel-preset/plugins.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; @@ -28,7 +26,7 @@ module.exports = { 'babel-plugin-transform-es2015-shorthand-properties': require('babel-plugin-transform-es2015-shorthand-properties'), 'babel-plugin-transform-es2015-spread': require('babel-plugin-transform-es2015-spread'), 'babel-plugin-transform-es2015-template-literals': require('babel-plugin-transform-es2015-template-literals'), - 'babel-plugin-transform-es2015-literals': require('babel-plugin-transform-es2015-literals'), + 'babel-plugin-transform-es2015-literals' : require('babel-plugin-transform-es2015-literals'), 'babel-plugin-transform-flow-strip-types': require('babel-plugin-transform-flow-strip-types'), 'babel-plugin-transform-object-assign': require('babel-plugin-transform-object-assign'), 'babel-plugin-transform-object-rest-spread': require('babel-plugin-transform-object-rest-spread'), diff --git a/babel-preset/transforms/transform-regenerator-runtime-insertion.js b/babel-preset/transforms/transform-regenerator-runtime-insertion.js index a9f5f2d4e..a8d661814 100644 --- a/babel-preset/transforms/transform-regenerator-runtime-insertion.js +++ b/babel-preset/transforms/transform-regenerator-runtime-insertion.js @@ -6,8 +6,6 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * - * @format */ 'use strict'; @@ -100,9 +98,9 @@ module.exports = function() { t.identifier('regeneratorRuntime'), t.callExpression(t.identifier('require'), [ t.stringLiteral(NAME), - ]), - ), - ]), + ]) + ) + ]) ); } }, diff --git a/babel-preset/transforms/transform-symbol-member.js b/babel-preset/transforms/transform-symbol-member.js index 841ead9f6..5962918dc 100644 --- a/babel-preset/transforms/transform-symbol-member.js +++ b/babel-preset/transforms/transform-symbol-member.js @@ -1,7 +1,5 @@ /** * Copyright 2004-present Facebook. All Rights Reserved. - * - * @format */ 'use strict'; @@ -36,12 +34,16 @@ module.exports = function symbolMember(babel) { t.conditionalExpression( t.binaryExpression( '===', - t.unaryExpression('typeof', t.identifier('Symbol'), true), - t.stringLiteral('function'), + t.unaryExpression( + 'typeof', + t.identifier('Symbol'), + true + ), + t.stringLiteral('function') ), node, - t.stringLiteral(`@@${node.property.name}`), - ), + t.stringLiteral(`@@${node.property.name}`) + ) ); // We should stop to avoid infinite recursion, since Babel @@ -55,10 +57,8 @@ module.exports = function symbolMember(babel) { function isAppropriateMember(path) { let node = path.node; - return ( - path.parentPath.type !== 'AssignmentExpression' && + return path.parentPath.type !== 'AssignmentExpression' && node.object.type === 'Identifier' && node.object.name === 'Symbol' && - node.property.type === 'Identifier' - ); + node.property.type === 'Identifier'; } diff --git a/bots/code-analysis-bot.js b/bots/code-analysis-bot.js index 2bd4323d7..0c3a8bdda 100644 --- a/bots/code-analysis-bot.js +++ b/bots/code-analysis-bot.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; @@ -19,9 +17,7 @@ if (!process.env.CI_REPO) { process.exit(1); } if (!process.env.GITHUB_TOKEN) { - console.error( - 'Missing GITHUB_TOKEN. Example: 5fd88b964fa214c4be2b144dc5af5d486a2f8c1e', - ); + console.error('Missing GITHUB_TOKEN. Example: 5fd88b964fa214c4be2b144dc5af5d486a2f8c1e'); process.exit(1); } if (!process.env.PULL_REQUEST_NUMBER) { @@ -96,7 +92,7 @@ var converters = { }); }); }); - }, + } }; function getShaFromPullRequest(user, repo, number, callback) { @@ -124,6 +120,7 @@ function getFilesFromCommit(user, repo, sha, callback) { }); } + /** * Sadly we can't just give the line number to github, we have to give the * line number relative to the patch file which is super annoying. This @@ -135,7 +132,7 @@ function getLineMapFromPatch(patchString) { var fileLineIndex = 0; var lineMap = {}; - patchString.split('\n').forEach(line => { + patchString.split('\n').forEach((line) => { if (line.match(/^@@/)) { fileLineIndex = line.match(/\+([0-9]+)/)[1] - 1; return; @@ -184,27 +181,27 @@ function main(messages, user, repo, number) { return; } - getShaFromPullRequest(user, repo, number, sha => { - getFilesFromCommit(user, repo, sha, files => { - files.filter(file => messages[file.filename]).forEach(file => { - // github api sometimes does not return a patch on large commits - if (!file.patch) { - return; - } - var lineMap = getLineMapFromPatch(file.patch); - messages[file.filename].forEach(message => { - sendComment(user, repo, number, sha, file.filename, lineMap, message); + getShaFromPullRequest(user, repo, number, (sha) => { + getFilesFromCommit(user, repo, sha, (files) => { + files + .filter((file) => messages[file.filename]) + .forEach((file) => { + // github api sometimes does not return a patch on large commits + if (!file.patch) { + return; + } + var lineMap = getLineMapFromPatch(file.patch); + messages[file.filename].forEach((message) => { + sendComment(user, repo, number, sha, file.filename, lineMap, message); + }); }); - }); }); }); } var content = ''; process.stdin.resume(); -process.stdin.on('data', function(buf) { - content += buf.toString(); -}); +process.stdin.on('data', function(buf) { content += buf.toString(); }); process.stdin.on('end', function() { var messages = {}; diff --git a/cli.js b/cli.js index 197e49350..88837275f 100644 --- a/cli.js +++ b/cli.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; diff --git a/jest/mockComponent.js b/jest/mockComponent.js index 5cbd4fcf9..bb63a3e3e 100644 --- a/jest/mockComponent.js +++ b/jest/mockComponent.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; @@ -19,7 +17,7 @@ module.exports = moduleName => { const name = RealComponent.displayName || RealComponent.name; return React.createElement( - name.replace(/^(RCT|RK)/, ''), + name.replace(/^(RCT|RK)/,''), this.props, this.props.children, ); diff --git a/jest/preprocessor.js b/jest/preprocessor.js index 3d57b421a..50962fd12 100644 --- a/jest/preprocessor.js +++ b/jest/preprocessor.js @@ -6,7 +6,7 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @format + * @flow */ /* eslint-env node */ @@ -17,18 +17,22 @@ const babel = require('babel-core'); const babelRegisterOnly = require('metro-bundler/src/babelRegisterOnly'); const createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction'); -const nodeFiles = RegExp(['/local-cli/', '/metro-bundler/'].join('|')); +const nodeFiles = RegExp([ + '/local-cli/', + '/metro-bundler/', +].join('|')); const nodeOptions = babelRegisterOnly.config([nodeFiles]); babelRegisterOnly([]); const transformer = require('metro-bundler/src/transformer.js'); module.exports = { - process(src, file) { - if (nodeFiles.test(file)) { - // node specific transforms only - return babel.transform(src, Object.assign({filename: file}, nodeOptions)) - .code; + process(src/*: string*/, file/*: string*/) { + if (nodeFiles.test(file)) { // node specific transforms only + return babel.transform( + src, + Object.assign({filename: file}, nodeOptions) + ).code; } return transformer.transform({ diff --git a/jest/setup.js b/jest/setup.js index b2f6db83b..a24fbd6ea 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; @@ -19,9 +17,7 @@ require.requireActual('metro-bundler/src/Resolver/polyfills/error-guard'); global.__DEV__ = true; global.Promise = require.requireActual('promise'); -global.regeneratorRuntime = require.requireActual( - 'regenerator-runtime/runtime', -); +global.regeneratorRuntime = require.requireActual('regenerator-runtime/runtime'); global.requestAnimationFrame = function(callback) { setTimeout(callback, 0); @@ -30,7 +26,9 @@ global.cancelAnimationFrame = function(id) { clearTimeout(id); }; -jest.mock('setupDevtools').mock('npmlog'); +jest + .mock('setupDevtools') + .mock('npmlog'); // there's a __mock__ for it. jest.setMock('ErrorUtils', require('ErrorUtils')); @@ -44,7 +42,10 @@ jest .mock('View', () => mockComponent('View')) .mock('RefreshControl', () => require.requireMock('RefreshControlMock')) .mock('ScrollView', () => require.requireMock('ScrollViewMock')) - .mock('ActivityIndicator', () => mockComponent('ActivityIndicator')) + .mock( + 'ActivityIndicator', + () => mockComponent('ActivityIndicator'), + ) .mock('ListView', () => require.requireMock('ListViewMock')) .mock('ListViewDataSource', () => { const DataSource = require.requireActual('ListViewDataSource'); @@ -54,9 +55,9 @@ jest // Ensure this doesn't throw. try { Object.keys(dataBlob).forEach(key => { - this.items += - dataBlob[key] && - (dataBlob[key].length || dataBlob[key].size || 0); + this.items += dataBlob[key] && ( + dataBlob[key].length || dataBlob[key].size || 0 + ); }); } catch (e) { this.items = 'unknown'; @@ -78,18 +79,10 @@ const mockNativeModules = { addEventListener: jest.fn(), }, AsyncLocalStorage: { - multiGet: jest.fn((keys, callback) => - process.nextTick(() => callback(null, [])), - ), - multiSet: jest.fn((entries, callback) => - process.nextTick(() => callback(null)), - ), - multiRemove: jest.fn((keys, callback) => - process.nextTick(() => callback(null)), - ), - multiMerge: jest.fn((entries, callback) => - process.nextTick(() => callback(null)), - ), + multiGet: jest.fn((keys, callback) => process.nextTick(() => callback(null, []))), + multiSet: jest.fn((entries, callback) => process.nextTick(() => callback(null))), + multiRemove: jest.fn((keys, callback) => process.nextTick(() => callback(null))), + multiMerge: jest.fn((entries, callback) => process.nextTick(() => callback(null))), clear: jest.fn(callback => process.nextTick(() => callback(null))), getAllKeys: jest.fn(callback => process.nextTick(() => callback(null, []))), }, @@ -130,12 +123,14 @@ const mockNativeModules = { }), }, ImageLoader: { - getSize: jest.fn(url => new Promise(() => ({width: 320, height: 240}))), + getSize: jest.fn( + (url) => new Promise(() => ({width: 320, height: 240})) + ), prefetchImage: jest.fn(), }, ImageViewManager: { - getSize: jest.fn((uri, success) => - process.nextTick(() => success(320, 240)), + getSize: jest.fn( + (uri, success) => process.nextTick(() => success(320, 240)) ), prefetchImage: jest.fn(), }, @@ -145,9 +140,13 @@ const mockNativeModules = { }, Linking: { openURL: jest.fn(), - canOpenURL: jest.fn(() => new Promise(resolve => resolve(true))), + canOpenURL: jest.fn( + () => new Promise((resolve) => resolve(true)) + ), addEventListener: jest.fn(), - getInitialURL: jest.fn(() => new Promise(resolve => resolve())), + getInitialURL: jest.fn( + () => new Promise((resolve) => resolve()) + ), removeEventListener: jest.fn(), }, LocationObserver: { @@ -157,10 +156,14 @@ const mockNativeModules = { }, ModalFullscreenViewManager: {}, NetInfo: { - fetch: jest.fn(() => new Promise(resolve => resolve())), + fetch: jest.fn( + () => new Promise((resolve) => resolve()) + ), addEventListener: jest.fn(), isConnected: { - fetch: jest.fn(() => new Promise(resolve => resolve())), + fetch: jest.fn( + () => new Promise((resolve) => resolve()) + ), addEventListener: jest.fn(), }, }, @@ -178,20 +181,12 @@ const mockNativeModules = { getDeliveredNotifications: jest.fn(callback => process.nextTick(() => [])), removeDeliveredNotifications: jest.fn(), setApplicationIconBadgeNumber: jest.fn(), - getApplicationIconBadgeNumber: jest.fn(callback => - process.nextTick(() => callback(0)), - ), + getApplicationIconBadgeNumber: jest.fn(callback => process.nextTick(() => callback(0))), cancelLocalNotifications: jest.fn(), - getScheduledLocalNotifications: jest.fn(callback => - process.nextTick(() => callback()), - ), - requestPermissions: jest.fn(() => - Promise.resolve({alert: true, badge: true, sound: true}), - ), + getScheduledLocalNotifications: jest.fn(callback => process.nextTick(() => callback())), + requestPermissions: jest.fn(() => Promise.resolve({alert: true, badge: true, sound: true})), abandonPermissions: jest.fn(), - checkPermissions: jest.fn(callback => - process.nextTick(() => callback({alert: true, badge: true, sound: true})), - ), + checkPermissions: jest.fn(callback => process.nextTick(() => callback({alert: true, badge: true, sound: true}))), getInitialNotification: jest.fn(() => Promise.resolve(null)), addListener: jest.fn(), removeListeners: jest.fn(), @@ -271,6 +266,9 @@ jest jest.doMock('requireNativeComponent', () => { const React = require('react'); - return viewName => props => - React.createElement(viewName, props, props.children); + return viewName => props => React.createElement( + viewName, + props, + props.children, + ); }); diff --git a/lib/InitializeJavaScriptAppEngine.js b/lib/InitializeJavaScriptAppEngine.js index 2b2cd1f51..c560dccac 100644 --- a/lib/InitializeJavaScriptAppEngine.js +++ b/lib/InitializeJavaScriptAppEngine.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/lib/RCTEventEmitter.js b/lib/RCTEventEmitter.js index c4ef5c7cd..b48677174 100644 --- a/lib/RCTEventEmitter.js +++ b/lib/RCTEventEmitter.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/lib/TextInputState.js b/lib/TextInputState.js index bbdeddb96..74f58bb27 100644 --- a/lib/TextInputState.js +++ b/lib/TextInputState.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/lib/UIManager.js b/lib/UIManager.js index 29b41c155..bf87c346c 100644 --- a/lib/UIManager.js +++ b/lib/UIManager.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/lib/UIManagerStatTracker.js b/lib/UIManagerStatTracker.js index 36a0cd507..6c66a0420 100644 --- a/lib/UIManagerStatTracker.js +++ b/lib/UIManagerStatTracker.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/lib/View.js b/lib/View.js index 5ac346b8b..5174bdea4 100644 --- a/lib/View.js +++ b/lib/View.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/lib/deepDiffer.js b/lib/deepDiffer.js index 67eb9f5b3..e7584bc64 100644 --- a/lib/deepDiffer.js +++ b/lib/deepDiffer.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/lib/deepFreezeAndThrowOnMutationInDev.js b/lib/deepFreezeAndThrowOnMutationInDev.js index e33feeabb..acee5bff5 100644 --- a/lib/deepFreezeAndThrowOnMutationInDev.js +++ b/lib/deepFreezeAndThrowOnMutationInDev.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/lib/flattenStyle.js b/lib/flattenStyle.js index 58a043cbb..e4dfd4670 100644 --- a/lib/flattenStyle.js +++ b/lib/flattenStyle.js @@ -7,7 +7,6 @@ * of patent rights can be found in the PATENTS file in the same directory. * * @flow - * @format */ 'use strict'; diff --git a/react-native-cli/index.js b/react-native-cli/index.js index 32eb42118..4de761a7f 100755 --- a/react-native-cli/index.js +++ b/react-native-cli/index.js @@ -7,8 +7,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @noformat */ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/react-native-git-upgrade/cli.js b/react-native-git-upgrade/cli.js index fdd7351c8..f664d9583 100644 --- a/react-native-git-upgrade/cli.js +++ b/react-native-git-upgrade/cli.js @@ -5,18 +5,16 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; require('babel-register')({ presets: [ require('babel-preset-es2015-node'), - require('babel-preset-stage-3'), + require('babel-preset-stage-3') ], // Enable transpiling for react-native-git-upgrade AND the generator, just like the upgrade CLI command does - only: /(react-native-git-upgrade\/(?!(node_modules)))|(local-cli\/generator)/, + only: /(react-native-git-upgrade\/(?!(node_modules)))|(local-cli\/generator)/ }); var cliEntry = require('./cliEntry'); diff --git a/react-native-git-upgrade/index.js b/react-native-git-upgrade/index.js index 4a11ef96b..c676a7a65 100644 --- a/react-native-git-upgrade/index.js +++ b/react-native-git-upgrade/index.js @@ -7,34 +7,30 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ var argv = require('minimist')(process.argv.slice(2)); var cli = require('./cli'); if (argv._.length === 0 && (argv.h || argv.help)) { - console.log( - [ - '', - ' Usage: react-native-git-upgrade [version] [options]', - '', - '', - ' Commands:', - '', - ' [Version] upgrades React Native and app templates to the desired version', - ' (latest, if not specified)', - '', - ' Options:', - '', - ' -h, --help output usage information', - ' -v, --version output the version number', - ' --verbose output debugging info', - ' --npm force using the npm client even if your project uses yarn', - '', - ].join('\n'), - ); + console.log([ + '', + ' Usage: react-native-git-upgrade [version] [options]', + '', + '', + ' Commands:', + '', + ' [Version] upgrades React Native and app templates to the desired version', + ' (latest, if not specified)', + '', + ' Options:', + '', + ' -h, --help output usage information', + ' -v, --version output the version number', + ' --verbose output debugging info', + ' --npm force using the npm client even if your project uses yarn', + '', + ].join('\n')); process.exit(0); } @@ -43,4 +39,5 @@ if (argv._.length === 0 && (argv.v || argv.version)) { process.exit(0); } -cli.run(argv._[0], argv).catch(console.error); +cli.run(argv._[0], argv) + .catch(console.error); diff --git a/react-native-git-upgrade/yarn.js b/react-native-git-upgrade/yarn.js index cc30739b0..7dda2501d 100644 --- a/react-native-git-upgrade/yarn.js +++ b/react-native-git-upgrade/yarn.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict'; @@ -26,8 +24,7 @@ function getYarnVersionIfAvailable() { if (process.platform.startsWith('win')) { yarnVersion = (execSync('yarn --version').toString() || '').trim(); } else { - yarnVersion = (execSync('yarn --version 2>/dev/null').toString() || '') - .trim(); + yarnVersion = (execSync('yarn --version 2>/dev/null').toString() || '').trim(); } } catch (error) { return null; diff --git a/rn-cli.config.js b/rn-cli.config.js index 41705e60e..a03254b8b 100644 --- a/rn-cli.config.js +++ b/rn-cli.config.js @@ -5,8 +5,6 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. - * - * @format */ 'use strict';