rename prettier option to prettierPath

TestUtils.js

@@ -90,7 +90,7 @@ const DEFAULT_PROJECT_CONFIG: ProjectConfig = {
   modulePathIgnorePatterns: [],
   modulePaths: [],
   name: 'test_name',
-  prettier: 'prettier',
+  prettierPath: 'prettier',
   resetMocks: false,
   resetModules: false,
   resolver: null,

docs/Configuration.md

@@ -402,7 +402,7 @@ Presets may also be relative filesystem paths.
 }
 ```
 
-### `prettier` [string]
+### `prettierPath` [string]
 
 Default: `'prettier'`
 

docs/SnapshotTesting.md

@@ -99,7 +99,7 @@ Inline snapshots behave identically to external snapshots (`.snap` files), excep
 
 > Inline snapshots are powered by [Prettier](https://prettier.io). To use inline snapshots you must have `prettier` installed in your project. Your Prettier configuration will be respected when writing to test files.
 >
-> If you have `prettier` installed in a location where Jest can't find it, you can tell Jest how to find it using the [`"prettier"`](./Configuration.md#prettier-string) configuration property.
+> If you have `prettier` installed in a location where Jest can't find it, you can tell Jest how to find it using the [`"prettierPath"`](./Configuration.md#prettierpath-string) configuration property.
 
 **Example:**
 

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

@@ -94,7 +94,8 @@ export const initialize = ({
   const {expand, updateSnapshot} = globalConfig;
   const snapshotState = new SnapshotState(testPath, {
     expand,
-    getPrettier: () => (config.prettier ? localRequire(config.prettier) : null),
+    getPrettier: () =>
+      config.prettierPath ? localRequire(config.prettierPath) : null,
     updateSnapshot,
   });
   setState({snapshotState, testPath});

packages/jest-cli/src/cli/args.js

@@ -424,7 +424,7 @@ export const options = {
     description: "A preset that is used as a base for Jest's configuration.",
     type: 'string',
   },
-  prettier: {
+  prettierPath: {
     default: 'prettier',
     description: 'The path to the "prettier" module used for inline snapshots.',
     type: 'string',

packages/jest-config/src/defaults.js

@@ -49,7 +49,7 @@ export default ({
   notify: false,
   notifyMode: 'always',
   preset: null,
-  prettier: 'prettier',
+  prettierPath: 'prettier',
   projects: null,
   resetMocks: false,
   resetModules: false,

packages/jest-config/src/index.js

@@ -173,7 +173,7 @@ const getConfigs = (
     modulePathIgnorePatterns: options.modulePathIgnorePatterns,
     modulePaths: options.modulePaths,
     name: options.name,
-    prettier: options.prettier,
+    prettierPath: options.prettierPath,
     resetMocks: options.resetMocks,
     resetModules: options.resetModules,
     resolver: options.resolver,

packages/jest-config/src/normalize.js

@@ -440,10 +440,10 @@ export default function normalize(options: InitialOptions, argv: Argv) {
             rootDir: options.rootDir,
           });
         break;
-      case 'prettier':
-        // We only want this to throw if "prettier" is explicitly passed from
-        // config or CLI, and the requested path isn't found. Otherwise we set
-        // it to null and throw an error lazily when it is used.
+      case 'prettierPath':
+        // We only want this to throw if "prettierPath" is explicitly passed
+        // from config or CLI, and the requested path isn't found. Otherwise we
+        // set it to null and throw an error lazily when it is used.
         value =
           options[key] &&
           resolve(newOptions.resolver, {

packages/jest-config/src/valid_config.js

@@ -65,7 +65,7 @@ export default ({
   notifyMode: 'always',
   onlyChanged: false,
   preset: 'react-native',
-  prettier: '<rootDir>/node_modules/prettier',
+  prettierPath: '<rootDir>/node_modules/prettier',
   projects: ['project-a', 'project-b/'],
   reporters: [
     'default',

packages/jest-jasmine2/src/setup_jest_globals.js

@@ -100,7 +100,8 @@ export default ({
   const {expand, updateSnapshot} = globalConfig;
   const snapshotState = new SnapshotState(testPath, {
     expand,
-    getPrettier: () => (config.prettier ? localRequire(config.prettier) : null),
+    getPrettier: () =>
+      config.prettierPath ? localRequire(config.prettierPath) : null,
     updateSnapshot,
   });
   setState({snapshotState, testPath});

packages/jest-validate/src/__tests__/fixtures/jest_config.js

@@ -41,7 +41,7 @@ const defaultConfig = {
   notify: false,
   notifyMode: 'always',
   preset: null,
-  prettier: 'prettier',
+  prettierPath: 'prettier',
   resetMocks: false,
   resetModules: false,
   restoreMocks: false,
@@ -100,7 +100,7 @@ const validConfig = {
   notify: false,
   notifyMode: 'always',
   preset: 'react-native',
-  prettier: '<rootDir>/node_modules/prettier',
+  prettierPath: '<rootDir>/node_modules/prettier',
   resetMocks: false,
   resetModules: false,
   restoreMocks: false,

types/Config.js

@@ -53,7 +53,7 @@ export type DefaultOptions = {|
   notify: boolean,
   notifyMode: string,
   preset: ?string,
-  prettier: ?string,
+  prettierPath: ?string,
   projects: ?Array<string | ProjectConfig>,
   resetMocks: boolean,
   resetModules: boolean,
@@ -136,7 +136,7 @@ export type InitialOptions = {
   passWithNoTests?: boolean,
   preprocessorIgnorePatterns?: Array<Glob>,
   preset?: ?string,
-  prettier?: ?string,
+  prettierPath?: ?string,
   projects?: Array<Glob>,
   replname?: ?string,
   resetMocks?: boolean,
@@ -261,7 +261,7 @@ export type ProjectConfig = {|
   modulePathIgnorePatterns: Array<string>,
   modulePaths: Array<string>,
   name: string,
-  prettier: string,
+  prettierPath: string,
   resetMocks: boolean,
   resetModules: boolean,
   resolver: ?Path,

types/HasteMap.js

@@ -47,7 +47,6 @@ export type RawModuleMap = {|
   mocks: MockData,
 |};
 
-// prettier-ignore
 export type FileMetaData = [
   /* id */ string,
   /* mtime */ number,