Skip to content

Commit 4487b56

Browse files
author
chenghao
committed
版本更新
1 parent 23d79a0 commit 4487b56

27 files changed

+3530
-2129
lines changed

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "react-app",
33
"rules": {
44
"no-multi-spaces": 1,
5-
"react/jsx-space-before-closing": 1, // 总是在自动关闭的标签前加一个空格,正常情况下也不需要换行
5+
"react/jsx-tag-spacing": 1, // 总是在自动关闭的标签前加一个空格,正常情况下也不需要换行
66
"jsx-quotes": 1,
77
"react/jsx-closing-bracket-___location": 1, // 遵循JSX语法缩进/格式
88
"react/jsx-boolean-value": 1, // 如果属性值为 true, 可以直接省略

config/env.js

Lines changed: 76 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,87 @@
11
'use strict';
22

3+
const fs = require('fs');
4+
const path = require('path');
5+
const paths = require('./paths');
6+
7+
// Make sure that including paths.js after env.js will read .env variables.
8+
delete require.cache[require.resolve('./paths')];
9+
10+
const NODE_ENV = process.env.NODE_ENV;
11+
if (!NODE_ENV) {
12+
throw new Error(
13+
'The NODE_ENV environment variable is required but was not specified.'
14+
);
15+
}
16+
17+
// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
18+
var dotenvFiles = [
19+
`${paths.dotenv}.${NODE_ENV}.local`,
20+
`${paths.dotenv}.${NODE_ENV}`,
21+
// Don't include `.env.local` for `test` environment
22+
// since normally you expect tests to produce the same
23+
// results for everyone
24+
NODE_ENV !== 'test' && `${paths.dotenv}.local`,
25+
paths.dotenv,
26+
].filter(Boolean);
27+
28+
// Load environment variables from .env* files. Suppress warnings using silent
29+
// if this file is missing. dotenv will never modify any environment variables
30+
// that have already been set.
31+
// https://github.com/motdotla/dotenv
32+
dotenvFiles.forEach(dotenvFile => {
33+
if (fs.existsSync(dotenvFile)) {
34+
require('dotenv').config({
35+
path: dotenvFile,
36+
});
37+
}
38+
});
39+
40+
// We support resolving modules according to `NODE_PATH`.
41+
// This lets you use absolute paths in imports inside large monorepos:
42+
// https://github.com/facebookincubator/create-react-app/issues/253.
43+
// It works similar to `NODE_PATH` in Node itself:
44+
// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
45+
// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
46+
// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
47+
// https://github.com/facebookincubator/create-react-app/issues/1023#issuecomment-265344421
48+
// We also resolve them to make sure all tools using them work consistently.
49+
const appDirectory = fs.realpathSync(process.cwd());
50+
process.env.NODE_PATH = (process.env.NODE_PATH || '')
51+
.split(path.delimiter)
52+
.filter(folder => folder && !path.isAbsolute(folder))
53+
.map(folder => path.resolve(appDirectory, folder))
54+
.join(path.delimiter);
55+
356
// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
457
// injected into the application via DefinePlugin in Webpack configuration.
5-
6-
var REACT_APP = /^REACT_APP_/i;
58+
const REACT_APP = /^REACT_APP_/i;
759

860
function getClientEnvironment(publicUrl) {
9-
var raw = Object
10-
.keys(process.env)
61+
const raw = Object.keys(process.env)
1162
.filter(key => REACT_APP.test(key))
12-
.reduce((env, key) => {
13-
env[key] = process.env[key];
14-
return env;
15-
}, {
16-
// Useful for determining whether we’re running in production mode.
17-
// Most importantly, it switches React into the correct mode.
18-
'NODE_ENV': process.env.NODE_ENV || 'development',
19-
// Useful for resolving the correct path to static assets in `public`.
20-
// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
21-
// This should only be used as an escape hatch. Normally you would put
22-
// images into the `src` and `import` them in code to get their paths.
23-
'PUBLIC_URL': publicUrl
24-
});
25-
// Stringify all values so we can feed into Webpack DefinePlugin
26-
var stringified = {
27-
'process.env': Object
28-
.keys(raw)
29-
.reduce((env, key) => {
30-
env[key] = JSON.stringify(raw[key]);
63+
.reduce(
64+
(env, key) => {
65+
env[key] = process.env[key];
3166
return env;
32-
}, {})
67+
},
68+
{
69+
// Useful for determining whether we’re running in production mode.
70+
// Most importantly, it switches React into the correct mode.
71+
NODE_ENV: process.env.NODE_ENV || 'development',
72+
// Useful for resolving the correct path to static assets in `public`.
73+
// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
74+
// This should only be used as an escape hatch. Normally you would put
75+
// images into the `src` and `import` them in code to get their paths.
76+
PUBLIC_URL: publicUrl,
77+
}
78+
);
79+
// Stringify all values so we can feed into Webpack DefinePlugin
80+
const stringified = {
81+
'process.env': Object.keys(raw).reduce((env, key) => {
82+
env[key] = JSON.stringify(raw[key]);
83+
return env;
84+
}, {}),
3385
};
3486

3587
return { raw, stringified };

config/jest/fileTransform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ const path = require('path');
77

88
module.exports = {
99
process(src, filename) {
10-
return 'module.exports = ' + JSON.stringify(path.basename(filename)) + ';';
10+
return `module.exports = ${JSON.stringify(path.basename(filename))};`;
1111
},
1212
};

config/paths.js

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,29 @@
11
'use strict';
22

3-
var path = require('path');
4-
var fs = require('fs');
5-
var url = require('url');
3+
const path = require('path');
4+
const fs = require('fs');
5+
const url = require('url');
66

77
// Make sure any symlinks in the project folder are resolved:
88
// https://github.com/facebookincubator/create-react-app/issues/637
9-
var appDirectory = fs.realpathSync(process.cwd());
10-
function resolveApp(relativePath) {
11-
return path.resolve(appDirectory, relativePath);
12-
}
13-
14-
// We support resolving modules according to `NODE_PATH`.
15-
// This lets you use absolute paths in imports inside large monorepos:
16-
// https://github.com/facebookincubator/create-react-app/issues/253.
17-
18-
// It works similar to `NODE_PATH` in Node itself:
19-
// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
20-
21-
// We will export `nodePaths` as an array of absolute paths.
22-
// It will then be used by Webpack configs.
23-
// Jest doesn’t need this because it already handles `NODE_PATH` out of the box.
9+
const appDirectory = fs.realpathSync(process.cwd());
10+
const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
2411

25-
// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
26-
// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
27-
// https://github.com/facebookincubator/create-react-app/issues/1023#issuecomment-265344421
28-
29-
var nodePaths = (process.env.NODE_PATH || '')
30-
.split(process.platform === 'win32' ? ';' : ':')
31-
.filter(Boolean)
32-
.filter(folder => !path.isAbsolute(folder))
33-
.map(resolveApp);
34-
35-
var envPublicUrl = process.env.PUBLIC_URL;
12+
const envPublicUrl = process.env.PUBLIC_URL;
3613

3714
function ensureSlash(path, needsSlash) {
38-
var hasSlash = path.endsWith('/');
15+
const hasSlash = path.endsWith('/');
3916
if (hasSlash && !needsSlash) {
4017
return path.substr(path, path.length - 1);
4118
} else if (!hasSlash && needsSlash) {
42-
return path + '/';
19+
return `${path}/`;
4320
} else {
4421
return path;
4522
}
4623
}
4724

48-
function getPublicUrl(appPackageJson) {
49-
return envPublicUrl || require(appPackageJson).homepage;
50-
}
25+
const getPublicUrl = appPackageJson =>
26+
envPublicUrl || require(appPackageJson).homepage;
5127

5228
// We use `PUBLIC_URL` environment variable or "homepage" field to infer
5329
// "public path" at which the app is served.
@@ -56,15 +32,15 @@ function getPublicUrl(appPackageJson) {
5632
// We can't use a relative path in HTML because we don't want to load something
5733
// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
5834
function getServedPath(appPackageJson) {
59-
var publicUrl = getPublicUrl(appPackageJson);
60-
var servedUrl = envPublicUrl || (
61-
publicUrl ? url.parse(publicUrl).pathname : '/'
62-
);
35+
const publicUrl = getPublicUrl(appPackageJson);
36+
const servedUrl =
37+
envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
6338
return ensureSlash(servedUrl, true);
6439
}
6540

6641
// config after eject: we're in ./config/
6742
module.exports = {
43+
dotenv: resolveApp('.env'),
6844
appBuild: resolveApp('build'),
6945
appPublic: resolveApp('public'),
7046
appHtml: resolveApp('public/index.html'),
@@ -74,7 +50,6 @@ module.exports = {
7450
yarnLockFile: resolveApp('yarn.lock'),
7551
testsSetup: resolveApp('src/setupTests.js'),
7652
appNodeModules: resolveApp('node_modules'),
77-
nodePaths: nodePaths,
7853
publicUrl: getPublicUrl(resolveApp('package.json')),
79-
servedPath: getServedPath(resolveApp('package.json'))
54+
servedPath: getServedPath(resolveApp('package.json')),
8055
};

0 commit comments

Comments
 (0)