Upgrade to prettier 1.6 (#4426)

Author: SimenB

examples/react-native/__tests__/intro.test.js

@@ -51,10 +51,7 @@ it('renders the ListView component', () => {
     .create(
       <ListView
         dataSource={dataSource}
-        renderRow={rowData =>
-          <Text>
-            {rowData}
-          </Text>}
+        renderRow={rowData => <Text>{rowData}</Text>}
       />
     )
     .toJSON();

examples/snapshot/Clock.react.js

@@ -25,9 +25,7 @@ export default class Clock extends React.Component {
 
   render() {
     return (
-      <p>
-        {this.state.seconds} seconds have ellapsed since the UNIX epoch.
-      </p>
+      <p>{this.state.seconds} seconds have ellapsed since the UNIX epoch.</p>
     );
   }
 }

examples/snapshot/__tests__/link.react.test.js

@@ -21,11 +21,7 @@ it('renders as an anchor when no page is set', () => {
 
 it('properly escapes quotes', () => {
   const tree = renderer
-    .create(
-      <Link>
-        {"\"Facebook\" \\'is \\ 'awesome'"}
-      </Link>
-    )
+    .create(<Link>{"\"Facebook\" \\'is \\ 'awesome'"}</Link>)
     .toJSON();
   expect(tree).toMatchSnapshot();
 });

integration_tests/__tests__/env.test.js

@@ -11,7 +11,11 @@
 
 const runJest = require('../runJest');
 
-const getLog = result => result.stdout.toString().split('\n')[1].trim();
+const getLog = result =>
+  result.stdout
+    .toString()
+    .split('\n')[1]
+    .trim();
 
 describe('Environment override', () => {
   it('uses jsdom when specified', () => {

integration_tests/__tests__/jest_changed_files.test.js

@@ -148,7 +148,9 @@ test('gets changed files for git', async () => {
 
   let {changedFiles: files} = await getChangedFilesForRoots(roots, {});
   expect(
-    Array.from(files).map(filePath => path.basename(filePath)).sort(),
+    Array.from(files)
+      .map(filePath => path.basename(filePath))
+      .sort(),
   ).toEqual(['file1.txt', 'file2.txt', 'file3.txt']);
 
   run(`${GIT} add .`, DIR);
@@ -161,7 +163,9 @@ test('gets changed files for git', async () => {
     lastCommit: true,
   }));
   expect(
-    Array.from(files).map(filePath => path.basename(filePath)).sort(),
+    Array.from(files)
+      .map(filePath => path.basename(filePath))
+      .sort(),
   ).toEqual(['file1.txt', 'file2.txt', 'file3.txt']);
 
   writeFiles(DIR, {
@@ -170,7 +174,9 @@ test('gets changed files for git', async () => {
 
   ({changedFiles: files} = await getChangedFilesForRoots(roots, {}));
   expect(
-    Array.from(files).map(filePath => path.basename(filePath)).sort(),
+    Array.from(files)
+      .map(filePath => path.basename(filePath))
+      .sort(),
   ).toEqual(['file1.txt']);
 });
 
@@ -198,7 +204,9 @@ test('gets changed files for hg', async () => {
 
   let {changedFiles: files} = await getChangedFilesForRoots(roots, {});
   expect(
-    Array.from(files).map(filePath => path.basename(filePath)).sort(),
+    Array.from(files)
+      .map(filePath => path.basename(filePath))
+      .sort(),
   ).toEqual(['file1.txt', 'file2.txt', 'file3.txt']);
 
   run(`${HG} add .`, DIR);
@@ -211,7 +219,9 @@ test('gets changed files for hg', async () => {
     lastCommit: true,
   }));
   expect(
-    Array.from(files).map(filePath => path.basename(filePath)).sort(),
+    Array.from(files)
+      .map(filePath => path.basename(filePath))
+      .sort(),
   ).toEqual(['file1.txt', 'file2.txt', 'file3.txt']);
 
   writeFiles(DIR, {
@@ -220,7 +230,9 @@ test('gets changed files for hg', async () => {
 
   ({changedFiles: files} = await getChangedFilesForRoots(roots, {}));
   expect(
-    Array.from(files).map(filePath => path.basename(filePath)).sort(),
+    Array.from(files)
+      .map(filePath => path.basename(filePath))
+      .sort(),
   ).toEqual(['file1.txt']);
 
   run(`${HG} commit -m "test2"`, DIR);
@@ -234,6 +246,8 @@ test('gets changed files for hg', async () => {
   }));
   // Returns files from current uncommited state + the last commit
   expect(
-    Array.from(files).map(filePath => path.basename(filePath)).sort(),
+    Array.from(files)
+      .map(filePath => path.basename(filePath))
+      .sort(),
   ).toEqual(['file1.txt', 'file4.txt']);
 });

integration_tests/__tests__/list_tests.test.js

@@ -27,7 +27,10 @@ describe('--listTests flag', () => {
 
     expect(status).toBe(0);
     expect(
-      normalizePaths(stdout).split('\n').sort().join('\n'),
+      normalizePaths(stdout)
+        .split('\n')
+        .sort()
+        .join('\n'),
     ).toMatchSnapshot();
   });
 
@@ -37,7 +40,11 @@ describe('--listTests flag', () => {
     expect(status).toBe(0);
     expect(() => JSON.parse(stdout)).not.toThrow();
     expect(
-      JSON.stringify(JSON.parse(stdout).map(normalizePaths).sort()),
+      JSON.stringify(
+        JSON.parse(stdout)
+          .map(normalizePaths)
+          .sort(),
+      ),
     ).toMatchSnapshot();
   });
 });

package.json

@@ -25,14 +25,14 @@
     "debug": "^2.6.8",
     "enzyme": "^2.8.2",
     "eslint": "^4.2.0",
-    "eslint-config-prettier": "^2.3.0",
+    "eslint-config-prettier": "^2.4.0",
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-flowtype": "^2.35.0",
     "eslint-plugin-import": "^2.6.0",
     "eslint-plugin-jest": "^21.0.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-markdown": "^1.0.0-beta.6",
-    "eslint-plugin-prettier": "^2.1.2",
+    "eslint-plugin-prettier": "^2.2.0",
     "eslint-plugin-react": "^7.1.0",
     "eslint-plugin-relay": "0.0.8",
     "eslint-plugin-unicorn": "^2.1.2",
@@ -55,7 +55,7 @@
     "mkdirp": "^0.5.1",
     "mocha": "^3.4.2",
     "mock-fs": "^4.4.1",
-    "prettier": "^1.5.2",
+    "prettier": "^1.6.1",
     "progress": "^1.1.8",
     "react": "^15.4.2",
     "react-addons-test-utils": "15.4.2",

packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js

@@ -43,9 +43,12 @@ const initialize = ({
 
   // Jest tests snapshotSerializers in order preceding built-in serializers.
   // Therefore, add in reverse because the last added is the first tested.
-  config.snapshotSerializers.concat().reverse().forEach(path => {
-    addSerializer(localRequire(path));
-  });
+  config.snapshotSerializers
+    .concat()
+    .reverse()
+    .forEach(path => {
+      addSerializer(localRequire(path));
+    });
 
   const {expand, updateSnapshot} = globalConfig;
   const snapshotState = new SnapshotState(testPath, {expand, updateSnapshot});

packages/jest-cli/src/__tests__/watch_filename_pattern_mode.test.js

@@ -201,7 +201,10 @@ describe('Watch mode flows', () => {
     stdin.emit(KEYS.P);
     expect(pipe.write.mock.calls.join('\n')).toMatchSnapshot();
 
-    ['p'].map(toHex).concat(KEYS.ENTER).forEach(key => stdin.emit(key));
+    ['p']
+      .map(toHex)
+      .concat(KEYS.ENTER)
+      .forEach(key => stdin.emit(key));
 
     pipe.write.mockReset();
     stdin.emit(KEYS.P);
@@ -223,7 +226,10 @@ describe('Watch mode flows', () => {
     stdin.emit(KEYS.T);
     expect(pipe.write.mock.calls.join('\n')).toMatchSnapshot();
 
-    ['t'].map(toHex).concat(KEYS.ENTER).forEach(key => stdin.emit(key));
+    ['t']
+      .map(toHex)
+      .concat(KEYS.ENTER)
+      .forEach(key => stdin.emit(key));
 
     pipe.write.mockReset();
     stdin.emit(KEYS.T);

packages/jest-cli/src/reporters/coverage_reporter.js

@@ -202,7 +202,9 @@ class CoverageReporter extends BaseReporter {
       }
     };
 
-    return Promise.all(instrumentation).then(cleanup).catch(cleanup);
+    return Promise.all(instrumentation)
+      .then(cleanup)
+      .catch(cleanup);
   }
 
   _checkThreshold(globalConfig: GlobalConfig, map: CoverageMap) {