@umijs/bundler-webpack 4.0.2 → 4.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/copyPlugin.js +6 -9
- package/dist/config/cssRules.js +9 -1
- package/dist/dev.d.ts +3 -0
- package/dist/dev.js +5 -2
- package/dist/schema.js +2 -0
- package/dist/server/server.js +3 -2
- package/package.json +8 -8
|
@@ -4,23 +4,20 @@ exports.addCopyPlugin = void 0;
|
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
async function addCopyPlugin(opts) {
|
|
7
|
+
var _a;
|
|
7
8
|
const { config, userConfig, cwd } = opts;
|
|
8
9
|
const copyPatterns = [
|
|
9
10
|
(0, fs_1.existsSync)((0, path_1.join)(cwd, 'public')) && {
|
|
10
11
|
from: (0, path_1.join)(cwd, 'public'),
|
|
11
12
|
},
|
|
12
13
|
...(userConfig.copy
|
|
13
|
-
? userConfig.copy.map((
|
|
14
|
-
if (typeof
|
|
15
|
-
return
|
|
16
|
-
from: (0, path_1.join)(cwd, item),
|
|
17
|
-
to: item,
|
|
18
|
-
};
|
|
14
|
+
? (_a = userConfig.copy) === null || _a === void 0 ? void 0 : _a.map((pattern) => {
|
|
15
|
+
if (typeof pattern === 'string') {
|
|
16
|
+
return (0, path_1.resolve)(cwd, pattern);
|
|
19
17
|
}
|
|
20
18
|
return {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
to: item.to,
|
|
19
|
+
from: (0, path_1.resolve)(cwd, pattern.from),
|
|
20
|
+
to: (0, path_1.resolve)(cwd, pattern.to),
|
|
24
21
|
};
|
|
25
22
|
})
|
|
26
23
|
: []),
|
package/dist/config/cssRules.js
CHANGED
|
@@ -65,7 +65,15 @@ async function addCSSRules(opts) {
|
|
|
65
65
|
.options({
|
|
66
66
|
importLoaders: 1,
|
|
67
67
|
esModule: true,
|
|
68
|
-
url:
|
|
68
|
+
url: {
|
|
69
|
+
filter: (url) => {
|
|
70
|
+
// Don't parse absolute URLs
|
|
71
|
+
// ref: https://github.com/webpack-contrib/css-loader#url
|
|
72
|
+
if (url.startsWith('/'))
|
|
73
|
+
return false;
|
|
74
|
+
return true;
|
|
75
|
+
},
|
|
76
|
+
},
|
|
69
77
|
import: true,
|
|
70
78
|
...(isCSSModules
|
|
71
79
|
? {
|
package/dist/dev.d.ts
CHANGED
|
@@ -19,6 +19,9 @@ declare type IOpts = {
|
|
|
19
19
|
rootDir?: string;
|
|
20
20
|
config: IConfig;
|
|
21
21
|
entry: Record<string, string>;
|
|
22
|
+
mfsuStrategy?: 'eager' | 'normal';
|
|
23
|
+
mfsuInclude?: string[];
|
|
24
|
+
srcCodeCache?: any;
|
|
22
25
|
} & Pick<IConfigOpts, 'cache'>;
|
|
23
26
|
export declare function stripUndefined(obj: any): any;
|
|
24
27
|
export declare function dev(opts: IOpts): Promise<void>;
|
package/dist/dev.js
CHANGED
|
@@ -32,6 +32,9 @@ async function dev(opts) {
|
|
|
32
32
|
utils_1.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
|
|
33
33
|
}
|
|
34
34
|
mfsu = new mfsu_1.MFSU({
|
|
35
|
+
strategy: opts.mfsuStrategy,
|
|
36
|
+
include: opts.mfsuInclude || [],
|
|
37
|
+
srcCodeCache: opts.srcCodeCache,
|
|
35
38
|
implementor: webpack_1.default,
|
|
36
39
|
buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
|
|
37
40
|
depBuildConfig: {
|
|
@@ -75,7 +78,7 @@ async function dev(opts) {
|
|
|
75
78
|
extraEsbuildLoaderHandler: (mfsu === null || mfsu === void 0 ? void 0 : mfsu.getEsbuildLoaderHandler()) || [],
|
|
76
79
|
chainWebpack: opts.chainWebpack,
|
|
77
80
|
modifyWebpackConfig: opts.modifyWebpackConfig,
|
|
78
|
-
hmr:
|
|
81
|
+
hmr: process.env.HMR !== 'none',
|
|
79
82
|
analyze: process.env.ANALYZE,
|
|
80
83
|
cache: opts.cache,
|
|
81
84
|
});
|
|
@@ -109,7 +112,7 @@ async function dev(opts) {
|
|
|
109
112
|
typeof webpackConfig.cache === 'object' &&
|
|
110
113
|
webpackConfig.cache.type === 'filesystem') {
|
|
111
114
|
const webpackCachePath = (0, path_1.join)(webpackConfig.cache.cacheDirectory, `default-development`, 'index.pack');
|
|
112
|
-
const mfsuCacheExists = (0, fs_1.existsSync)(mfsu.
|
|
115
|
+
const mfsuCacheExists = (0, fs_1.existsSync)(mfsu.getCacheFilePath());
|
|
113
116
|
const webpackCacheExists = (0, fs_1.existsSync)(webpackCachePath);
|
|
114
117
|
if (webpackCacheExists && !mfsuCacheExists) {
|
|
115
118
|
utils_1.logger.warn(`Invalidate webpack cache since mfsu cache is missing`);
|
package/dist/schema.js
CHANGED
|
@@ -74,8 +74,10 @@ function getSchemas() {
|
|
|
74
74
|
cacheDirectory: Joi.string(),
|
|
75
75
|
chainWebpack: Joi.function(),
|
|
76
76
|
esbuild: Joi.boolean(),
|
|
77
|
+
include: Joi.array().items(Joi.string()),
|
|
77
78
|
mfName: Joi.string(),
|
|
78
79
|
runtimePublicPath: Joi.boolean(),
|
|
80
|
+
strategy: Joi.string().valid('eager', 'normal').default('normal'),
|
|
79
81
|
}), Joi.boolean()),
|
|
80
82
|
outputPath: (Joi) => Joi.string(),
|
|
81
83
|
postcssLoader: (Joi) => Joi.object(),
|
package/dist/server/server.js
CHANGED
|
@@ -138,10 +138,11 @@ async function createServer(opts) {
|
|
|
138
138
|
app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(key, {
|
|
139
139
|
...proxy[key],
|
|
140
140
|
// Add x-real-url in response header
|
|
141
|
-
onProxyRes(proxyRes, req) {
|
|
142
|
-
var _a;
|
|
141
|
+
onProxyRes(proxyRes, req, res) {
|
|
142
|
+
var _a, _b;
|
|
143
143
|
proxyRes.headers['x-real-url'] =
|
|
144
144
|
((_a = new URL(req.url || '', target)) === null || _a === void 0 ? void 0 : _a.href) || '';
|
|
145
|
+
(_b = proxyConfig.onProxyRes) === null || _b === void 0 ? void 0 : _b.call(proxyConfig, proxyRes, req, res);
|
|
145
146
|
},
|
|
146
147
|
}));
|
|
147
148
|
}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@umijs/bundler-webpack",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.5",
|
|
4
4
|
"description": "@umijs/bundler-webpack",
|
|
5
|
-
"homepage": "https://github.com/umijs/umi
|
|
6
|
-
"bugs": "https://github.com/umijs/umi
|
|
5
|
+
"homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
|
|
6
|
+
"bugs": "https://github.com/umijs/umi/issues",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
9
|
-
"url": "https://github.com/umijs/umi
|
|
9
|
+
"url": "https://github.com/umijs/umi"
|
|
10
10
|
},
|
|
11
11
|
"license": "MIT",
|
|
12
12
|
"main": "dist/index.js",
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"@svgr/plugin-jsx": "^6.2.1",
|
|
36
36
|
"@svgr/plugin-svgo": "^6.2.0",
|
|
37
37
|
"@types/hapi__joi": "17.1.8",
|
|
38
|
-
"@umijs/babel-preset-umi": "4.0.
|
|
39
|
-
"@umijs/bundler-utils": "4.0.
|
|
40
|
-
"@umijs/mfsu": "4.0.
|
|
41
|
-
"@umijs/utils": "4.0.
|
|
38
|
+
"@umijs/babel-preset-umi": "4.0.5",
|
|
39
|
+
"@umijs/bundler-utils": "4.0.5",
|
|
40
|
+
"@umijs/mfsu": "4.0.5",
|
|
41
|
+
"@umijs/utils": "4.0.5",
|
|
42
42
|
"cors": "^2.8.5",
|
|
43
43
|
"css-loader": "6.7.1",
|
|
44
44
|
"es5-imcompatible-versions": "^0.1.73",
|