@umijs/bundler-webpack 4.0.0-rc.14 → 4.0.0-rc.15

package/dist/loader/swc.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@swc/core");
 const types_1 = require("../types");
@@ -54,11 +43,17 @@ function swcLoader(contents) {
     // 启用异步模式
     const callback = this.async();
     const loaderOpts = this.getOptions();
-    const { sync = false, parseMap = false } = loaderOpts, otherOpts = __rest(loaderOpts, ["sync", "parseMap"]);
+    const { sync = false, parseMap = false, ...otherOpts } = loaderOpts;
     const filename = this.resourcePath;
-    const swcOpts = Object.assign(Object.assign(Object.assign({}, getBaseOpts({
+    const swcOpts = {
+        ...getBaseOpts({
+            filename,
+        }),
         filename,
-    })), { filename, sourceMaps: this.sourceMap, sourceFileName: filename }), otherOpts);
+        sourceMaps: this.sourceMap,
+        sourceFileName: filename,
+        ...otherOpts,
+    };
     try {
         if (sync) {
             const output = (0, core_1.transformSync)(contents, swcOpts);

package/dist/plugins/ESBuildCSSMinifyPlugin.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
 const webpack_sources_1 = require("@umijs/bundler-webpack/compiled/webpack-sources");
@@ -30,34 +21,32 @@ class ESBuildCSSMinifyPlugin {
                 name: PLUGIN_NAME,
                 stage: 400,
                 additionalAssets: true,
-            }, () => __awaiter(this, void 0, void 0, function* () {
-                yield this.transformAssets(compilation);
-            }));
+            }, async () => {
+                await this.transformAssets(compilation);
+            });
         });
     }
-    transformAssets(compilation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { options: { devtool }, } = compilation.compiler;
-            const sourcemap = this.options.sourcemap === undefined ? !!devtool : this.options.sourcemap;
-            const assets = compilation.getAssets().filter((asset) => {
-                return !asset.info.minimized && RE_CSS_FILE.test(asset.name);
-            });
-            yield Promise.all(assets.map((asset) => __awaiter(this, void 0, void 0, function* () {
-                const { source, map } = asset.source.sourceAndMap();
-                const sourceAsString = source.toString();
-                const result = yield (0, esbuild_1.transform)(sourceAsString, {
-                    loader: 'css',
-                    sourcemap,
-                    sourcefile: asset.name,
-                    minify: true,
-                });
-                compilation.updateAsset(asset.name, 
-                // @ts-ignore
-                sourcemap
-                    ? new webpack_sources_1.SourceMapSource(result.code, asset.name, result.map, sourceAsString, map, true)
-                    : new webpack_sources_1.RawSource(result.code), Object.assign(Object.assign({}, asset.info), { minimized: true }));
-            })));
+    async transformAssets(compilation) {
+        const { options: { devtool }, } = compilation.compiler;
+        const sourcemap = this.options.sourcemap === undefined ? !!devtool : this.options.sourcemap;
+        const assets = compilation.getAssets().filter((asset) => {
+            return !asset.info.minimized && RE_CSS_FILE.test(asset.name);
         });
+        await Promise.all(assets.map(async (asset) => {
+            const { source, map } = asset.source.sourceAndMap();
+            const sourceAsString = source.toString();
+            const result = await (0, esbuild_1.transform)(sourceAsString, {
+                loader: 'css',
+                sourcemap,
+                sourcefile: asset.name,
+                minify: true,
+            });
+            compilation.updateAsset(asset.name, 
+            // @ts-ignore
+            sourcemap
+                ? new webpack_sources_1.SourceMapSource(result.code, asset.name, result.map, sourceAsString, map, true)
+                : new webpack_sources_1.RawSource(result.code), { ...asset.info, minimized: true });
+        }));
     }
 }
 exports.default = ESBuildCSSMinifyPlugin;

package/dist/plugins/ParcelCSSMinifyPlugin.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParcelCSSMinifyPlugin = void 0;
 const utils_1 = require("@umijs/utils");
@@ -35,7 +26,7 @@ class ParcelCSSMinifyPlugin {
                 // @ts-ignore
                 stage: compilation.constructor.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE,
                 additionalAssets: true,
-            }, () => __awaiter(this, void 0, void 0, function* () { return yield this.transformAssets(compilation); }));
+            }, async () => await this.transformAssets(compilation));
             compilation.hooks.statsPrinter.tap(PLUGIN_NAME, (statsPrinter) => {
                 statsPrinter.hooks.print
                     .for('asset.info.minimized')
@@ -47,29 +38,36 @@ class ParcelCSSMinifyPlugin {
             });
         });
     }
-    transformAssets(compilation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { options: { devtool }, } = compilation.compiler;
-            const sourcemap = this.options.sourceMap === undefined
-                ? (devtool && devtool.includes('source-map'))
-                : this.options.sourceMap;
-            const assets = compilation.getAssets().filter((asset) => {
-                return !asset.info.minimized && CSS_FILE_REG.test(asset.name);
-            });
-            yield Promise.all(assets.map((asset) => __awaiter(this, void 0, void 0, function* () {
-                const { source, map } = asset.source.sourceAndMap();
-                const sourceAsString = source.toString();
-                const code = typeof source === 'string' ? buffer_1.Buffer.from(source) : source;
-                const { transform } = (0, utils_1.importLazy)('@parcel/css');
-                const result = yield transform(Object.assign({ filename: asset.name, code, minify: true, sourceMap: sourcemap }, this.options));
-                const codeString = result.code.toString();
-                compilation.updateAsset(asset.name, 
-                // @ts-ignore
-                sourcemap
-                    ? new webpack_sources_1.SourceMapSource(codeString, asset.name, JSON.parse(result.map.toString()), sourceAsString, map, true)
-                    : new webpack_sources_1.RawSource(codeString), Object.assign(Object.assign({}, asset.info), { minimized: true }));
-            })));
+    async transformAssets(compilation) {
+        const { options: { devtool }, } = compilation.compiler;
+        const sourcemap = this.options.sourceMap === undefined
+            ? (devtool && devtool.includes('source-map'))
+            : this.options.sourceMap;
+        const assets = compilation.getAssets().filter((asset) => {
+            return !asset.info.minimized && CSS_FILE_REG.test(asset.name);
         });
+        await Promise.all(assets.map(async (asset) => {
+            const { source, map } = asset.source.sourceAndMap();
+            const sourceAsString = source.toString();
+            const code = typeof source === 'string' ? buffer_1.Buffer.from(source) : source;
+            const { transform } = (0, utils_1.importLazy)('@parcel/css');
+            const result = await transform({
+                filename: asset.name,
+                code,
+                minify: true,
+                sourceMap: sourcemap,
+                ...this.options,
+            });
+            const codeString = result.code.toString();
+            compilation.updateAsset(asset.name, 
+            // @ts-ignore
+            sourcemap
+                ? new webpack_sources_1.SourceMapSource(codeString, asset.name, JSON.parse(result.map.toString()), sourceAsString, map, true)
+                : new webpack_sources_1.RawSource(codeString), {
+                ...asset.info,
+                minimized: true,
+            });
+        }));
     }
 }
 exports.ParcelCSSMinifyPlugin = ParcelCSSMinifyPlugin;

package/dist/server/server.d.ts

@@ -13,5 +13,5 @@ interface IOpts {
     onDevCompileDone?: Function;
     onProgress?: Function;
 }
-export declare function createServer(opts: IOpts): Promise<import("https").Server | http.Server | null>;
+export declare function createServer(opts: IOpts): Promise<http.Server | import("https").Server | null>;
 export {};

package/dist/server/server.js

@@ -1,18 +1,10 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServer = void 0;
+const bundler_utils_1 = require("@umijs/bundler-utils");
 const express_1 = __importDefault(require("@umijs/bundler-utils/compiled/express"));
 const http_proxy_middleware_1 = require("@umijs/bundler-webpack/compiled/http-proxy-middleware");
 const webpack_1 = __importDefault(require("@umijs/bundler-webpack/compiled/webpack"));
@@ -21,182 +13,181 @@ const fs_1 = require("fs");
 const http_1 = __importDefault(require("http"));
 const path_1 = require("path");
 const constants_1 = require("../constants");
-const https_1 = require("./https");
 const ws_1 = require("./ws");
-function createServer(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { webpackConfig, userConfig } = opts;
-        const { proxy } = userConfig;
-        const app = (0, express_1.default)();
-        // cros
-        app.use((_req, res, next) => {
-            res.header('Access-Control-Allow-Origin', '*');
-            res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With');
-            res.header('Access-Control-Allow-Methods', 'GET, HEAD, PUT, POST, PATCH, DELETE, OPTIONS');
+async function createServer(opts) {
+    const { webpackConfig, userConfig } = opts;
+    const { proxy } = userConfig;
+    const app = (0, express_1.default)();
+    // cros
+    app.use((_req, res, next) => {
+        res.header('Access-Control-Allow-Origin', '*');
+        res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With');
+        res.header('Access-Control-Allow-Methods', 'GET, HEAD, PUT, POST, PATCH, DELETE, OPTIONS');
+        next();
+    });
+    // compression
+    app.use(require('@umijs/bundler-webpack/compiled/compression')());
+    // TODO: headers
+    // before middlewares
+    (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
+    // TODO: add to before middleware
+    app.use((req, res, next) => {
+        if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
+            res.setHeader('Content-Type', 'application/javascript');
+            (0, fs_1.createReadStream)((0, path_1.join)(opts.cwd, 'umi.js')).on('error', next).pipe(res);
+        }
+        else {
             next();
+        }
+    });
+    // webpack dev middleware
+    const configs = Array.isArray(webpackConfig)
+        ? webpackConfig
+        : [webpackConfig];
+    const progresses = [];
+    if (opts.onProgress) {
+        configs.forEach((config) => {
+            const progress = {
+                percent: 0,
+                status: 'waiting',
+            };
+            progresses.push(progress);
+            config.plugins.push(new webpack_1.default.ProgressPlugin((percent, msg) => {
+                progress.percent = percent;
+                progress.status = msg;
+                opts.onProgress({ progresses });
+            }));
         });
-        // compression
-        app.use(require('@umijs/bundler-webpack/compiled/compression')());
-        // TODO: headers
-        // before middlewares
-        (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
-        // TODO: add to before middleware
-        app.use((req, res, next) => {
-            if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
-                res.setHeader('Content-Type', 'application/javascript');
-                (0, fs_1.createReadStream)((0, path_1.join)(opts.cwd, 'umi.js')).on('error', next).pipe(res);
-            }
-            else {
-                next();
-            }
+    }
+    const compiler = (0, webpack_1.default)(configs);
+    const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
+    const compilerMiddleware = webpackDevMiddleware(compiler, {
+        publicPath: userConfig.publicPath || '/',
+        writeToDisk: userConfig.writeToDisk,
+        stats: 'none',
+        // watchOptions: { ignored }
+    });
+    app.use(compilerMiddleware);
+    // hmr hooks
+    let stats;
+    let isFirstCompile = true;
+    compiler.compilers.forEach(addHooks);
+    function addHooks(compiler) {
+        compiler.hooks.invalid.tap('server', () => {
+            sendMessage(constants_1.MESSAGE_TYPE.invalid);
         });
-        // webpack dev middleware
-        const configs = Array.isArray(webpackConfig)
-            ? webpackConfig
-            : [webpackConfig];
-        const progresses = [];
-        if (opts.onProgress) {
-            configs.forEach((config) => {
-                const progress = {
-                    percent: 0,
-                    status: 'waiting',
-                };
-                progresses.push(progress);
-                config.plugins.push(new webpack_1.default.ProgressPlugin((percent, msg) => {
-                    progress.percent = percent;
-                    progress.status = msg;
-                    opts.onProgress({ progresses });
-                }));
+        compiler.hooks.done.tap('server', (_stats) => {
+            var _a;
+            stats = _stats;
+            sendStats(getStats(stats));
+            (_a = opts.onDevCompileDone) === null || _a === void 0 ? void 0 : _a.call(opts, {
+                stats,
+                isFirstCompile,
+                time: stats.endTime - stats.startTime,
             });
-        }
-        const compiler = (0, webpack_1.default)(configs);
-        const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
-        const compilerMiddleware = webpackDevMiddleware(compiler, {
-            publicPath: userConfig.publicPath || '/',
-            writeToDisk: userConfig.writeToDisk,
-            stats: 'none',
-            // watchOptions: { ignored }
+            isFirstCompile = false;
         });
-        app.use(compilerMiddleware);
-        // hmr hooks
-        let stats;
-        let isFirstCompile = true;
-        compiler.compilers.forEach(addHooks);
-        function addHooks(compiler) {
-            compiler.hooks.invalid.tap('server', () => {
-                sendMessage(constants_1.MESSAGE_TYPE.invalid);
-            });
-            compiler.hooks.done.tap('server', (_stats) => {
-                var _a;
-                stats = _stats;
-                sendStats(getStats(stats));
-                (_a = opts.onDevCompileDone) === null || _a === void 0 ? void 0 : _a.call(opts, {
-                    stats,
-                    isFirstCompile,
-                    time: stats.endTime - stats.startTime,
-                });
-                isFirstCompile = false;
-            });
+    }
+    function sendStats(stats, force, sender) {
+        const shouldEmit = !force &&
+            stats &&
+            (!stats.errors || stats.errors.length === 0) &&
+            (!stats.warnings || stats.warnings.length === 0) &&
+            stats.assets &&
+            stats.assets.every((asset) => !asset.emitted);
+        if (shouldEmit) {
+            sendMessage(constants_1.MESSAGE_TYPE.stillOk, null, sender);
+            return;
         }
-        function sendStats(stats, force, sender) {
-            const shouldEmit = !force &&
-                stats &&
-                (!stats.errors || stats.errors.length === 0) &&
-                (!stats.warnings || stats.warnings.length === 0) &&
-                stats.assets &&
-                stats.assets.every((asset) => !asset.emitted);
-            if (shouldEmit) {
-                sendMessage(constants_1.MESSAGE_TYPE.stillOk, null, sender);
-                return;
-            }
-            sendMessage(constants_1.MESSAGE_TYPE.hash, stats.hash, sender);
-            if ((stats.errors && stats.errors.length > 0) ||
-                (stats.warnings && stats.warnings.length > 0)) {
-                if (stats.warnings && stats.warnings.length > 0) {
-                    sendMessage(constants_1.MESSAGE_TYPE.warnings, stats.warnings, sender);
-                }
-                if (stats.errors && stats.errors.length > 0) {
-                    sendMessage(constants_1.MESSAGE_TYPE.errors, stats.errors, sender);
-                }
+        sendMessage(constants_1.MESSAGE_TYPE.hash, stats.hash, sender);
+        if ((stats.errors && stats.errors.length > 0) ||
+            (stats.warnings && stats.warnings.length > 0)) {
+            if (stats.warnings && stats.warnings.length > 0) {
+                sendMessage(constants_1.MESSAGE_TYPE.warnings, stats.warnings, sender);
             }
-            else {
-                sendMessage(constants_1.MESSAGE_TYPE.ok, null, sender);
+            if (stats.errors && stats.errors.length > 0) {
+                sendMessage(constants_1.MESSAGE_TYPE.errors, stats.errors, sender);
             }
         }
-        function getStats(stats) {
-            return stats.toJson({
-                all: false,
-                hash: true,
-                assets: true,
-                warnings: true,
-                errors: true,
-                errorDetails: false,
-            });
-        }
-        function sendMessage(type, data, sender) {
-            (sender || ws).send(JSON.stringify({ type, data }));
+        else {
+            sendMessage(constants_1.MESSAGE_TYPE.ok, null, sender);
         }
-        // mock
-        // proxy
-        if (proxy) {
-            Object.keys(proxy).forEach((key) => {
-                const proxyConfig = proxy[key];
-                const target = proxyConfig.target;
-                if (target) {
-                    app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(key, Object.assign(Object.assign({}, proxy[key]), { 
-                        // Add x-real-url in response header
-                        onProxyRes(proxyRes, req) {
-                            var _a;
-                            proxyRes.headers['x-real-url'] =
-                                ((_a = new URL(req.url || '', target)) === null || _a === void 0 ? void 0 : _a.href) || '';
-                        } })));
-                }
-            });
-        }
-        // after middlewares
-        (opts.afterMiddlewares || []).forEach((m) => {
-            // TODO: FIXME
-            app.use(m.toString().includes(`{ compiler }`) ? m({ compiler }) : m);
+    }
+    function getStats(stats) {
+        return stats.toJson({
+            all: false,
+            hash: true,
+            assets: true,
+            warnings: true,
+            errors: true,
+            errorDetails: false,
         });
-        // history fallback
-        app.use(require('@umijs/bundler-webpack/compiled/connect-history-api-fallback')({
-            index: '/',
-        }));
-        // hmr reconnect ping
-        app.use('/__umi_ping', (_, res) => {
-            res.end('pong');
-        });
-        // index.html
-        // TODO: remove me
-        app.get('/', (_req, res, next) => {
-            res.set('Content-Type', 'text/html');
-            const htmlPath = (0, path_1.join)(opts.cwd, 'index.html');
-            if ((0, fs_1.existsSync)(htmlPath)) {
-                (0, fs_1.createReadStream)(htmlPath).on('error', next).pipe(res);
-            }
-            else {
-                next();
+    }
+    function sendMessage(type, data, sender) {
+        (sender || ws).send(JSON.stringify({ type, data }));
+    }
+    // mock
+    // proxy
+    if (proxy) {
+        Object.keys(proxy).forEach((key) => {
+            const proxyConfig = proxy[key];
+            const target = proxyConfig.target;
+            if (target) {
+                app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(key, {
+                    ...proxy[key],
+                    // Add x-real-url in response header
+                    onProxyRes(proxyRes, req) {
+                        var _a;
+                        proxyRes.headers['x-real-url'] =
+                            ((_a = new URL(req.url || '', target)) === null || _a === void 0 ? void 0 : _a.href) || '';
+                    },
+                }));
             }
         });
-        const server = userConfig.https
-            ? yield (0, https_1.createHttpsServer)(app, userConfig.https)
-            : http_1.default.createServer(app);
-        if (!server) {
-            return null;
+    }
+    // after middlewares
+    (opts.afterMiddlewares || []).forEach((m) => {
+        // TODO: FIXME
+        app.use(m.toString().includes(`{ compiler }`) ? m({ compiler }) : m);
+    });
+    // history fallback
+    app.use(require('@umijs/bundler-webpack/compiled/connect-history-api-fallback')({
+        index: '/',
+    }));
+    // hmr reconnect ping
+    app.use('/__umi_ping', (_, res) => {
+        res.end('pong');
+    });
+    // index.html
+    // TODO: remove me
+    app.get('/', (_req, res, next) => {
+        res.set('Content-Type', 'text/html');
+        const htmlPath = (0, path_1.join)(opts.cwd, 'index.html');
+        if ((0, fs_1.existsSync)(htmlPath)) {
+            (0, fs_1.createReadStream)(htmlPath).on('error', next).pipe(res);
         }
-        const ws = (0, ws_1.createWebSocketServer)(server);
-        ws.wss.on('connection', (socket) => {
-            if (stats) {
-                sendStats(getStats(stats), false, socket);
-            }
-        });
-        const protocol = userConfig.https ? 'https:' : 'http:';
-        const port = opts.port || 8000;
-        server.listen(port, () => {
-            const host = opts.host && opts.host !== '0.0.0.0' ? opts.host : '127.0.0.1';
-            utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`${protocol}//${host}:${port}`)}`);
-        });
-        return server;
+        else {
+            next();
+        }
+    });
+    const server = userConfig.https
+        ? await (0, bundler_utils_1.createHttpsServer)(app, userConfig.https)
+        : http_1.default.createServer(app);
+    if (!server) {
+        return null;
+    }
+    const ws = (0, ws_1.createWebSocketServer)(server);
+    ws.wss.on('connection', (socket) => {
+        if (stats) {
+            sendStats(getStats(stats), false, socket);
+        }
+    });
+    const protocol = userConfig.https ? 'https:' : 'http:';
+    const port = opts.port || 8000;
+    server.listen(port, () => {
+        const host = opts.host && opts.host !== '0.0.0.0' ? opts.host : '127.0.0.1';
+        utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`${protocol}//${host}:${port}`)}`);
     });
+    return server;
 }
 exports.createServer = createServer;

package/dist/server/ws.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
+import type { SpdyServer as Server } from '@umijs/bundler-utils';
 import { Server as HttpServer } from 'http';
 import { Http2Server } from 'http2';
 import { Server as HttpsServer } from 'https';
-import { Server } from 'spdy';
 import WebSocket from '../../compiled/ws';
 export declare function createWebSocketServer(server: HttpServer | HttpsServer | Http2Server | Server): {
     send(message: string): void;

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 import type { Config as SwcConfig } from '@swc/core';
+import type { HttpsServerOptions } from '@umijs/bundler-utils';
 import type { Options as ProxyOptions } from '../compiled/http-proxy-middleware';
 import { Configuration } from '../compiled/webpack';
 import Config from '../compiled/webpack-5-chain';
@@ -41,11 +42,6 @@ export interface DeadCodeParams {
     detectUnusedExport?: boolean;
     context?: string;
 }
-export interface HttpsParams {
-    key?: string;
-    cert?: string;
-    hosts?: string[];
-}
 export interface IConfig {
     alias?: Record<string, string>;
     autoCSSModules?: boolean;
@@ -68,7 +64,7 @@ export interface IConfig {
     depTranspiler?: Transpiler;
     devtool?: Config.DevTool;
     deadCode?: DeadCodeParams;
-    https?: HttpsParams;
+    https?: HttpsServerOptions;
     externals?: WebpackConfig['externals'];
     esm?: {
         [key: string]: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-rc.14",
+  "version": "4.0.0-rc.15",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -35,22 +35,20 @@
     "@svgr/plugin-jsx": "^6.2.1",
     "@svgr/plugin-svgo": "^6.2.0",
     "@types/hapi__joi": "17.1.8",
-    "@umijs/babel-preset-umi": "4.0.0-rc.14",
-    "@umijs/bundler-utils": "4.0.0-rc.14",
-    "@umijs/mfsu": "4.0.0-rc.14",
-    "@umijs/utils": "4.0.0-rc.14",
+    "@umijs/babel-preset-umi": "4.0.0-rc.15",
+    "@umijs/bundler-utils": "4.0.0-rc.15",
+    "@umijs/mfsu": "4.0.0-rc.15",
+    "@umijs/utils": "4.0.0-rc.15",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",
     "node-libs-browser": "2.2.1",
     "postcss": "^8.4.12",
     "postcss-preset-env": "7.4.3",
-    "react-error-overlay": "6.0.9",
-    "spdy": "^4.0.2"
+    "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
     "@swc/core": "1.2.165",
-    "@types/spdy": "^3.4.5",
     "@types/webpack-sources": "3.2.0",
     "@types/ws": "8.5.3",
     "autoprefixer": "10.4.4",

package/dist/server/https.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-import { RequestListener } from 'http';
-import { HttpsParams } from '../types';
-export declare function createHttpsServer(app: RequestListener, httpsConfig: HttpsParams): Promise<import("https").Server>;