@umijs/bundler-webpack 4.0.0-canary.20220427.1 → 4.0.0-canary.20220429.1

package/dist/config/config.js

@@ -35,7 +35,6 @@ const javaScriptRules_1 = require("./javaScriptRules");
 const manifestPlugin_1 = require("./manifestPlugin");
 const miniCSSExtractPlugin_1 = require("./miniCSSExtractPlugin");
 const nodePolyfill_1 = require("./nodePolyfill");
-const nodePrefixPlugin_1 = require("./nodePrefixPlugin");
 const progressPlugin_1 = require("./progressPlugin");
 const speedMeasureWebpackPlugin_1 = require("./speedMeasureWebpackPlugin");
 const svgRules_1 = require("./svgRules");
@@ -156,7 +155,8 @@ function getConfig(opts) {
         // handle HarmonyLinkingError
         yield (0, harmonyLinkingErrorPlugin_1.addHarmonyLinkingErrorPlugin)(applyOpts);
         // remove node: prefix
-        yield (0, nodePrefixPlugin_1.addNodePrefixPlugin)(applyOpts);
+        // disable for performance
+        // await addNodePrefixPlugin(applyOpts);
         // runtimePublicPath
         if (userConfig.runtimePublicPath) {
             config.plugin('runtimePublicPath').use(RuntimePublicPathPlugin_1.RuntimePublicPathPlugin);

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

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (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,7 +22,6 @@ 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* () {
@@ -179,7 +179,7 @@ function createServer(opts) {
             }
         });
         const server = userConfig.https
-            ? yield (0, https_1.createHttpsServer)(app, userConfig.https)
+            ? yield (0, bundler_utils_1.createHttpsServer)(app, userConfig.https)
             : http_1.default.createServer(app);
         if (!server) {
             return null;

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,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-canary.20220427.1",
+  "version": "4.0.0-canary.20220429.1",
   "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,10 +35,10 @@
     "@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-canary.20220427.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220427.1",
-    "@umijs/mfsu": "4.0.0-canary.20220427.1",
-    "@umijs/utils": "4.0.0-canary.20220427.1",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20220429.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220429.1",
+    "@umijs/mfsu": "4.0.0-canary.20220429.1",
+    "@umijs/utils": "4.0.0-canary.20220429.1",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",

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;