@umijs/bundler-webpack 4.0.0-rc.10 → 4.0.0-rc.11

package/client/client/client.js

@@ -13,15 +13,21 @@ import * as ErrorOverlay from 'react-error-overlay';
 import { MESSAGE_TYPE } from '../constants';
 import { formatWebpackMessages } from '../utils/formatWebpackMessages';
 console.log('[webpack] connecting...');
+function getSocketHost() {
+    let l = location;
+    if (process.env.SOCKET_SERVER) {
+        l = new URL(process.env.SOCKET_SERVER);
+    }
+    const host = l.host;
+    const isHttps = l.protocol === 'https:';
+    return `${isHttps ? 'wss' : 'ws'}://${host}`;
+}
 let pingTimer = null;
-const host = location.host;
-const isHttps = location.protocol === 'https:';
-const wsUrl = `${isHttps ? 'wss' : 'ws'}://${host}`;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(wsUrl, 'webpack-hmr');
+const socket = new WebSocket(getSocketHost(), 'webpack-hmr');
 socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void 0, function* () {
     data = JSON.parse(data);
     if (data.type === 'connected') {

package/dist/client/client.js

@@ -41,15 +41,21 @@ const ErrorOverlay = __importStar(require("react-error-overlay"));
 const constants_1 = require("../constants");
 const formatWebpackMessages_1 = require("../utils/formatWebpackMessages");
 console.log('[webpack] connecting...');
+function getSocketHost() {
+    let l = location;
+    if (process.env.SOCKET_SERVER) {
+        l = new URL(process.env.SOCKET_SERVER);
+    }
+    const host = l.host;
+    const isHttps = l.protocol === 'https:';
+    return `${isHttps ? 'wss' : 'ws'}://${host}`;
+}
 let pingTimer = null;
-const host = location.host;
-const isHttps = location.protocol === 'https:';
-const wsUrl = `${isHttps ? 'wss' : 'ws'}://${host}`;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(wsUrl, 'webpack-hmr');
+const socket = new WebSocket(getSocketHost(), 'webpack-hmr');
 socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void 0, function* () {
     data = JSON.parse(data);
     if (data.type === 'connected') {

package/dist/config/config.js

@@ -35,6 +35,7 @@ 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");
@@ -153,6 +154,8 @@ function getConfig(opts) {
         // await applyPurgeCSSWebpackPlugin(applyOpts);
         // handle HarmonyLinkingError
         yield (0, harmonyLinkingErrorPlugin_1.addHarmonyLinkingErrorPlugin)(applyOpts);
+        // remove node: prefix
+        yield (0, nodePrefixPlugin_1.addNodePrefixPlugin)(applyOpts);
         // runtimePublicPath
         if (userConfig.runtimePublicPath) {
             config.plugin('runtimePublicPath').use(RuntimePublicPathPlugin_1.RuntimePublicPathPlugin);

package/dist/config/nodePolyfill.js

@@ -14,12 +14,12 @@ const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
 function addNodePolyfill(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const { config } = opts;
-        const nodeLibs = require('node-libs-browser');
         config.plugin('node-polyfill-provider').use(webpack_1.ProvidePlugin, [
             {
                 Buffer: ['buffer', 'Buffer'],
             },
         ]);
+        const nodeLibs = require('node-libs-browser');
         config.resolve.fallback.merge(Object.assign(Object.assign({}, Object.keys(nodeLibs).reduce((memo, key) => {
             if (nodeLibs[key]) {
                 memo[key] = nodeLibs[key];

package/dist/config/nodePrefixPlugin.d.ts

@@ -0,0 +1,11 @@
+import Config from '@umijs/bundler-webpack/compiled/webpack-5-chain';
+import { Env, IConfig } from '../types';
+interface IOpts {
+    name?: string;
+    config: Config;
+    userConfig: IConfig;
+    cwd: string;
+    env: Env;
+}
+export declare function addNodePrefixPlugin(opts: IOpts): Promise<void>;
+export {};

package/dist/config/nodePrefixPlugin.js

@@ -0,0 +1,25 @@
+"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.addNodePrefixPlugin = void 0;
+const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
+function addNodePrefixPlugin(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { config } = opts;
+        config.plugin('node-prefix-plugin').use(webpack_1.NormalModuleReplacementPlugin, [
+            /^node:/,
+            (resource) => {
+                resource.request = resource.request.replace(/^node:/, '');
+            },
+        ]);
+    });
+}
+exports.addNodePrefixPlugin = addNodePrefixPlugin;

package/dist/server/https.d.ts

@@ -0,0 +1,5 @@
+/// <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

@@ -0,0 +1,73 @@
+"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;

package/dist/server/server.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { Configuration } from '@umijs/bundler-webpack/compiled/webpack';
+import http from 'http';
 import { IConfig } from '../types';
 interface IOpts {
     cwd: string;
@@ -11,5 +12,5 @@ interface IOpts {
     afterMiddlewares?: any[];
     onDevCompileDone?: Function;
 }
-export declare function createServer(opts: IOpts): Promise<import("http").Server | import("https").Server | null>;
+export declare function createServer(opts: IOpts): Promise<import("https").Server | http.Server | null>;
 export {};

package/dist/server/server.js

@@ -18,9 +18,10 @@ const http_proxy_middleware_1 = require("@umijs/bundler-webpack/compiled/http-pr
 const webpack_1 = __importDefault(require("@umijs/bundler-webpack/compiled/webpack"));
 const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
+const http_1 = __importDefault(require("http"));
 const path_1 = require("path");
 const constants_1 = require("../constants");
-const server_1 = require("../utils/server");
+const https_1 = require("./https");
 const ws_1 = require("./ws");
 function createServer(opts) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -171,7 +172,9 @@ function createServer(opts) {
                 next();
             }
         });
-        const server = yield (0, server_1.getServer)(app, userConfig.https);
+        const server = userConfig.https
+            ? yield (0, https_1.createHttpsServer)(app, userConfig.https)
+            : http_1.default.createServer(app);
         if (!server) {
             return null;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-rc.10",
+  "version": "4.0.0-rc.11",
   "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-rc.10",
-    "@umijs/bundler-utils": "4.0.0-rc.10",
-    "@umijs/mfsu": "4.0.0-rc.10",
-    "@umijs/utils": "4.0.0-rc.10",
+    "@umijs/babel-preset-umi": "4.0.0-rc.11",
+    "@umijs/bundler-utils": "4.0.0-rc.11",
+    "@umijs/mfsu": "4.0.0-rc.11",
+    "@umijs/utils": "4.0.0-rc.11",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",

package/dist/utils/server.d.ts

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

package/dist/utils/server.js

@@ -1,93 +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.getServer = void 0;
-const utils_1 = require("@umijs/utils");
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const http_1 = __importDefault(require("http"));
-const https_1 = __importDefault(require("https"));
-const path_1 = require("path");
-const defaultHttpsHosts = ['localhost', '127.0.0.1'];
-/**
- * Check if mkcert is installed
- */
-const mkcertCmdChecker = () => {
-    return new Promise((resolve, reject) => {
-        (0, child_process_1.exec)('mkcert -help', (error, stdout) => {
-            var _a;
-            if (!error && ((_a = stdout === null || stdout === void 0 ? void 0 : stdout.includes) === null || _a === void 0 ? void 0 : _a.call(stdout, 'mkcert'))) {
-                resolve(true);
-            }
-            else {
-                reject(false);
-            }
-        });
-    });
-};
-/**
- * Generate key and certificate files in https mode.
- */
-const generateCertFiles = (hosts = defaultHttpsHosts) => __awaiter(void 0, void 0, void 0, function* () {
-    return new Promise((resolve, reject) => {
-        utils_1.logger.warn('[https] No key or cert has been passed in.');
-        mkcertCmdChecker()
-            .then(() => {
-            utils_1.logger.wait('[https] Generating cert and key files...');
-            const certFilePath = (0, path_1.join)(__dirname, 'umi.pem');
-            const keyFilePath = (0, path_1.join)(__dirname, 'umi.key.pem');
-            (0, child_process_1.exec)(`mkcert -cert-file ${certFilePath} -key-file ${keyFilePath} ${hosts.join(' ')}`, (error) => {
-                if (error) {
-                    reject({});
-                }
-                else {
-                    resolve({
-                        key: keyFilePath,
-                        cert: certFilePath,
-                    });
-                }
-            });
-        })
-            .catch(() => {
-            reject(new Error('[https] The mkcert has not been installed.'));
-            utils_1.logger.info([
-                '[https] Please follow the guide to install manually.\n',
-                `\tMac: ${utils_1.chalk.green([
-                    'brew install mkcert',
-                    'brew install nss',
-                    'mkcert -install',
-                ].join(' + '))}\n`,
-                `\tWindows: ${utils_1.chalk.green('https://github.com/FiloSottile/mkcert#windows')}\n`,
-                `\tLinux: ${utils_1.chalk.green('https://github.com/FiloSottile/mkcert#linux')}\n`,
-            ].join(''));
-        });
-    });
-});
-const getServer = (app, httpsConfig) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!httpsConfig) {
-        return http_1.default.createServer(app);
-    }
-    utils_1.logger.wait('[https] Starting service in https mode...');
-    const isHttpsConfigLegally = httpsConfig.cert && httpsConfig.key;
-    const { key, cert } = isHttpsConfigLegally
-        ? httpsConfig
-        : yield generateCertFiles(httpsConfig.hosts);
-    if (key && cert) {
-        return https_1.default.createServer({
-            key: (0, fs_1.readFileSync)(key, 'utf8'),
-            cert: (0, fs_1.readFileSync)(cert, 'utf8'),
-        }, app);
-    }
-});
-exports.getServer = getServer;