@umijs/bundler-webpack 4.0.0-rc.7 → 4.0.0

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.
Files changed (84) hide show
  1. package/client/client/client.js +65 -37
  2. package/client/constants.js +9 -0
  3. package/compiled/babel-loader/index.js +2 -2
  4. package/compiled/copy-webpack-plugin/{576.index.js → 939.index.js} +11 -11
  5. package/compiled/copy-webpack-plugin/index.js +12 -12
  6. package/compiled/css-minimizer-webpack-plugin/index.js +7 -7
  7. package/compiled/cssnano/index.js +6 -6
  8. package/compiled/fork-ts-checker-webpack-plugin/index.js +7 -13
  9. package/compiled/{tapable → react-refresh}/LICENSE +6 -6
  10. package/compiled/react-refresh/index.js +9 -7
  11. package/compiled/react-refresh/package.json +1 -0
  12. package/compiled/webpack/BasicEffectRulePlugin.js +1 -0
  13. package/compiled/webpack/BasicMatcherRulePlugin.js +1 -0
  14. package/compiled/webpack/HotModuleReplacement.runtime.js +29 -14
  15. package/compiled/webpack/JavascriptHotModuleReplacement.runtime.js +4 -3
  16. package/compiled/webpack/ObjectMatcherRulePlugin.js +1 -0
  17. package/compiled/webpack/RuleSetCompiler.js +1 -0
  18. package/compiled/webpack/UseEffectRulePlugin.js +1 -0
  19. package/compiled/webpack/deepImports.json +6 -1
  20. package/compiled/webpack/index.js +3978 -3167
  21. package/compiled/webpack/types.d.ts +606 -171
  22. package/compiled/webpack-dev-middleware/index.js +8 -7
  23. package/compiled/webpack-manifest-plugin/index.js +1 -1
  24. package/dist/build.d.ts +1 -0
  25. package/dist/build.js +49 -56
  26. package/dist/cli.js +6 -15
  27. package/dist/client/client.js +52 -50
  28. package/dist/config/_sampleFeature.js +6 -17
  29. package/dist/config/assetRules.js +44 -55
  30. package/dist/config/bundleAnalyzerPlugin.js +12 -23
  31. package/dist/config/compressPlugin.js +89 -70
  32. package/dist/config/config.d.ts +2 -0
  33. package/dist/config/config.js +181 -179
  34. package/dist/config/copyPlugin.js +29 -40
  35. package/dist/config/cssRules.js +114 -83
  36. package/dist/config/definePlugin.js +11 -19
  37. package/dist/config/detectDeadCodePlugin.js +16 -21
  38. package/dist/config/fastRefreshPlugin.js +11 -22
  39. package/dist/config/forkTSCheckerPlugin.js +11 -22
  40. package/dist/config/harmonyLinkingErrorPlugin.js +3 -14
  41. package/dist/config/ignorePlugin.js +10 -21
  42. package/dist/config/javaScriptRules.d.ts +1 -0
  43. package/dist/config/javaScriptRules.js +152 -135
  44. package/dist/config/manifestPlugin.d.ts +1 -1
  45. package/dist/config/manifestPlugin.js +10 -18
  46. package/dist/config/miniCSSExtractPlugin.js +15 -23
  47. package/dist/config/nodePolyfill.js +14 -20
  48. package/dist/config/nodePrefixPlugin.d.ts +11 -0
  49. package/dist/config/nodePrefixPlugin.js +14 -0
  50. package/dist/config/progressPlugin.js +7 -18
  51. package/dist/config/purgecssWebpackPlugin.js +15 -26
  52. package/dist/config/speedMeasureWebpackPlugin.js +12 -23
  53. package/dist/config/ssrPlugin.d.ts +11 -0
  54. package/dist/config/ssrPlugin.js +66 -0
  55. package/dist/config/svgRules.js +44 -47
  56. package/dist/constants.d.ts +1 -0
  57. package/dist/constants.js +7 -1
  58. package/dist/dev.d.ts +4 -0
  59. package/dist/dev.js +115 -94
  60. package/dist/index.d.ts +3 -0
  61. package/dist/index.js +16 -0
  62. package/dist/loader/svgr.js +4 -13
  63. package/dist/loader/swc.js +9 -14
  64. package/dist/plugins/ProgressPlugin.js +3 -3
  65. package/dist/plugins/RuntimePublicPathPlugin.js +4 -1
  66. package/dist/schema.js +24 -8
  67. package/dist/server/server.d.ts +3 -1
  68. package/dist/server/server.js +165 -150
  69. package/dist/server/ws.d.ts +7 -2
  70. package/dist/swcPlugins/autoCSSModules.js +3 -1
  71. package/dist/swcPlugins/changeImportFromString.d.ts +2 -0
  72. package/dist/swcPlugins/changeImportFromString.js +10 -0
  73. package/dist/swcPlugins/lockCoreJS.js +3 -2
  74. package/dist/types.d.ts +3 -0
  75. package/dist/utils/getEsBuildTarget.d.ts +5 -0
  76. package/dist/utils/getEsBuildTarget.js +12 -0
  77. package/package.json +23 -21
  78. package/compiled/tapable/index.js +0 -1
  79. package/compiled/tapable/package.json +0 -1
  80. package/compiled/tapable/tapable.d.ts +0 -116
  81. package/dist/plugins/ESBuildCSSMinifyPlugin.d.ts +0 -11
  82. package/dist/plugins/ESBuildCSSMinifyPlugin.js +0 -63
  83. package/dist/plugins/ParcelCSSMinifyPlugin.d.ts +0 -10
  84. package/dist/plugins/ParcelCSSMinifyPlugin.js +0 -75
package/dist/schema.js CHANGED
@@ -4,18 +4,30 @@ exports.getSchemas = void 0;
4
4
  const types_1 = require("./types");
5
5
  const options = [
6
6
  'cheap-source-map',
7
- 'cheap-eval-source-map',
8
- 'cheap-hidden-source-map',
9
- 'cheap-inline-source-map',
10
7
  'cheap-module-source-map',
11
- 'cheap-module-eval-source-map',
12
- 'cheap-module-hidden-source-map',
13
- 'cheap-module-inline-source-map',
14
8
  'eval',
15
9
  'eval-source-map',
10
+ 'eval-cheap-source-map',
11
+ 'eval-cheap-module-source-map',
12
+ 'eval-nosources-cheap-source-map',
13
+ 'eval-nosources-cheap-module-source-map',
14
+ 'eval-nosources-source-map',
16
15
  'source-map',
17
16
  'hidden-source-map',
17
+ 'hidden-nosources-cheap-source-map',
18
+ 'hidden-nosources-cheap-module-source-map',
19
+ 'hidden-nosources-source-map',
20
+ 'hidden-cheap-source-map',
21
+ 'hidden-cheap-module-source-map',
18
22
  'inline-source-map',
23
+ 'inline-cheap-source-map',
24
+ 'inline-cheap-module-source-map',
25
+ 'inline-nosources-cheap-source-map',
26
+ 'inline-nosources-cheap-module-source-map',
27
+ 'inline-nosources-source-map',
28
+ 'nosources-source-map',
29
+ 'nosources-cheap-source-map',
30
+ 'nosources-cheap-module-source-map',
19
31
  ];
20
32
  const DEVTOOL_REGEX = new RegExp('^' + // start of string
21
33
  '(#@|@|#)?' + // maybe one of the pragmas
@@ -40,12 +52,14 @@ function getSchemas() {
40
52
  devtool: (Joi) => Joi.alternatives().try(Joi.string().regex(DEVTOOL_REGEX), Joi.boolean()),
41
53
  esm: (Joi) => Joi.object(),
42
54
  externals: (Joi) => Joi.alternatives().try(Joi.object(), Joi.string(), Joi.func()),
43
- extraBabelPlugins: (Joi) => Joi.alternatives().try(Joi.string(), Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object()))),
44
- extraBabelPresets: (Joi) => Joi.alternatives().try(Joi.string(), Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object()))),
55
+ extraBabelIncludes: (Joi) => Joi.array().items(Joi.string()),
56
+ extraBabelPlugins: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.array())),
57
+ extraBabelPresets: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.array())),
45
58
  extraPostCSSPlugins: (Joi) => Joi.array(),
46
59
  fastRefresh: (Joi) => Joi.boolean(),
47
60
  forkTSChecker: (Joi) => Joi.object(),
48
61
  hash: (Joi) => Joi.boolean(),
62
+ https: (Joi) => Joi.object(),
49
63
  ignoreMomentLocale: (Joi) => Joi.boolean(),
50
64
  inlineLimit: (Joi) => Joi.number(),
51
65
  jsMinifier: (Joi) => Joi.string().valid(types_1.JSMinifier.esbuild, types_1.JSMinifier.swc, types_1.JSMinifier.terser, types_1.JSMinifier.uglifyJs, types_1.JSMinifier.none),
@@ -58,8 +72,10 @@ function getSchemas() {
58
72
  }),
59
73
  mfsu: (Joi) => Joi.alternatives(Joi.object({
60
74
  cacheDirectory: Joi.string(),
75
+ chainWebpack: Joi.function(),
61
76
  esbuild: Joi.boolean(),
62
77
  mfName: Joi.string(),
78
+ runtimePublicPath: Joi.boolean(),
63
79
  }), Joi.boolean()),
64
80
  outputPath: (Joi) => Joi.string(),
65
81
  postcssLoader: (Joi) => Joi.object(),
@@ -1,4 +1,5 @@
1
1
  /// <reference types="node" />
2
+ /// <reference types="node" />
2
3
  import { Configuration } from '@umijs/bundler-webpack/compiled/webpack';
3
4
  import http from 'http';
4
5
  import { IConfig } from '../types';
@@ -11,6 +12,7 @@ interface IOpts {
11
12
  beforeMiddlewares?: any[];
12
13
  afterMiddlewares?: any[];
13
14
  onDevCompileDone?: Function;
15
+ onProgress?: Function;
14
16
  }
15
- export declare function createServer(opts: IOpts): Promise<http.Server>;
17
+ export declare function createServer(opts: IOpts): Promise<http.Server | import("https").Server | null>;
16
18
  export {};
@@ -1,180 +1,195 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
14
5
  Object.defineProperty(exports, "__esModule", { value: true });
15
6
  exports.createServer = void 0;
7
+ const bundler_utils_1 = require("@umijs/bundler-utils");
16
8
  const express_1 = __importDefault(require("@umijs/bundler-utils/compiled/express"));
17
9
  const http_proxy_middleware_1 = require("@umijs/bundler-webpack/compiled/http-proxy-middleware");
18
10
  const webpack_1 = __importDefault(require("@umijs/bundler-webpack/compiled/webpack"));
19
11
  const utils_1 = require("@umijs/utils");
12
+ const cors_1 = __importDefault(require("cors"));
20
13
  const fs_1 = require("fs");
21
14
  const http_1 = __importDefault(require("http"));
22
15
  const path_1 = require("path");
23
16
  const constants_1 = require("../constants");
24
17
  const ws_1 = require("./ws");
25
- function createServer(opts) {
26
- return __awaiter(this, void 0, void 0, function* () {
27
- const { webpackConfig, userConfig } = opts;
28
- const { proxy } = userConfig;
29
- const app = (0, express_1.default)();
30
- // basename middleware
31
- app.use((req, _res, next) => {
32
- const { url, path } = req;
33
- const { basename, history } = userConfig;
34
- if ((history === null || history === void 0 ? void 0 : history.type) === 'browser' &&
35
- basename !== '/' &&
36
- url.startsWith(basename)) {
37
- req.url = url.slice(basename.length);
38
- req.path = path.slice(basename.length);
39
- }
40
- next();
41
- });
42
- // cros
43
- app.use((_req, res, next) => {
44
- res.header('Access-Control-Allow-Origin', '*');
45
- res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild');
46
- res.header('Access-Control-Allow-Methods', 'GET, HEAD, PUT, POST, PATCH, DELETE, OPTIONS');
18
+ async function createServer(opts) {
19
+ const { webpackConfig, userConfig } = opts;
20
+ const { proxy } = userConfig;
21
+ const app = (0, express_1.default)();
22
+ // cros
23
+ app.use((0, cors_1.default)({
24
+ origin: true,
25
+ methods: ['GET', 'HEAD', 'PUT', 'POST', 'PATCH', 'DELETE', 'OPTIONS'],
26
+ credentials: true,
27
+ }));
28
+ // compression
29
+ app.use(require('@umijs/bundler-webpack/compiled/compression')());
30
+ // TODO: headers
31
+ // before middlewares
32
+ (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
33
+ // TODO: add to before middleware
34
+ app.use((req, res, next) => {
35
+ const file = req.path;
36
+ const filePath = (0, path_1.join)(opts.cwd, file);
37
+ const ext = (0, path_1.extname)(filePath);
38
+ if (ext === '.js' && (0, fs_1.existsSync)(filePath)) {
39
+ res.sendFile(filePath);
40
+ }
41
+ else {
47
42
  next();
43
+ }
44
+ });
45
+ // webpack dev middleware
46
+ const configs = Array.isArray(webpackConfig)
47
+ ? webpackConfig
48
+ : [webpackConfig];
49
+ const progresses = [];
50
+ if (opts.onProgress) {
51
+ configs.forEach((config) => {
52
+ const progress = {
53
+ percent: 0,
54
+ status: 'waiting',
55
+ };
56
+ progresses.push(progress);
57
+ config.plugins.push(new webpack_1.default.ProgressPlugin((percent, msg) => {
58
+ progress.percent = percent;
59
+ progress.status = msg;
60
+ opts.onProgress({ progresses });
61
+ }));
48
62
  });
49
- // compression
50
- app.use(require('@umijs/bundler-webpack/compiled/compression')());
51
- // TODO: headers
52
- // before middlewares
53
- (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
54
- // TODO: add to before middleware
55
- app.use((req, res, next) => {
56
- if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
57
- res.setHeader('Content-Type', 'application/javascript');
58
- res.send((0, fs_1.readFileSync)((0, path_1.join)(opts.cwd, 'umi.js'), 'utf-8'));
59
- }
60
- else {
61
- next();
62
- }
63
- });
64
- // webpack dev middleware
65
- const compiler = (0, webpack_1.default)(Array.isArray(webpackConfig) ? webpackConfig : [webpackConfig]);
66
- const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
67
- const compilerMiddleware = webpackDevMiddleware(compiler, {
68
- publicPath: '/',
69
- writeToDisk: userConfig.writeToDisk,
70
- stats: 'none',
71
- // watchOptions: { ignored }
63
+ }
64
+ const compiler = (0, webpack_1.default)(configs);
65
+ const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
66
+ const compilerMiddleware = webpackDevMiddleware(compiler, {
67
+ publicPath: userConfig.publicPath || '/',
68
+ writeToDisk: userConfig.writeToDisk,
69
+ stats: 'none',
70
+ // watchOptions: { ignored }
71
+ });
72
+ app.use(compilerMiddleware);
73
+ // hmr hooks
74
+ let stats;
75
+ let isFirstCompile = true;
76
+ compiler.compilers.forEach(addHooks);
77
+ function addHooks(compiler) {
78
+ compiler.hooks.invalid.tap('server', () => {
79
+ sendMessage(constants_1.MESSAGE_TYPE.invalid);
72
80
  });
73
- app.use(compilerMiddleware);
74
- // hmr hooks
75
- let stats;
76
- let isFirstCompile = true;
77
- compiler.compilers.forEach(addHooks);
78
- function addHooks(compiler) {
79
- compiler.hooks.invalid.tap('server', () => {
80
- sendMessage(constants_1.MESSAGE_TYPE.invalid);
81
- });
82
- compiler.hooks.done.tap('server', (_stats) => {
83
- var _a;
84
- stats = _stats;
85
- sendStats(getStats(stats));
86
- (_a = opts.onDevCompileDone) === null || _a === void 0 ? void 0 : _a.call(opts, {
87
- stats,
88
- isFirstCompile,
89
- time: stats.endTime - stats.startTime,
90
- });
91
- isFirstCompile = false;
81
+ compiler.hooks.done.tap('server', (_stats) => {
82
+ var _a;
83
+ stats = _stats;
84
+ sendStats(getStats(stats));
85
+ (_a = opts.onDevCompileDone) === null || _a === void 0 ? void 0 : _a.call(opts, {
86
+ stats,
87
+ isFirstCompile,
88
+ time: stats.endTime - stats.startTime,
92
89
  });
90
+ isFirstCompile = false;
91
+ });
92
+ }
93
+ function sendStats(stats, force, sender) {
94
+ const shouldEmit = !force &&
95
+ stats &&
96
+ (!stats.errors || stats.errors.length === 0) &&
97
+ (!stats.warnings || stats.warnings.length === 0) &&
98
+ stats.assets &&
99
+ stats.assets.every((asset) => !asset.emitted);
100
+ if (shouldEmit) {
101
+ sendMessage(constants_1.MESSAGE_TYPE.stillOk, null, sender);
102
+ return;
93
103
  }
94
- function sendStats(stats, force, sender) {
95
- const shouldEmit = !force &&
96
- stats &&
97
- (!stats.errors || stats.errors.length === 0) &&
98
- (!stats.warnings || stats.warnings.length === 0) &&
99
- stats.assets &&
100
- stats.assets.every((asset) => !asset.emitted);
101
- if (shouldEmit) {
102
- sendMessage(constants_1.MESSAGE_TYPE.stillOk, null, sender);
103
- return;
104
+ sendMessage(constants_1.MESSAGE_TYPE.hash, stats.hash, sender);
105
+ if ((stats.errors && stats.errors.length > 0) ||
106
+ (stats.warnings && stats.warnings.length > 0)) {
107
+ if (stats.warnings && stats.warnings.length > 0) {
108
+ sendMessage(constants_1.MESSAGE_TYPE.warnings, stats.warnings, sender);
104
109
  }
105
- sendMessage(constants_1.MESSAGE_TYPE.hash, stats.hash, sender);
106
- if ((stats.errors && stats.errors.length > 0) ||
107
- (stats.warnings && stats.warnings.length > 0)) {
108
- if (stats.warnings && stats.warnings.length > 0) {
109
- sendMessage(constants_1.MESSAGE_TYPE.warnings, stats.warnings, sender);
110
- }
111
- if (stats.errors && stats.errors.length > 0) {
112
- sendMessage(constants_1.MESSAGE_TYPE.errors, stats.errors, sender);
113
- }
110
+ if (stats.errors && stats.errors.length > 0) {
111
+ sendMessage(constants_1.MESSAGE_TYPE.errors, stats.errors, sender);
114
112
  }
115
- else {
116
- sendMessage(constants_1.MESSAGE_TYPE.ok, null, sender);
117
- }
118
- }
119
- function getStats(stats) {
120
- return stats.toJson({
121
- all: false,
122
- hash: true,
123
- assets: true,
124
- warnings: true,
125
- errors: true,
126
- errorDetails: false,
127
- });
128
- }
129
- function sendMessage(type, data, sender) {
130
- (sender || ws).send(JSON.stringify({ type, data }));
131
113
  }
132
- // mock
133
- // proxy
134
- if (proxy) {
135
- Object.keys(proxy).forEach((key) => {
136
- app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(proxy[key]));
137
- });
114
+ else {
115
+ sendMessage(constants_1.MESSAGE_TYPE.ok, null, sender);
138
116
  }
139
- // after middlewares
140
- (opts.afterMiddlewares || []).forEach((m) => {
141
- // TODO: FIXME
142
- app.use(m.toString().includes(`{ compiler }`) ? m({ compiler }) : m);
143
- });
144
- // history fallback
145
- app.use(require('@umijs/bundler-webpack/compiled/connect-history-api-fallback')({
146
- index: '/',
147
- }));
148
- // hmr reconnect ping
149
- app.use('/__umi_ping', (_, res) => {
150
- res.end('pong');
117
+ }
118
+ function getStats(stats) {
119
+ return stats.toJson({
120
+ all: false,
121
+ hash: true,
122
+ assets: true,
123
+ warnings: true,
124
+ errors: true,
125
+ errorDetails: false,
151
126
  });
152
- // index.html
153
- // TODO: remove me
154
- app.get('/', (_req, res, next) => {
155
- res.set('Content-Type', 'text/html');
156
- const htmlPath = (0, path_1.join)(opts.cwd, 'index.html');
157
- if ((0, fs_1.existsSync)(htmlPath)) {
158
- const html = (0, fs_1.readFileSync)(htmlPath, 'utf-8');
159
- res.send(html);
127
+ }
128
+ function sendMessage(type, data, sender) {
129
+ (sender || ws).send(JSON.stringify({ type, data }));
130
+ }
131
+ // mock
132
+ // proxy
133
+ if (proxy) {
134
+ Object.keys(proxy).forEach((key) => {
135
+ const proxyConfig = proxy[key];
136
+ const target = proxyConfig.target;
137
+ if (target) {
138
+ app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(key, {
139
+ ...proxy[key],
140
+ // Add x-real-url in response header
141
+ onProxyRes(proxyRes, req) {
142
+ var _a;
143
+ proxyRes.headers['x-real-url'] =
144
+ ((_a = new URL(req.url || '', target)) === null || _a === void 0 ? void 0 : _a.href) || '';
145
+ },
146
+ }));
160
147
  }
161
- else {
162
- next();
163
- }
164
- });
165
- const server = http_1.default.createServer(app);
166
- const ws = (0, ws_1.createWebSocketServer)(server);
167
- ws.wss.on('connection', (socket) => {
168
- if (stats) {
169
- sendStats(getStats(stats), false, socket);
170
- }
171
- });
172
- const port = opts.port || 8000;
173
- server.listen(port, () => {
174
- const host = opts.host && opts.host !== '0.0.0.0' ? opts.host : '127.0.0.1';
175
- utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`http://${host}:${port}`)}`);
176
148
  });
177
- return server;
149
+ }
150
+ // after middlewares
151
+ (opts.afterMiddlewares || []).forEach((m) => {
152
+ // TODO: FIXME
153
+ app.use(m.toString().includes(`{ compiler }`) ? m({ compiler }) : m);
154
+ });
155
+ // history fallback
156
+ app.use(require('@umijs/bundler-webpack/compiled/connect-history-api-fallback')({
157
+ index: '/',
158
+ }));
159
+ // hmr reconnect ping
160
+ app.use('/__umi_ping', (_, res) => {
161
+ res.end('pong');
162
+ });
163
+ // index.html
164
+ // TODO: remove me
165
+ app.get('/', (_req, res, next) => {
166
+ res.set('Content-Type', 'text/html');
167
+ const htmlPath = (0, path_1.join)(opts.cwd, 'index.html');
168
+ if ((0, fs_1.existsSync)(htmlPath)) {
169
+ (0, fs_1.createReadStream)(htmlPath).on('error', next).pipe(res);
170
+ }
171
+ else {
172
+ next();
173
+ }
174
+ });
175
+ const server = userConfig.https
176
+ ? await (0, bundler_utils_1.createHttpsServer)(app, userConfig.https)
177
+ : http_1.default.createServer(app);
178
+ if (!server) {
179
+ return null;
180
+ }
181
+ const ws = (0, ws_1.createWebSocketServer)(server);
182
+ ws.wss.on('connection', (socket) => {
183
+ if (stats) {
184
+ sendStats(getStats(stats), false, socket);
185
+ }
186
+ });
187
+ const protocol = userConfig.https ? 'https:' : 'http:';
188
+ const port = opts.port || 8000;
189
+ server.listen(port, () => {
190
+ const host = opts.host && opts.host !== '0.0.0.0' ? opts.host : '127.0.0.1';
191
+ utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`${protocol}//${host}:${port}`)}`);
178
192
  });
193
+ return server;
179
194
  }
180
195
  exports.createServer = createServer;
@@ -1,7 +1,12 @@
1
1
  /// <reference types="node" />
2
- import { Server } from 'http';
2
+ /// <reference types="node" />
3
+ /// <reference types="node" />
4
+ import type { SpdyServer as Server } from '@umijs/bundler-utils';
5
+ import { Server as HttpServer } from 'http';
6
+ import { Http2Server } from 'http2';
7
+ import { Server as HttpsServer } from 'https';
3
8
  import WebSocket from '../../compiled/ws';
4
- export declare function createWebSocketServer(server: Server): {
9
+ export declare function createWebSocketServer(server: HttpServer | HttpsServer | Http2Server | Server): {
5
10
  send(message: string): void;
6
11
  wss: WebSocket.Server;
7
12
  close(): void;
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
7
7
  const utils_1 = require("@umijs/utils");
8
+ const changeImportFromString_1 = require("./changeImportFromString");
8
9
  class AutoCSSModule extends Visitor_1.default {
9
10
  visitTsType(expression) {
10
11
  return expression;
@@ -24,7 +25,8 @@ class AutoCSSModule extends Visitor_1.default {
24
25
  const { specifiers, source } = expression;
25
26
  const { value } = source;
26
27
  if (specifiers.length && (0, utils_1.isStyleFile)({ filename: value })) {
27
- return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value: `${value}?modules` }) });
28
+ const newImportFrom = `${value}?modules`;
29
+ (0, changeImportFromString_1.changeImportFromString)(expression, newImportFrom);
28
30
  }
29
31
  return expression;
30
32
  }
@@ -0,0 +1,2 @@
1
+ import type { ImportDeclaration } from '@swc/core';
2
+ export declare const changeImportFromString: (e: ImportDeclaration, v: string) => void;
@@ -0,0 +1,10 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.changeImportFromString = void 0;
4
+ const changeImportFromString = (e, v) => {
5
+ e.source.value = v;
6
+ // sync change to `raw`
7
+ // https://github.com/swc-project/swc/issues/4128
8
+ e.source.raw = `'${v}'`;
9
+ };
10
+ exports.changeImportFromString = changeImportFromString;
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
7
7
  const utils_1 = require("@umijs/utils");
8
8
  const path_1 = require("path");
9
+ const changeImportFromString_1 = require("./changeImportFromString");
9
10
  function addLastSlash(path) {
10
11
  return path.endsWith('/') ? path : `${path}/`;
11
12
  }
@@ -14,8 +15,8 @@ class LockCoreJS extends Visitor_1.default {
14
15
  const { source } = expression;
15
16
  let { value, type } = source;
16
17
  if (type === 'StringLiteral' && value.startsWith('core-js/')) {
17
- value = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
18
- return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value }) });
18
+ const newValue = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
19
+ (0, changeImportFromString_1.changeImportFromString)(expression, newValue);
19
20
  }
20
21
  return expression;
21
22
  }
package/dist/types.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import type { Config as SwcConfig } from '@swc/core';
2
+ import type { HttpsServerOptions } from '@umijs/bundler-utils';
2
3
  import type { Options as ProxyOptions } from '../compiled/http-proxy-middleware';
3
4
  import { Configuration } from '../compiled/webpack';
4
5
  import Config from '../compiled/webpack-5-chain';
@@ -63,12 +64,14 @@ export interface IConfig {
63
64
  depTranspiler?: Transpiler;
64
65
  devtool?: Config.DevTool;
65
66
  deadCode?: DeadCodeParams;
67
+ https?: HttpsServerOptions;
66
68
  externals?: WebpackConfig['externals'];
67
69
  esm?: {
68
70
  [key: string]: any;
69
71
  };
70
72
  extraBabelPlugins?: IBabelPlugin[];
71
73
  extraBabelPresets?: IBabelPlugin[];
74
+ extraBabelIncludes?: string[];
72
75
  extraPostCSSPlugins?: any[];
73
76
  hash?: boolean;
74
77
  ignoreMomentLocale?: boolean;
@@ -0,0 +1,5 @@
1
+ interface IOpts {
2
+ targets: Record<string, any>;
3
+ }
4
+ export declare function getEsBuildTarget({ targets }: IOpts): string[];
5
+ export {};
@@ -0,0 +1,12 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getEsBuildTarget = void 0;
4
+ const constants_1 = require("../constants");
5
+ function getEsBuildTarget({ targets }) {
6
+ return Object.keys(targets)
7
+ .filter((key) => constants_1.DEFAULT_ESBUILD_TARGET_KEYS.includes(key))
8
+ .map((key) => {
9
+ return `${key}${targets[key] === true ? '0' : targets[key]}`;
10
+ });
11
+ }
12
+ exports.getEsBuildTarget = getEsBuildTarget;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@umijs/bundler-webpack",
3
- "version": "4.0.0-rc.7",
3
+ "version": "4.0.0",
4
4
  "description": "@umijs/bundler-webpack",
5
5
  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
6
6
  "bugs": "https://github.com/umijs/umi-next/issues",
@@ -23,61 +23,63 @@
23
23
  "scripts": {
24
24
  "build": "pnpm tsc",
25
25
  "build:client": "pnpm tsc --project ./tsconfig.client.json",
26
- "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
26
+ "build:deps": "umi-scripts bundleDeps",
27
27
  "dev": "pnpm build -- --watch",
28
28
  "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs",
29
- "test": "jest -c ../../jest.turbo.config.ts"
29
+ "test": "umi-scripts jest-turbo"
30
30
  },
31
31
  "dependencies": {
32
- "@parcel/css": "1.6.0",
33
- "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
32
+ "@parcel/css": "1.9.0",
33
+ "@pmmmwh/react-refresh-webpack-plugin": "0.5.7",
34
34
  "@svgr/core": "6.2.1",
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.0-rc.7",
39
- "@umijs/mfsu": "4.0.0-rc.7",
40
- "@umijs/utils": "4.0.0-rc.7",
38
+ "@umijs/babel-preset-umi": "4.0.0",
39
+ "@umijs/bundler-utils": "4.0.0",
40
+ "@umijs/mfsu": "4.0.0",
41
+ "@umijs/utils": "4.0.0",
42
+ "cors": "^2.8.5",
41
43
  "css-loader": "6.7.1",
42
44
  "es5-imcompatible-versions": "^0.1.73",
43
45
  "jest-worker": "27.5.1",
44
46
  "node-libs-browser": "2.2.1",
45
- "postcss": "^8.4.12",
46
- "postcss-preset-env": "7.4.2",
47
+ "postcss": "^8.4.13",
48
+ "postcss-preset-env": "7.5.0",
47
49
  "react-error-overlay": "6.0.9"
48
50
  },
49
51
  "devDependencies": {
50
- "@swc/core": "1.2.156",
52
+ "@swc/core": "1.2.165",
53
+ "@types/cors": "^2.8.12",
51
54
  "@types/webpack-sources": "3.2.0",
52
55
  "@types/ws": "8.5.3",
53
56
  "autoprefixer": "10.4.4",
54
- "babel-loader": "8.2.3",
57
+ "babel-loader": "8.2.4",
55
58
  "compression": "1.7.4",
56
59
  "connect-history-api-fallback": "1.6.0",
57
60
  "copy-webpack-plugin": "10.2.4",
58
- "css-minimizer-webpack-plugin": "3.4.1",
59
- "cssnano": "5.1.4",
60
- "fork-ts-checker-webpack-plugin": "7.2.1",
61
+ "css-minimizer-webpack-plugin": "4.0.0",
62
+ "cssnano": "5.1.7",
63
+ "fork-ts-checker-webpack-plugin": "7.2.4",
61
64
  "http-proxy-middleware": "2.0.4",
62
65
  "less-loader": "10.2.0",
63
66
  "mini-css-extract-plugin": "2.6.0",
64
67
  "postcss-flexbugs-fixes": "5.0.2",
65
68
  "postcss-loader": "6.2.1",
66
69
  "purgecss-webpack-plugin": "4.1.3",
67
- "react-refresh": "0.11.0",
70
+ "react-refresh": "0.12.0",
68
71
  "sass-loader": "12.6.0",
69
72
  "schema-utils": "4.0.0",
70
73
  "speed-measure-webpack-plugin": "1.5.0",
71
74
  "style-loader": "3.3.1",
72
75
  "svgo-loader": "3.0.0",
73
- "tapable": "2.2.1",
74
76
  "terser": "5.12.1",
75
77
  "terser-webpack-plugin": "5.3.1",
76
78
  "url-loader": "4.1.1",
77
- "webpack": "5.70.0",
79
+ "webpack": "5.72.1",
78
80
  "webpack-5-chain": "8.0.0",
79
81
  "webpack-bundle-analyzer": "4.5.0",
80
- "webpack-dev-middleware": "5.3.1",
82
+ "webpack-dev-middleware": "5.3.3",
81
83
  "webpack-manifest-plugin": "5.0.0",
82
84
  "webpack-sources": "3.2.3",
83
85
  "ws": "8.5.0"
@@ -110,7 +112,6 @@
110
112
  "style-loader",
111
113
  "speed-measure-webpack-plugin",
112
114
  "svgo-loader",
113
- "tapable",
114
115
  "terser",
115
116
  "terser-webpack-plugin",
116
117
  "url-loader",
@@ -133,7 +134,7 @@
133
134
  "less": "@umijs/bundler-utils/compiled/less",
134
135
  "cssnano": "$$LOCAL",
135
136
  "postcss": "postcss",
136
- "tapable": "$$LOCAL",
137
+ "tapable": "@umijs/bundler-utils/compiled/tapable",
137
138
  "terser": "$$LOCAL",
138
139
  "terser-webpack-plugin": "$$LOCAL",
139
140
  "typescript": "typescript",
@@ -174,6 +175,7 @@
174
175
  "postcss-flexbugs-fixes",
175
176
  "postcss-loader",
176
177
  "purgecss-webpack-plugin",
178
+ "react-refresh",
177
179
  "sass-loader",
178
180
  "speed-measure-webpack-plugin",
179
181
  "style-loader",