@umijs/bundler-webpack 4.0.0-rc.13 → 4.0.0-rc.16

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,194 +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)();
-        // basename middleware
-        app.use((req, _res, next) => {
-            const { url, path } = req;
-            const { basename, history } = userConfig;
-            if ((history === null || history === void 0 ? void 0 : history.type) === 'browser' &&
-                basename !== '/' &&
-                url.startsWith(basename)) {
-                req.url = url.slice(basename.length);
-                req.path = path.slice(basename.length);
-            }
-            next();
-        });
-        // 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);
-        });
-        // 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');
+    }
+    function getStats(stats) {
+        return stats.toJson({
+            all: false,
+            hash: true,
+            assets: true,
+            warnings: true,
+            errors: true,
+            errorDetails: false,
         });
-        // 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,10 @@
 /// <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 WebSocket from '../../compiled/ws';
-export declare function createWebSocketServer(server: HttpServer | HttpsServer): {
+export declare function createWebSocketServer(server: HttpServer | HttpsServer | Http2Server | Server): {
     send(message: string): void;
     wss: WebSocket.Server;
     close(): 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,13 +64,14 @@ export interface IConfig {
     depTranspiler?: Transpiler;
     devtool?: Config.DevTool;
     deadCode?: DeadCodeParams;
-    https?: HttpsParams;
+    https?: HttpsServerOptions;
     externals?: WebpackConfig['externals'];
     esm?: {
         [key: string]: any;
     };
     extraBabelPlugins?: IBabelPlugin[];
     extraBabelPresets?: IBabelPlugin[];
+    extraBabelIncludes?: string[];
     extraPostCSSPlugins?: any[];
     hash?: boolean;
     ignoreMomentLocale?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-rc.13",
+  "version": "4.0.0-rc.16",
   "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",
@@ -23,28 +23,28 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:client": "pnpm tsc --project ./tsconfig.client.json",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch",
     "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@parcel/css": "1.8.1",
+    "@parcel/css": "1.8.2",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
     "@svgr/core": "6.2.1",
     "@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.13",
-    "@umijs/bundler-utils": "4.0.0-rc.13",
-    "@umijs/mfsu": "4.0.0-rc.13",
-    "@umijs/utils": "4.0.0-rc.13",
+    "@umijs/babel-preset-umi": "4.0.0-rc.16",
+    "@umijs/bundler-utils": "4.0.0-rc.16",
+    "@umijs/mfsu": "4.0.0-rc.16",
+    "@umijs/utils": "4.0.0-rc.16",
     "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",
+    "postcss": "^8.4.13",
+    "postcss-preset-env": "7.5.0",
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {

package/dist/server/https.d.ts

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

package/dist/server/https.js

@@ -1,73 +0,0 @@
-"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.createHttpsServer = void 0;
-const utils_1 = require("@umijs/utils");
-const fs_1 = require("fs");
-const https_1 = __importDefault(require("https"));
-const path_1 = require("path");
-const defaultHttpsHosts = ['localhost', '127.0.0.1'];
-function createHttpsServer(app, httpsConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        utils_1.logger.wait('[HTTPS] Starting service in https mode...');
-        // Check if mkcert is installed
-        try {
-            yield utils_1.execa.execa('mkcert', ['--version']);
-        }
-        catch (e) {
-            utils_1.logger.error('[HTTPS] The mkcert has not been installed.');
-            utils_1.logger.info('[HTTPS] Please follow the guide to install manually.');
-            switch (process.platform) {
-                case 'darwin':
-                    console.log(utils_1.chalk.green('$ brew install mkcert'));
-                    console.log(utils_1.chalk.gray('# If you use firefox, please install nss.'));
-                    console.log(utils_1.chalk.green('$ brew install nss'));
-                    console.log(utils_1.chalk.green('$ mkcert -install'));
-                    break;
-                case 'win32':
-                    console.log(utils_1.chalk.green('Checkout https://github.com/FiloSottile/mkcert#windows'));
-                    break;
-                case 'linux':
-                    console.log(utils_1.chalk.green('Checkout https://github.com/FiloSottile/mkcert#linux'));
-                    break;
-                default:
-                    break;
-            }
-            throw new Error(`[HTTPS] mkcert not found.`);
-        }
-        let { key, cert, hosts } = httpsConfig;
-        hosts = hosts || defaultHttpsHosts;
-        if (!key || !cert) {
-            key = (0, path_1.join)(__dirname, 'umi.key.pem');
-            cert = (0, path_1.join)(__dirname, 'umi.pem');
-        }
-        // Generate cert and key files if they are not exist.
-        if (!(0, fs_1.existsSync)(key) || !(0, fs_1.existsSync)(cert)) {
-            utils_1.logger.wait('[HTTPS] Generating cert and key files...');
-            yield utils_1.execa.execa('mkcert', [
-                '-cert-file',
-                cert,
-                '-key-file',
-                key,
-                ...hosts,
-            ]);
-        }
-        // Create server
-        return https_1.default.createServer({
-            key: (0, fs_1.readFileSync)(key, 'utf-8'),
-            cert: (0, fs_1.readFileSync)(cert, 'utf-8'),
-        }, app);
-    });
-}
-exports.createHttpsServer = createHttpsServer;