Fix failing Prettier command (#10268)
* Ran prettier over non-modified files to change them * Fixed output of failing Prettier message to show invalid files * Failing Prettier command now suggests 'yarn prettier-all'
Brian Vaughn committed
Jul 24, 2017 at 13:59 UTC
171149a4b02a399a986c411b264515de45e70521
13 files changed
+28
-26
fixtures/dom/src/components/propTypes.js
+1
-1
@@ -8,7 +8,7 @@ export function semverString(props, propName, componentName) {
8
if (!error && version != null && !semver.valid(version))
9
error = new Error(
10
`\`${propName}\` should be a valid "semantic version" matching ` +
11
- 'an existing React version',
11
+ 'an existing React version'
12
);
13
14
return error || null;
fixtures/fiber-debugger/src/App.js
+1
-1
@@ -120,7 +120,7 @@ class App extends Component {
120
eval(
121
window.Babel.transform(code, {
122
presets: ['react', 'es2015'],
123
- }).code,
123
+ }).code
124
);
125
}
126
fixtures/fiber-debugger/src/Fibers.js
+2
-2
@@ -256,12 +256,12 @@ function formatPriority(priority) {
256
257
export default function Fibers({fibers, show, ...rest}) {
258
const items = Object.keys(fibers.descriptions).map(
259
- id => fibers.descriptions[id],
259
+ id => fibers.descriptions[id]
260
);
261
262
const isDragging = rest.className.indexOf('dragging') > -1;
263
const [_, sdx, sdy] = rest.style.transform.match(
264
- /translate\((-?\d+)px,(-?\d+)px\)/,
264
+ /translate\((-?\d+)px,(-?\d+)px\)/
265
) || [];
266
const dx = Number(sdx);
267
const dy = Number(sdy);
fixtures/packaging/browserify/dev/input.js
+1
-1
@@ -3,5 +3,5 @@ var ReactDOM = require('react-dom');
3
4
ReactDOM.render(
5
React.createElement('h1', null, 'Hello World!'),
6
- document.getElementById('container'),
6
+ document.getElementById('container')
7
);
fixtures/packaging/browserify/prod/input.js
+1
-1
@@ -3,5 +3,5 @@ var ReactDOM = require('react-dom');
3
4
ReactDOM.render(
5
React.createElement('h1', null, 'Hello World!'),
6
- document.getElementById('container'),
6
+ document.getElementById('container')
7
);
fixtures/packaging/brunch/dev/app/initialize.js
+1
-1
@@ -3,5 +3,5 @@ var ReactDOM = require('react-dom');
3
4
ReactDOM.render(
5
React.createElement('h1', null, 'Hello World!'),
6
- document.getElementById('container'),
6
+ document.getElementById('container')
7
);
fixtures/packaging/brunch/dev/input.js
+1
-1
@@ -3,5 +3,5 @@ var ReactDOM = require('react-dom');
3
4
ReactDOM.render(
5
React.createElement('h1', null, 'Hello World!'),
6
- document.getElementById('container'),
6
+ document.getElementById('container')
7
);
fixtures/packaging/brunch/prod/app/initialize.js
+1
-1
@@ -3,5 +3,5 @@ var ReactDOM = require('react-dom');
3
4
ReactDOM.render(
5
React.createElement('h1', null, 'Hello World!'),
6
- document.getElementById('container'),
6
+ document.getElementById('container')
7
);
fixtures/packaging/brunch/prod/input.js
+1
-1
@@ -3,5 +3,5 @@ var ReactDOM = require('react-dom');
3
4
ReactDOM.render(
5
React.createElement('h1', null, 'Hello World!'),
6
- document.getElementById('container'),
6
+ document.getElementById('container')
7
);
fixtures/packaging/rjs/dev/input.js
+1
-1
@@ -1,6 +1,6 @@
1
require(['react', 'react-dom'], function(React, ReactDOM) {
2
ReactDOM.render(
3
React.createElement('h1', null, 'Hello World!'),
4
- document.getElementById('container'),
4
+ document.getElementById('container')
5
);
6
});
fixtures/packaging/rjs/prod/input.js
+1
-1
@@ -1,6 +1,6 @@
1
require(['react', 'react-dom'], function(React, ReactDOM) {
2
ReactDOM.render(
3
React.createElement('h1', null, 'Hello World!'),
4
- document.getElementById('container'),
4
+ document.getElementById('container')
5
);
6
});
fixtures/ssr/server/index.js
+1
-1
@@ -40,7 +40,7 @@ if (process.env.NODE_ENV === 'development') {
40
proxy({
41
ws: true,
42
target: 'http://localhost:3001',
43
- }),
43
+ })
44
);
45
}
46
scripts/prettier/index.js
+15
-13
@@ -34,15 +34,11 @@ const defaultOptions = {
34
};
35
const config = {
36
default: {
37
- patterns: ['src/**/*.js', 'fixtures/**/*.js'],
38
- ignore: [
39
- '**/third_party/**',
40
- '**/node_modules/**',
41
- 'fixtures/packaging/**/*.js',
42
- ],
37
+ patterns: ['src/**/*.js'],
38
+ ignore: ['**/third_party/**', '**/node_modules/**'],
39
},
40
scripts: {
45
- patterns: ['scripts/**/*.js', 'fixtures/packaging/**/*.js'],
41
+ patterns: ['scripts/**/*.js', 'fixtures/**/*.js'],
42
ignore: ['scripts/bench/benchmarks/**'],
43
options: {
44
'trailing-comma': 'es5',
@@ -52,8 +48,13 @@ const config = {
48
49
function exec(command, args) {
50
console.log('> ' + [command].concat(args).join(' '));
55
- var options = {};
56
- return execFileSync(command, args, options).toString();
51
+ var options = {
52
+ cwd: process.cwd(),
53
+ env: process.env,
54
+ stdio: 'pipe',
55
+ encoding: 'utf-8',
56
+ };
57
+ return execFileSync(command, args, options);
58
}
59
60
var mergeBase = exec('git', ['merge-base', 'HEAD', 'master']).trim();
@@ -89,7 +90,7 @@ Object.keys(config).forEach(key => {
90
args.push(`--${shouldWrite ? 'write' : 'l'}`);
91
92
try {
92
- exec(prettierCmd, [...args, ...files]);
93
+ exec(prettierCmd, [...args, ...files]).trim();
94
} catch (e) {
95
if (!shouldWrite) {
96
console.log(
@@ -98,9 +99,10 @@ Object.keys(config).forEach(key => {
99
` This project uses prettier to format all JavaScript code.\n`
100
) +
101
chalk.dim(` Please run `) +
101
- chalk.reset('yarn prettier') +
102
- chalk.dim(` and add changes to files listed above to your commit.`) +
103
- `\n`
102
+ chalk.reset('yarn prettier-all') +
103
+ chalk.dim(` and add changes to files listed below to your commit:`) +
104
+ `\n\n` +
105
+ e.stdout
106
);
107
process.exit(1);
108
}