Skip to content

Commit 0be07d7

Browse files
yunfeihuangyunfeihuang
committedNov 6, 2019
wepack3.x升级4.x
1 parent 6d9ee8d commit 0be07d7

26 files changed

+14591
-10335
lines changed
 

‎README.md

+22-2,405
Large diffs are not rendered by default.

‎components.json

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"index": ["./src/components"],
3+
"layout": ["./src/components/layout"],
4+
"actionsheet": ["./src/components/actionsheet"],
5+
"accordion": ["./src/components/accordion"],
6+
"swiper": ["./src/components/swiper"],
7+
"marquee": ["./src/components/marquee"],
8+
"tab": ["./src/components/tab"],
9+
"tabbar": ["./src/components/tabbar"],
10+
"sidebar": ["./src/components/sidebar"],
11+
"flexbox": ["./src/components/flexbox"],
12+
"button-tab": ["./src/components/button-tab"],
13+
"button": ["./src/components/button"],
14+
"input": ["./src/components/input"],
15+
"input-number": ["./src/components/input-number"],
16+
"password": ["./src/components/password"],
17+
"range": ["./src/components/range"],
18+
"textarea": ["./src/components/textarea"],
19+
"switch": ["./src/components/switch"],
20+
"checkbox": ["./src/components/checkbox"],
21+
"radio": ["./src/components/radio"],
22+
"select": ["./src/components/select"],
23+
"checker": ["./src/components/checker"],
24+
"divider": ["./src/components/divider"],
25+
"group": ["./src/components/group"],
26+
"cell": ["./src/components/cell"],
27+
"confirm": ["./src/components/confirm"],
28+
"prompt": ["./src/components/prompt"],
29+
"alert": ["./src/components/alert"],
30+
"popup": ["./src/components/popup"],
31+
"popup-picker": ["./src/components/popup-picker"],
32+
"toast": ["./src/components/toast"],
33+
"img": ["./src/components/img"],
34+
"index-list": ["./src/components/index-list"],
35+
"list-view": ["./src/components/list-view"],
36+
"ripple": ["./src/components/ripple"],
37+
"nav": ["./src/components/nav"],
38+
"preview": ["./src/components/preview"],
39+
"spinner": ["./src/components/spinner"],
40+
"picker": ["./src/components/picker"],
41+
"badge": ["./src/components/badge"],
42+
"swipeout": ["./src/components/swipeout"],
43+
"rater": ["./src/components/rater"],
44+
"popover": ["./src/components/popover"],
45+
"sticky": ["./src/components/sticky"],
46+
"qrcode": ["./src/components/qrcode"]
47+
}

‎config/env.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if (!NODE_ENV) {
1515
}
1616

1717
// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
18-
var dotenvFiles = [
18+
const dotenvFiles = [
1919
`${paths.dotenv}.${NODE_ENV}.local`,
2020
`${paths.dotenv}.${NODE_ENV}`,
2121
// Don't include `.env.local` for `test` environment
@@ -42,12 +42,12 @@ dotenvFiles.forEach(dotenvFile => {
4242

4343
// We support resolving modules according to `NODE_PATH`.
4444
// This lets you use absolute paths in imports inside large monorepos:
45-
// https://github.com/facebookincubator/create-react-app/issues/253.
45+
// https://github.com/facebook/create-react-app/issues/253.
4646
// It works similar to `NODE_PATH` in Node itself:
4747
// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
4848
// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
4949
// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
50-
// https://github.com/facebookincubator/create-react-app/issues/1023#issuecomment-265344421
50+
// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
5151
// We also resolve them to make sure all tools using them work consistently.
5252
const appDirectory = fs.realpathSync(process.cwd());
5353
process.env.NODE_PATH = (process.env.NODE_PATH || '')

‎config/jest/fileTransform.js

+29-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,40 @@
11
'use strict';
22

33
const path = require('path');
4+
const camelcase = require('camelcase');
45

56
// This is a custom Jest transformer turning file imports into filenames.
67
// http://facebook.github.io/jest/docs/en/webpack.html
78

89
module.exports = {
910
process(src, filename) {
10-
return `module.exports = ${JSON.stringify(path.basename(filename))};`;
11+
const assetFilename = JSON.stringify(path.basename(filename));
12+
13+
if (filename.match(/\.svg$/)) {
14+
// Based on how SVGR generates a component name:
15+
// https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
16+
const pascalCaseFilename = camelcase(path.parse(filename).name, {
17+
pascalCase: true,
18+
});
19+
const componentName = `Svg${pascalCaseFilename}`;
20+
return `const React = require('react');
21+
module.exports = {
22+
__esModule: true,
23+
default: ${assetFilename},
24+
ReactComponent: React.forwardRef(function ${componentName}(props, ref) {
25+
return {
26+
$$typeof: Symbol.for('react.element'),
27+
type: 'svg',
28+
ref: ref,
29+
key: null,
30+
props: Object.assign({}, props, {
31+
children: ${assetFilename}
32+
})
33+
};
34+
}),
35+
};`;
36+
}
37+
38+
return `module.exports = ${assetFilename};`;
1139
},
1240
};

‎config/modules.js

+141
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
'use strict';
2+
3+
const fs = require('fs');
4+
const path = require('path');
5+
const paths = require('./paths');
6+
const chalk = require('react-dev-utils/chalk');
7+
const resolve = require('resolve');
8+
9+
/**
10+
* Get additional module paths based on the baseUrl of a compilerOptions object.
11+
*
12+
* @param {Object} options
13+
*/
14+
function getAdditionalModulePaths(options = {}) {
15+
const baseUrl = options.baseUrl;
16+
17+
// We need to explicitly check for null and undefined (and not a falsy value) because
18+
// TypeScript treats an empty string as `.`.
19+
if (baseUrl == null) {
20+
// If there's no baseUrl set we respect NODE_PATH
21+
// Note that NODE_PATH is deprecated and will be removed
22+
// in the next major release of create-react-app.
23+
24+
const nodePath = process.env.NODE_PATH || '';
25+
return nodePath.split(path.delimiter).filter(Boolean);
26+
}
27+
28+
const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
29+
30+
// We don't need to do anything if `baseUrl` is set to `node_modules`. This is
31+
// the default behavior.
32+
if (path.relative(paths.appNodeModules, baseUrlResolved) === '') {
33+
return null;
34+
}
35+
36+
// Allow the user set the `baseUrl` to `appSrc`.
37+
if (path.relative(paths.appSrc, baseUrlResolved) === '') {
38+
return [paths.appSrc];
39+
}
40+
41+
// If the path is equal to the root directory we ignore it here.
42+
// We don't want to allow importing from the root directly as source files are
43+
// not transpiled outside of `src`. We do allow importing them with the
44+
// absolute path (e.g. `src/Components/Button.js`) but we set that up with
45+
// an alias.
46+
if (path.relative(paths.appPath, baseUrlResolved) === '') {
47+
return null;
48+
}
49+
50+
// Otherwise, throw an error.
51+
throw new Error(
52+
chalk.red.bold(
53+
"Your project's `baseUrl` can only be set to `src` or `node_modules`." +
54+
' Create React App does not support other values at this time.'
55+
)
56+
);
57+
}
58+
59+
/**
60+
* Get webpack aliases based on the baseUrl of a compilerOptions object.
61+
*
62+
* @param {*} options
63+
*/
64+
function getWebpackAliases(options = {}) {
65+
const baseUrl = options.baseUrl;
66+
67+
if (!baseUrl) {
68+
return {};
69+
}
70+
71+
const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
72+
73+
if (path.relative(paths.appPath, baseUrlResolved) === '') {
74+
return {
75+
src: paths.appSrc,
76+
};
77+
}
78+
}
79+
80+
/**
81+
* Get jest aliases based on the baseUrl of a compilerOptions object.
82+
*
83+
* @param {*} options
84+
*/
85+
function getJestAliases(options = {}) {
86+
const baseUrl = options.baseUrl;
87+
88+
if (!baseUrl) {
89+
return {};
90+
}
91+
92+
const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
93+
94+
if (path.relative(paths.appPath, baseUrlResolved) === '') {
95+
return {
96+
'src/(.*)$': '<rootDir>/src/$1',
97+
};
98+
}
99+
}
100+
101+
function getModules() {
102+
// Check if TypeScript is setup
103+
const hasTsConfig = fs.existsSync(paths.appTsConfig);
104+
const hasJsConfig = fs.existsSync(paths.appJsConfig);
105+
106+
if (hasTsConfig && hasJsConfig) {
107+
throw new Error(
108+
'You have both a tsconfig.json and a jsconfig.json. If you are using TypeScript please remove your jsconfig.json file.'
109+
);
110+
}
111+
112+
let config;
113+
114+
// If there's a tsconfig.json we assume it's a
115+
// TypeScript project and set up the config
116+
// based on tsconfig.json
117+
if (hasTsConfig) {
118+
const ts = require(resolve.sync('typescript', {
119+
basedir: paths.appNodeModules,
120+
}));
121+
config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config;
122+
// Otherwise we'll check if there is jsconfig.json
123+
// for non TS projects.
124+
} else if (hasJsConfig) {
125+
config = require(paths.appJsConfig);
126+
}
127+
128+
config = config || {};
129+
const options = config.compilerOptions || {};
130+
131+
const additionalModulePaths = getAdditionalModulePaths(options);
132+
133+
return {
134+
additionalModulePaths: additionalModulePaths,
135+
webpackAliases: getWebpackAliases(options),
136+
jestAliases: getJestAliases(options),
137+
hasTsConfig,
138+
};
139+
}
140+
141+
module.exports = getModules();

‎config/paths.js

+44-9
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ const fs = require('fs');
55
const url = require('url');
66

77
// Make sure any symlinks in the project folder are resolved:
8-
// https://github.com/facebookincubator/create-react-app/issues/637
8+
// https://github.com/facebook/create-react-app/issues/637
99
const appDirectory = fs.realpathSync(process.cwd());
1010
const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
1111

1212
const envPublicUrl = process.env.PUBLIC_URL;
1313

14-
function ensureSlash(path, needsSlash) {
15-
const hasSlash = path.endsWith('/');
14+
function ensureSlash(inputPath, needsSlash) {
15+
const hasSlash = inputPath.endsWith('/');
1616
if (hasSlash && !needsSlash) {
17-
return path.substr(path, path.length - 1);
17+
return inputPath.substr(0, inputPath.length - 1);
1818
} else if (!hasSlash && needsSlash) {
19-
return `${path}/`;
19+
return `${inputPath}/`;
2020
} else {
21-
return path;
21+
return inputPath;
2222
}
2323
}
2424

@@ -34,22 +34,57 @@ const getPublicUrl = appPackageJson =>
3434
function getServedPath(appPackageJson) {
3535
const publicUrl = getPublicUrl(appPackageJson);
3636
const servedUrl =
37-
envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : './');
37+
envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
3838
return ensureSlash(servedUrl, true);
3939
}
4040

41+
const moduleFileExtensions = [
42+
'web.mjs',
43+
'mjs',
44+
'web.js',
45+
'js',
46+
'web.ts',
47+
'ts',
48+
'web.tsx',
49+
'tsx',
50+
'json',
51+
'web.jsx',
52+
'jsx',
53+
];
54+
55+
// Resolve file paths in the same order as webpack
56+
const resolveModule = (resolveFn, filePath) => {
57+
const extension = moduleFileExtensions.find(extension =>
58+
fs.existsSync(resolveFn(`${filePath}.${extension}`))
59+
);
60+
61+
if (extension) {
62+
return resolveFn(`${filePath}.${extension}`);
63+
}
64+
65+
return resolveFn(`${filePath}.js`);
66+
};
67+
4168
// config after eject: we're in ./config/
4269
module.exports = {
4370
dotenv: resolveApp('.env'),
71+
appPath: resolveApp('.'),
4472
appBuild: resolveApp('build'),
4573
appPublic: resolveApp('public'),
4674
appHtml: resolveApp('public/index.html'),
47-
appIndexJs: resolveApp('src/index.js'),
75+
appIndexJs: resolveModule(resolveApp, 'src/index'),
4876
appPackageJson: resolveApp('package.json'),
4977
appSrc: resolveApp('src'),
78+
appTsConfig: resolveApp('tsconfig.json'),
79+
appJsConfig: resolveApp('jsconfig.json'),
5080
yarnLockFile: resolveApp('yarn.lock'),
51-
testsSetup: resolveApp('src/setupTests.js'),
81+
testsSetup: resolveModule(resolveApp, 'src/setupTests'),
82+
proxySetup: resolveApp('src/setupProxy.js'),
5283
appNodeModules: resolveApp('node_modules'),
5384
publicUrl: getPublicUrl(resolveApp('package.json')),
5485
servedPath: getServedPath(resolveApp('package.json')),
5586
};
87+
88+
89+
90+
module.exports.moduleFileExtensions = moduleFileExtensions;

‎config/pnpTs.js

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
'use strict';
2+
3+
const { resolveModuleName } = require('ts-pnp');
4+
5+
exports.resolveModuleName = (
6+
typescript,
7+
moduleName,
8+
containingFile,
9+
compilerOptions,
10+
resolutionHost
11+
) => {
12+
return resolveModuleName(
13+
moduleName,
14+
containingFile,
15+
compilerOptions,
16+
resolutionHost,
17+
typescript.resolveModuleName
18+
);
19+
};
20+
21+
exports.resolveTypeReferenceDirective = (
22+
typescript,
23+
moduleName,
24+
containingFile,
25+
compilerOptions,
26+
resolutionHost
27+
) => {
28+
return resolveModuleName(
29+
moduleName,
30+
containingFile,
31+
compilerOptions,
32+
resolutionHost,
33+
typescript.resolveTypeReferenceDirective
34+
);
35+
};

0 commit comments

Comments
 (0)
Please sign in to comment.