@umijs/bundler-webpack 4.0.0-canary.20220323.1 → 4.0.0-rc.10

package/dist/client/client.js

@@ -43,7 +43,8 @@ const formatWebpackMessages_1 = require("../utils/formatWebpackMessages");
 console.log('[webpack] connecting...');
 let pingTimer = null;
 const host = location.host;
-const wsUrl = `ws://${host}`;
+const isHttps = location.protocol === 'https:';
+const wsUrl = `${isHttps ? 'wss' : 'ws'}://${host}`;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;

package/dist/dev.js

@@ -46,6 +46,11 @@ function dev(opts) {
                     return {
                         version: require('../package.json').version,
                         esbuildMode: !!((_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild),
+                        alias: opts.config.alias,
+                        externals: opts.config.externals,
+                        theme: opts.config.theme,
+                        runtimePublicPath: opts.config.runtimePublicPath,
+                        publicPath: opts.config.publicPath,
                     };
                 },
             });

package/dist/schema.js

@@ -46,6 +46,7 @@ function getSchemas() {
         fastRefresh: (Joi) => Joi.boolean(),
         forkTSChecker: (Joi) => Joi.object(),
         hash: (Joi) => Joi.boolean(),
+        https: (Joi) => Joi.object(),
         ignoreMomentLocale: (Joi) => Joi.boolean(),
         inlineLimit: (Joi) => Joi.number(),
         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),

package/dist/server/server.d.ts

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

package/dist/server/server.js

@@ -18,9 +18,9 @@ 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 ws_1 = require("./ws");
 function createServer(opts) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -42,7 +42,7 @@ function createServer(opts) {
         // 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 , yourHeaderFeild');
+            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();
         });
@@ -55,7 +55,7 @@ function createServer(opts) {
         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');
-                res.send((0, fs_1.readFileSync)((0, path_1.join)(opts.cwd, 'umi.js'), 'utf-8'));
+                (0, fs_1.createReadStream)((0, path_1.join)(opts.cwd, 'umi.js')).on('error', next).pipe(res);
             }
             else {
                 next();
@@ -65,7 +65,7 @@ function createServer(opts) {
         const compiler = (0, webpack_1.default)(Array.isArray(webpackConfig) ? webpackConfig : [webpackConfig]);
         const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
         const compilerMiddleware = webpackDevMiddleware(compiler, {
-            publicPath: '/',
+            publicPath: userConfig.publicPath || '/',
             writeToDisk: userConfig.writeToDisk,
             stats: 'none',
             // watchOptions: { ignored }
@@ -165,24 +165,27 @@ function createServer(opts) {
             res.set('Content-Type', 'text/html');
             const htmlPath = (0, path_1.join)(opts.cwd, 'index.html');
             if ((0, fs_1.existsSync)(htmlPath)) {
-                const html = (0, fs_1.readFileSync)(htmlPath, 'utf-8');
-                res.send(html);
+                (0, fs_1.createReadStream)(htmlPath).on('error', next).pipe(res);
             }
             else {
                 next();
             }
         });
-        const server = http_1.default.createServer(app);
+        const server = yield (0, server_1.getServer)(app, userConfig.https);
+        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(`http://${host}:${port}`)}`);
+            utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`${protocol}//${host}:${port}`)}`);
         });
         return server;
     });

package/dist/server/ws.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
-import { Server } from 'http';
+import { Server as HttpServer } from 'http';
+import { Server as HttpsServer } from 'https';
 import WebSocket from '../../compiled/ws';
-export declare function createWebSocketServer(server: Server): {
+export declare function createWebSocketServer(server: HttpServer | HttpsServer): {
     send(message: string): void;
     wss: WebSocket.Server;
     close(): void;

package/dist/swcPlugins/autoCSSModules.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
 const utils_1 = require("@umijs/utils");
+const changeImportFromString_1 = require("./changeImportFromString");
 class AutoCSSModule extends Visitor_1.default {
     visitTsType(expression) {
         return expression;
@@ -24,7 +25,8 @@ class AutoCSSModule extends Visitor_1.default {
         const { specifiers, source } = expression;
         const { value } = source;
         if (specifiers.length && (0, utils_1.isStyleFile)({ filename: value })) {
-            return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value: `${value}?modules` }) });
+            const newImportFrom = `${value}?modules`;
+            (0, changeImportFromString_1.changeImportFromString)(expression, newImportFrom);
         }
         return expression;
     }

package/dist/swcPlugins/changeImportFromString.d.ts

@@ -0,0 +1,2 @@
+import type { ImportDeclaration } from '@swc/core';
+export declare const changeImportFromString: (e: ImportDeclaration, v: string) => void;

package/dist/swcPlugins/changeImportFromString.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.changeImportFromString = void 0;
+const changeImportFromString = (e, v) => {
+    e.source.value = v;
+    // sync change to `raw`
+    // https://github.com/swc-project/swc/issues/4128
+    e.source.raw = `'${v}'`;
+};
+exports.changeImportFromString = changeImportFromString;

package/dist/swcPlugins/lockCoreJS.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
 const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
+const changeImportFromString_1 = require("./changeImportFromString");
 function addLastSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }
@@ -14,8 +15,8 @@ class LockCoreJS extends Visitor_1.default {
         const { source } = expression;
         let { value, type } = source;
         if (type === 'StringLiteral' && value.startsWith('core-js/')) {
-            value = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
-            return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value }) });
+            const newValue = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
+            (0, changeImportFromString_1.changeImportFromString)(expression, newValue);
         }
         return expression;
     }

package/dist/types.d.ts

@@ -41,6 +41,11 @@ 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;
@@ -63,6 +68,7 @@ export interface IConfig {
     depTranspiler?: Transpiler;
     devtool?: Config.DevTool;
     deadCode?: DeadCodeParams;
+    https?: HttpsParams;
     externals?: WebpackConfig['externals'];
     esm?: {
         [key: string]: any;

package/dist/utils/server.d.ts

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20220323.1",
+  "version": "4.0.0-rc.10",
   "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,9 +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.20220323.1",
-    "@umijs/mfsu": "4.0.0-canary.20220323.1",
-    "@umijs/utils": "4.0.0-canary.20220323.1",
+    "@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",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",
@@ -47,7 +48,7 @@
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
-    "@swc/core": "1.2.157",
+    "@swc/core": "1.2.160",
     "@types/webpack-sources": "3.2.0",
     "@types/ws": "8.5.3",
     "autoprefixer": "10.4.4",