Skip to content
This repository was archived by the owner on Jan 26, 2019. It is now read-only.

Commit 10bd98c

Browse files
gaearonwmonk
gaearon
authored and
wmonk
committed
Reformat source code with Prettier 1.5.2
1 parent 25ca9ac commit 10bd98c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+420
-270
lines changed

‎packages/create-react-app/createReactApp.js

+33-13
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,14 @@ const program = new commander.Command(packageJson.name)
7474
);
7575
console.log(` - a specific npm version: ${chalk.green('0.8.2')}`);
7676
console.log(
77-
` - a custom fork published on npm: ${chalk.green('my-react-scripts')}`
77+
` - a custom fork published on npm: ${chalk.green(
78+
'my-react-scripts'
79+
)}`
7880
);
7981
console.log(
80-
` - a .tgz archive: ${chalk.green('https://mysite.com/my-react-scripts-0.8.2.tgz')}`
82+
` - a .tgz archive: ${chalk.green(
83+
'https://mysite.com/my-react-scripts-0.8.2.tgz'
84+
)}`
8185
);
8286
console.log(
8387
` It is not needed unless you specifically want to use a fork.`
@@ -87,7 +91,9 @@ const program = new commander.Command(packageJson.name)
8791
` If you have any problems, do not hesitate to file an issue:`
8892
);
8993
console.log(
90-
` ${chalk.cyan('https://github.com/facebookincubator/create-react-app/issues/new')}`
94+
` ${chalk.cyan(
95+
'https://github.com/facebookincubator/create-react-app/issues/new'
96+
)}`
9197
);
9298
console.log();
9399
})
@@ -258,15 +264,19 @@ function run(
258264

259265
console.log('Installing packages. This might take a couple of minutes.');
260266
getPackageName(packageToInstall)
261-
.then(packageName => checkIfOnline(useYarn).then(isOnline => ({
262-
isOnline: isOnline,
263-
packageName: packageName,
264-
})))
267+
.then(packageName =>
268+
checkIfOnline(useYarn).then(isOnline => ({
269+
isOnline: isOnline,
270+
packageName: packageName,
271+
}))
272+
)
265273
.then(info => {
266274
const isOnline = info.isOnline;
267275
const packageName = info.packageName;
268276
console.log(
269-
`Installing ${chalk.cyan('react')}, ${chalk.cyan('react-dom')}, and ${chalk.cyan(packageName)}...`
277+
`Installing ${chalk.cyan('react')}, ${chalk.cyan(
278+
'react-dom'
279+
)}, and ${chalk.cyan(packageName)}...`
270280
);
271281
console.log();
272282

@@ -334,7 +344,9 @@ function run(
334344
if (!remainingFiles.length) {
335345
// Delete target folder if empty
336346
console.log(
337-
`Deleting ${chalk.cyan(`${appName} /`)} from ${chalk.cyan(path.resolve(root, '..'))}`
347+
`Deleting ${chalk.cyan(`${appName} /`)} from ${chalk.cyan(
348+
path.resolve(root, '..')
349+
)}`
338350
);
339351
process.chdir(path.resolve(root, '..'));
340352
fs.removeSync(path.join(root));
@@ -422,7 +434,9 @@ function getPackageName(installPackage) {
422434
/^.+\/(.+?)(?:-\d+.+)?\.tgz$/
423435
)[1];
424436
console.log(
425-
`Based on the filename, assuming it is "${chalk.cyan(assumedProjectName)}"`
437+
`Based on the filename, assuming it is "${chalk.cyan(
438+
assumedProjectName
439+
)}"`
426440
);
427441
return Promise.resolve(assumedProjectName);
428442
});
@@ -485,7 +499,9 @@ function checkAppName(appName) {
485499
const validationResult = validateProjectName(appName);
486500
if (!validationResult.validForNewPackages) {
487501
console.error(
488-
`Could not create a project called ${chalk.red(`"${appName}"`)} because of npm naming restrictions:`
502+
`Could not create a project called ${chalk.red(
503+
`"${appName}"`
504+
)} because of npm naming restrictions:`
489505
);
490506
printValidationResults(validationResult.errors);
491507
printValidationResults(validationResult.warnings);
@@ -497,7 +513,9 @@ function checkAppName(appName) {
497513
if (dependencies.indexOf(appName) >= 0) {
498514
console.error(
499515
chalk.red(
500-
`We cannot create a project called ${chalk.green(appName)} because a dependency with the same name exists.\n` +
516+
`We cannot create a project called ${chalk.green(
517+
appName
518+
)} because a dependency with the same name exists.\n` +
501519
`Due to the way npm works, the following names are not allowed:\n\n`
502520
) +
503521
chalk.cyan(dependencies.map(depName => ` ${depName}`).join('\n')) +
@@ -519,7 +537,9 @@ function makeCaretRange(dependencies, name) {
519537

520538
if (!semver.validRange(patchedVersion)) {
521539
console.error(
522-
`Unable to patch ${name} dependency version because version ${chalk.red(version)} will become invalid ${chalk.red(patchedVersion)}`
540+
`Unable to patch ${name} dependency version because version ${chalk.red(
541+
version
542+
)} will become invalid ${chalk.red(patchedVersion)}`
523543
);
524544
patchedVersion = version;
525545
}

‎packages/eslint-config-react-app/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ module.exports = {
236236
{
237237
object: 'System',
238238
property: 'import',
239-
message: 'Please use import() instead. More info: https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#code-splitting',
239+
message:
240+
'Please use import() instead. More info: https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#code-splitting',
240241
},
241242
],
242243

‎packages/react-dev-utils/FileSizeReporter.js

+6-9
Original file line numberDiff line numberDiff line change
@@ -119,15 +119,12 @@ function measureFileSizesBeforeBuild(buildFolder) {
119119
if (!err && fileNames) {
120120
sizes = fileNames
121121
.filter(fileName => /\.(js|css)$/.test(fileName))
122-
.reduce(
123-
(memo, fileName) => {
124-
var contents = fs.readFileSync(fileName);
125-
var key = removeFileNameHash(buildFolder, fileName);
126-
memo[key] = gzipSize(contents);
127-
return memo;
128-
},
129-
{}
130-
);
122+
.reduce((memo, fileName) => {
123+
var contents = fs.readFileSync(fileName);
124+
var key = removeFileNameHash(buildFolder, fileName);
125+
memo[key] = gzipSize(contents);
126+
return memo;
127+
}, {});
131128
}
132129
resolve({
133130
root: buildFolder,

‎packages/react-dev-utils/ModuleScopePlugin.js

+14-7
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ class ModuleScopePlugin {
3737
// Maybe an indexOf === 0 would be better?
3838
const relative = path.relative(appSrc, request.context.issuer);
3939
// If it's not in src/ or a subdirectory, not our request!
40-
if (
41-
relative.startsWith('../') ||
42-
relative.startsWith('..\\')
43-
) {
40+
if (relative.startsWith('../') || relative.startsWith('..\\')) {
4441
return callback();
4542
}
4643
// Find path from src to the requested file
@@ -58,9 +55,19 @@ class ModuleScopePlugin {
5855
) {
5956
callback(
6057
new Error(
61-
`You attempted to import ${chalk.cyan(request.__innerRequest_request)} which falls outside of the project ${chalk.cyan('src/')} directory. ` +
62-
`Relative imports outside of ${chalk.cyan('src/')} are not supported. ` +
63-
`You can either move it inside ${chalk.cyan('src/')}, or add a symlink to it from project's ${chalk.cyan('node_modules/')}.`
58+
`You attempted to import ${chalk.cyan(
59+
request.__innerRequest_request
60+
)} which falls outside of the project ${chalk.cyan(
61+
'src/'
62+
)} directory. ` +
63+
`Relative imports outside of ${chalk.cyan(
64+
'src/'
65+
)} are not supported. ` +
66+
`You can either move it inside ${chalk.cyan(
67+
'src/'
68+
)}, or add a symlink to it from project's ${chalk.cyan(
69+
'node_modules/'
70+
)}.`
6471
),
6572
request
6673
);

‎packages/react-dev-utils/WebpackDevServerUtils.js

+52-47
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,20 @@ if (isSmokeTest) {
3737
}
3838

3939
function prepareUrls(protocol, host, port) {
40-
const formatUrl = hostname => url.format({
41-
protocol,
42-
hostname,
43-
port,
44-
pathname: '/',
45-
});
46-
const prettyPrintUrl = hostname => url.format({
47-
protocol,
48-
hostname,
49-
port: chalk.bold(port),
50-
pathname: '/',
51-
});
40+
const formatUrl = hostname =>
41+
url.format({
42+
protocol,
43+
hostname,
44+
port,
45+
pathname: '/',
46+
});
47+
const prettyPrintUrl = hostname =>
48+
url.format({
49+
protocol,
50+
hostname,
51+
port: chalk.bold(port),
52+
pathname: '/',
53+
});
5254

5355
const isUnspecifiedHost = host === '0.0.0.0' || host === '::';
5456
let prettyHost, lanUrlForConfig, lanUrlForTerminal;
@@ -317,9 +319,11 @@ function prepareProxy(proxy, appPublicFolder) {
317319
// However API calls like `fetch()` won’t generally accept text/html.
318320
// If this heuristic doesn’t work well for you, use a custom `proxy` object.
319321
context: function(pathname, req) {
320-
return mayProxy(pathname) &&
322+
return (
323+
mayProxy(pathname) &&
321324
req.headers.accept &&
322-
req.headers.accept.indexOf('text/html') === -1;
325+
req.headers.accept.indexOf('text/html') === -1
326+
);
323327
},
324328
onProxyReq: proxyReq => {
325329
// Browers may send Origin headers even with same-origin
@@ -375,39 +379,40 @@ function prepareProxy(proxy, appPublicFolder) {
375379

376380
function choosePort(host, defaultPort) {
377381
return detect(defaultPort, host).then(
378-
port => new Promise(resolve => {
379-
if (port === defaultPort) {
380-
return resolve(port);
381-
}
382-
const message = process.platform !== 'win32' &&
383-
defaultPort < 1024 &&
384-
!isRoot()
385-
? `Admin permissions are required to run a server on a port below 1024.`
386-
: `Something is already running on port ${defaultPort}.`;
387-
if (isInteractive) {
388-
clearConsole();
389-
const existingProcess = getProcessForPort(defaultPort);
390-
const question = {
391-
type: 'confirm',
392-
name: 'shouldChangePort',
393-
message: chalk.yellow(
394-
message +
395-
`${existingProcess ? ` Probably:\n ${existingProcess}` : ''}`
396-
) + '\n\nWould you like to run the app on another port instead?',
397-
default: true,
398-
};
399-
inquirer.prompt(question).then(answer => {
400-
if (answer.shouldChangePort) {
401-
resolve(port);
402-
} else {
403-
resolve(null);
404-
}
405-
});
406-
} else {
407-
console.log(chalk.red(message));
408-
resolve(null);
409-
}
410-
}),
382+
port =>
383+
new Promise(resolve => {
384+
if (port === defaultPort) {
385+
return resolve(port);
386+
}
387+
const message =
388+
process.platform !== 'win32' && defaultPort < 1024 && !isRoot()
389+
? `Admin permissions are required to run a server on a port below 1024.`
390+
: `Something is already running on port ${defaultPort}.`;
391+
if (isInteractive) {
392+
clearConsole();
393+
const existingProcess = getProcessForPort(defaultPort);
394+
const question = {
395+
type: 'confirm',
396+
name: 'shouldChangePort',
397+
message:
398+
chalk.yellow(
399+
message +
400+
`${existingProcess ? ` Probably:\n ${existingProcess}` : ''}`
401+
) + '\n\nWould you like to run the app on another port instead?',
402+
default: true,
403+
};
404+
inquirer.prompt(question).then(answer => {
405+
if (answer.shouldChangePort) {
406+
resolve(port);
407+
} else {
408+
resolve(null);
409+
}
410+
});
411+
} else {
412+
console.log(chalk.red(message));
413+
resolve(null);
414+
}
415+
}),
411416
err => {
412417
throw new Error(
413418
chalk.red(`Could not find an open port at ${chalk.bold(host)}.`) +

‎packages/react-dev-utils/ansiHTML.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ function ansiHTML(txt) {
6969
var open = false;
7070
for (var index = 0; index < arr.length; ++index) {
7171
var c = arr[index];
72-
var content = c.content, fg = c.fg;
72+
var content = c.content,
73+
fg = c.fg;
7374

7475
var contentParts = content.split('\n');
7576
for (var _index = 0; _index < contentParts.length; ++_index) {

‎packages/react-dev-utils/eslintFormatter.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ function formatter(results) {
8282
// it here because we always show at most one error, and
8383
// we can only be sure it's an ESLint error before exiting
8484
// this function.
85-
output += 'Search for the ' +
85+
output +=
86+
'Search for the ' +
8687
chalk.underline(chalk.red('keywords')) +
8788
' to learn more about each error.';
8889
}

‎packages/react-dev-utils/launchEditor.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,13 @@ function isTerminalEditor(editor) {
3030
// of the app every time
3131
const COMMON_EDITORS_OSX = {
3232
'/Applications/Atom.app/Contents/MacOS/Atom': 'atom',
33-
'/Applications/Atom Beta.app/Contents/MacOS/Atom Beta': '/Applications/Atom Beta.app/Contents/MacOS/Atom Beta',
33+
'/Applications/Atom Beta.app/Contents/MacOS/Atom Beta':
34+
'/Applications/Atom Beta.app/Contents/MacOS/Atom Beta',
3435
'/Applications/Brackets.app/Contents/MacOS/Brackets': 'brackets',
35-
'/Applications/Sublime Text.app/Contents/MacOS/Sublime Text': '/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl',
36-
'/Applications/Sublime Text 2.app/Contents/MacOS/Sublime Text 2': '/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl',
36+
'/Applications/Sublime Text.app/Contents/MacOS/Sublime Text':
37+
'/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl',
38+
'/Applications/Sublime Text 2.app/Contents/MacOS/Sublime Text 2':
39+
'/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl',
3740
'/Applications/Visual Studio Code.app/Contents/MacOS/Electron': 'code',
3841
};
3942

‎packages/react-dev-utils/openBrowser.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ function startBrowserProcess(browser, url) {
6868
// requested a different browser, we can try opening
6969
// Chrome with AppleScript. This lets us reuse an
7070
// existing tab when possible instead of creating a new one.
71-
const shouldTryOpenChromeWithAppleScript = process.platform === 'darwin' &&
71+
const shouldTryOpenChromeWithAppleScript =
72+
process.platform === 'darwin' &&
7273
(typeof browser !== 'string' || browser === OSX_CHROME);
7374

7475
if (shouldTryOpenChromeWithAppleScript) {

0 commit comments

Comments
 (0)