Skip to content

Commit fe7b5c2

Browse files
tuchk4gaearon
authored andcommitted
update to modern code style (#1738)
* mv create-react-app/index.js -> create-react-app/creteReactApp.js * update to modern code style * var -> cosnt * set trailing-coma to es5 for prettier
1 parent 43873dc commit fe7b5c2

Some content is hidden

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

66 files changed

+2021
-1647
lines changed

package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
"postinstall": "lerna bootstrap",
99
"publish": "tasks/release.sh",
1010
"start": "node packages/react-scripts/scripts/start.js",
11-
"test": "node packages/react-scripts/scripts/test.js --env=jsdom"
11+
"test": "node packages/react-scripts/scripts/test.js --env=jsdom",
12+
"format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'"
1213
},
1314
"devDependencies": {
1415
"eslint": "3.16.1",
1516
"lerna": "2.0.0-beta.38",
16-
"lerna-changelog": "^0.2.3"
17+
"lerna-changelog": "^0.2.3",
18+
"prettier": "^0.21.0"
1719
}
1820
}

packages/babel-preset-react-app/index.js

+60-40
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,30 @@ const plugins = [
1616
// The following two plugins use Object.assign directly, instead of Babel's
1717
// extends helper. Note that this assumes `Object.assign` is available.
1818
// { ...todo, completed: true }
19-
[require.resolve('babel-plugin-transform-object-rest-spread'), {
20-
useBuiltIns: true
21-
}],
19+
[
20+
require.resolve('babel-plugin-transform-object-rest-spread'),
21+
{
22+
useBuiltIns: true,
23+
},
24+
],
2225
// Transforms JSX
23-
[require.resolve('babel-plugin-transform-react-jsx'), {
24-
useBuiltIns: true
25-
}],
26+
[
27+
require.resolve('babel-plugin-transform-react-jsx'),
28+
{
29+
useBuiltIns: true,
30+
},
31+
],
2632
// Polyfills the runtime needed for async/await and generators
27-
[require.resolve('babel-plugin-transform-runtime'), {
28-
helpers: false,
29-
polyfill: false,
30-
regenerator: true,
31-
// Resolve the Babel runtime relative to the config.
32-
moduleName: path.dirname(require.resolve('babel-runtime/package'))
33-
}]
33+
[
34+
require.resolve('babel-plugin-transform-runtime'),
35+
{
36+
helpers: false,
37+
polyfill: false,
38+
regenerator: true,
39+
// Resolve the Babel runtime relative to the config.
40+
moduleName: path.dirname(require.resolve('babel-runtime/package')),
41+
},
42+
],
3443
];
3544

3645
// This is similar to how `env` works in Babel:
@@ -42,9 +51,11 @@ const plugins = [
4251
var env = process.env.BABEL_ENV || process.env.NODE_ENV;
4352
if (env !== 'development' && env !== 'test' && env !== 'production') {
4453
throw new Error(
45-
'Using `babel-preset-react-app` requires that you specify `NODE_ENV` or '+
46-
'`BABEL_ENV` environment variables. Valid values are "development", ' +
47-
'"test", and "production". Instead, received: ' + JSON.stringify(env) + '.'
54+
'Using `babel-preset-react-app` requires that you specify `NODE_ENV` or ' +
55+
'`BABEL_ENV` environment variables. Valid values are "development", ' +
56+
'"test", and "production". Instead, received: ' +
57+
JSON.stringify(env) +
58+
'.'
4859
);
4960
}
5061

@@ -59,54 +70,63 @@ if (env === 'development' || env === 'test') {
5970
// Adds component stack to warning messages
6071
require.resolve('babel-plugin-transform-react-jsx-source'),
6172
// Adds __self attribute to JSX which React will use for some warnings
62-
require.resolve('babel-plugin-transform-react-jsx-self')
73+
require.resolve('babel-plugin-transform-react-jsx-self'),
6374
]);
6475
}
6576

6677
if (env === 'test') {
6778
module.exports = {
6879
presets: [
6980
// ES features necessary for user's Node version
70-
[require('babel-preset-env').default, {
71-
targets: {
72-
node: 'current',
81+
[
82+
require('babel-preset-env').default,
83+
{
84+
targets: {
85+
node: 'current',
86+
},
7387
},
74-
}],
88+
],
7589
// JSX, Flow
76-
require.resolve('babel-preset-react')
90+
require.resolve('babel-preset-react'),
7791
],
7892
plugins: plugins.concat([
7993
// Compiles import() to a deferred require()
80-
require.resolve('babel-plugin-dynamic-import-node')
81-
])
94+
require.resolve('babel-plugin-dynamic-import-node'),
95+
]),
8296
};
8397
} else {
8498
module.exports = {
8599
presets: [
86100
// Latest stable ECMAScript features
87-
[require.resolve('babel-preset-env'), {
88-
targets: {
89-
// React parses on ie 9, so we should too
90-
ie: 9,
91-
// We currently minify with uglify
92-
// Remove after https://github.com/mishoo/UglifyJS2/issues/448
93-
uglify: true
101+
[
102+
require.resolve('babel-preset-env'),
103+
{
104+
targets: {
105+
// React parses on ie 9, so we should too
106+
ie: 9,
107+
// We currently minify with uglify
108+
// Remove after https://github.com/mishoo/UglifyJS2/issues/448
109+
uglify: true,
110+
},
111+
// Disable polyfill transforms
112+
useBuiltIns: false,
94113
},
95-
// Disable polyfill transforms
96-
useBuiltIns: false
97-
}],
114+
],
98115
// JSX, Flow
99-
require.resolve('babel-preset-react')
116+
require.resolve('babel-preset-react'),
100117
],
101118
plugins: plugins.concat([
102119
// function* () { yield 42; yield 43; }
103-
[require.resolve('babel-plugin-transform-regenerator'), {
104-
// Async functions are converted to generators by babel-preset-latest
105-
async: false
106-
}],
120+
[
121+
require.resolve('babel-plugin-transform-regenerator'),
122+
{
123+
// Async functions are converted to generators by babel-preset-latest
124+
async: false,
125+
},
126+
],
107127
// Adds syntax support for import()
108128
require.resolve('babel-plugin-syntax-dynamic-import'),
109-
])
129+
]),
110130
};
111131

112132
if (env === 'production') {

0 commit comments

Comments
 (0)