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

package/client/client/client.js

@@ -13,21 +13,29 @@ 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;
+function getHost() {
     if (process.env.SOCKET_SERVER) {
-        l = new URL(process.env.SOCKET_SERVER);
+        return new URL(process.env.SOCKET_SERVER);
     }
-    const host = l.host;
-    const isHttps = l.protocol === 'https:';
+    return location;
+}
+function getSocketUrl() {
+    let h = getHost();
+    const host = h.host;
+    const isHttps = h.protocol === 'https:';
     return `${isHttps ? 'wss' : 'ws'}://${host}`;
 }
+function getPingUrl() {
+    const h = getHost();
+    return `${h.protocol}//${h.host}/__umi_ping`;
+}
 let pingTimer = null;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(getSocketHost(), 'webpack-hmr');
+const pingUrl = getPingUrl();
+const socket = new WebSocket(getSocketUrl(), 'webpack-hmr');
 socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void 0, function* () {
     data = JSON.parse(data);
     if (data.type === 'connected') {
@@ -45,7 +53,7 @@ function waitForSuccessfulPing(ms = 1000) {
         // eslint-disable-next-line no-constant-condition
         while (true) {
             try {
-                yield fetch(`/__umi_ping`);
+                yield fetch(pingUrl);
                 break;
             }
             catch (e) {

package/dist/build.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,57 +8,56 @@ const utils_1 = require("@umijs/utils");
 const webpack_1 = __importDefault(require("../compiled/webpack"));
 const config_1 = require("./config/config");
 const types_1 = require("./types");
-function build(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const webpackConfig = yield (0, config_1.getConfig)({
-            cwd: opts.cwd,
-            rootDir: opts.rootDir,
-            env: types_1.Env.production,
-            entry: opts.entry,
-            userConfig: opts.config,
-            analyze: process.env.ANALYZE,
-            babelPreset: opts.babelPreset,
-            extraBabelPlugins: [
-                ...(opts.beforeBabelPlugins || []),
-                ...(opts.extraBabelPlugins || []),
-            ],
-            extraBabelPresets: [
-                ...(opts.beforeBabelPresets || []),
-                ...(opts.extraBabelPresets || []),
-            ],
-            chainWebpack: opts.chainWebpack,
-            modifyWebpackConfig: opts.modifyWebpackConfig,
-            cache: opts.cache,
-        });
-        let isFirstCompile = true;
-        return new Promise((resolve, reject) => {
-            utils_1.rimraf.sync(webpackConfig.output.path);
-            const compiler = (0, webpack_1.default)(webpackConfig);
-            compiler.run((err, stats) => {
-                var _a;
-                (_a = opts.onBuildComplete) === null || _a === void 0 ? void 0 : _a.call(opts, {
-                    err,
-                    stats,
-                    isFirstCompile,
-                    time: stats ? stats.endTime - stats.startTime : null,
-                });
-                isFirstCompile = false;
-                if (err || (stats === null || stats === void 0 ? void 0 : stats.hasErrors())) {
-                    if (err) {
-                        // console.error(err);
-                        reject(err);
-                    }
-                    if (stats) {
-                        const errorMsg = stats.toString('errors-only');
-                        // console.error(errorMsg);
-                        reject(new Error(errorMsg));
-                    }
+async function build(opts) {
+    const webpackConfig = await (0, config_1.getConfig)({
+        cwd: opts.cwd,
+        rootDir: opts.rootDir,
+        env: types_1.Env.production,
+        entry: opts.entry,
+        userConfig: opts.config,
+        analyze: process.env.ANALYZE,
+        babelPreset: opts.babelPreset,
+        extraBabelPlugins: [
+            ...(opts.beforeBabelPlugins || []),
+            ...(opts.extraBabelPlugins || []),
+        ],
+        extraBabelPresets: [
+            ...(opts.beforeBabelPresets || []),
+            ...(opts.extraBabelPresets || []),
+        ],
+        extraBabelIncludes: opts.config.extraBabelIncludes,
+        chainWebpack: opts.chainWebpack,
+        modifyWebpackConfig: opts.modifyWebpackConfig,
+        cache: opts.cache,
+    });
+    let isFirstCompile = true;
+    return new Promise((resolve, reject) => {
+        utils_1.rimraf.sync(webpackConfig.output.path);
+        const compiler = (0, webpack_1.default)(webpackConfig);
+        compiler.run((err, stats) => {
+            var _a;
+            (_a = opts.onBuildComplete) === null || _a === void 0 ? void 0 : _a.call(opts, {
+                err,
+                stats,
+                isFirstCompile,
+                time: stats ? stats.endTime - stats.startTime : null,
+            });
+            isFirstCompile = false;
+            if (err || (stats === null || stats === void 0 ? void 0 : stats.hasErrors())) {
+                if (err) {
+                    // console.error(err);
+                    reject(err);
                 }
-                else {
-                    resolve(stats);
+                if (stats) {
+                    const errorMsg = stats.toString('errors-only');
+                    // console.error(errorMsg);
+                    reject(new Error(errorMsg));
                 }
-                compiler.close(() => { });
-            });
+            }
+            else {
+                resolve(stats);
+            }
+            compiler.close(() => { });
         });
     });
 }

package/dist/cli.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -40,11 +31,11 @@ if ((0, fs_1.existsSync)(configFile)) {
 }
 Object.assign(config, args);
 if (command === 'build') {
-    (() => __awaiter(void 0, void 0, void 0, function* () {
+    (async () => {
         process.env.NODE_ENV = 'production';
         (0, assert_1.default)(entry, `Build failed: entry not found.`);
         try {
-            yield (0, build_1.build)({
+            await (0, build_1.build)({
                 config,
                 cwd,
                 entry: {
@@ -55,14 +46,14 @@ if (command === 'build') {
         catch (e) {
             console.error(e);
         }
-    }))();
+    })();
 }
 else if (command === 'dev') {
-    (() => __awaiter(void 0, void 0, void 0, function* () {
+    (async () => {
         process.env.NODE_ENV = 'development';
         try {
             (0, assert_1.default)(entry, `Build failed: entry not found.`);
-            yield (0, dev_1.dev)({
+            await (0, dev_1.dev)({
                 config,
                 cwd,
                 port: process.env.PORT,
@@ -77,7 +68,7 @@ else if (command === 'dev') {
         catch (e) {
             console.error(e);
         }
-    }))();
+    })();
 }
 else {
     error(`Unsupported command ${command}.`);

package/dist/client/client.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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 };
 };
@@ -41,22 +32,30 @@ 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;
+function getHost() {
     if (process.env.SOCKET_SERVER) {
-        l = new URL(process.env.SOCKET_SERVER);
+        return new URL(process.env.SOCKET_SERVER);
     }
-    const host = l.host;
-    const isHttps = l.protocol === 'https:';
+    return location;
+}
+function getSocketUrl() {
+    let h = getHost();
+    const host = h.host;
+    const isHttps = h.protocol === 'https:';
     return `${isHttps ? 'wss' : 'ws'}://${host}`;
 }
+function getPingUrl() {
+    const h = getHost();
+    return `${h.protocol}//${h.host}/__umi_ping`;
+}
 let pingTimer = null;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(getSocketHost(), 'webpack-hmr');
-socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void 0, function* () {
+const pingUrl = getPingUrl();
+const socket = new WebSocket(getSocketUrl(), 'webpack-hmr');
+socket.addEventListener('message', async ({ data }) => {
     data = JSON.parse(data);
     if (data.type === 'connected') {
         console.log(`[webpack] connected.`);
@@ -67,28 +66,26 @@ socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void
     else {
         handleMessage(data).catch(console.error);
     }
-}));
-function waitForSuccessfulPing(ms = 1000) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // eslint-disable-next-line no-constant-condition
-        while (true) {
-            try {
-                yield fetch(`/__umi_ping`);
-                break;
-            }
-            catch (e) {
-                yield new Promise((resolve) => setTimeout(resolve, ms));
-            }
+});
+async function waitForSuccessfulPing(ms = 1000) {
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        try {
+            await fetch(pingUrl);
+            break;
         }
-    });
+        catch (e) {
+            await new Promise((resolve) => setTimeout(resolve, ms));
+        }
+    }
 }
-socket.addEventListener('close', () => __awaiter(void 0, void 0, void 0, function* () {
+socket.addEventListener('close', async () => {
     if (pingTimer)
         clearInterval(pingTimer);
     console.info('[webpack] Dev server disconnected. Polling for restart...');
-    yield waitForSuccessfulPing();
+    await waitForSuccessfulPing();
     location.reload();
-}));
+});
 ErrorOverlay.startReportingRuntimeErrors({
     onError: function () {
         hadRuntimeError = true;
@@ -226,25 +223,23 @@ function tryApplyUpdates(onHotUpdateSuccess) {
         handleApplyUpdates(err, null);
     });
 }
-function handleMessage(payload) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // console.log('[payload]', payload);
-        switch (payload.type) {
-            case constants_1.MESSAGE_TYPE.hash:
-                handleAvailableHash(payload.data);
-                break;
-            case constants_1.MESSAGE_TYPE.stillOk:
-            case constants_1.MESSAGE_TYPE.ok:
-                handleSuccess();
-                break;
-            case constants_1.MESSAGE_TYPE.errors:
-                handleErrors(payload.data);
-                break;
-            case constants_1.MESSAGE_TYPE.warnings:
-                handleWarnings(payload.data);
-                break;
-            default:
-            // Do nothing
-        }
-    });
+async function handleMessage(payload) {
+    // console.log('[payload]', payload);
+    switch (payload.type) {
+        case constants_1.MESSAGE_TYPE.hash:
+            handleAvailableHash(payload.data);
+            break;
+        case constants_1.MESSAGE_TYPE.stillOk:
+        case constants_1.MESSAGE_TYPE.ok:
+            handleSuccess();
+            break;
+        case constants_1.MESSAGE_TYPE.errors:
+            handleErrors(payload.data);
+            break;
+        case constants_1.MESSAGE_TYPE.warnings:
+            handleWarnings(payload.data);
+            break;
+        default:
+        // Do nothing
+    }
 }

package/dist/config/_sampleFeature.js

@@ -1,22 +1,11 @@
 "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.addSampleFeature = void 0;
-function addSampleFeature(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig, cwd, env } = opts;
-        config;
-        userConfig;
-        cwd;
-        env;
-    });
+async function addSampleFeature(opts) {
+    const { config, userConfig, cwd, env } = opts;
+    config;
+    userConfig;
+    cwd;
+    env;
 }
 exports.addSampleFeature = addSampleFeature;

package/dist/config/assetRules.js

@@ -1,61 +1,50 @@
 "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.addAssetRules = void 0;
-function addAssetRules(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig } = opts;
-        const inlineLimit = parseInt(userConfig.inlineLimit || '10000', 10);
-        const rule = config.module.rule('asset');
-        rule
-            .oneOf('avif')
-            .test(/\.avif$/)
-            .type('asset')
-            .mimetype('image/avif')
-            .parser({
-            dataUrlCondition: {
-                maxSize: inlineLimit,
-            },
-        })
-            .generator({
-            filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
-        });
-        rule
-            .oneOf('image')
-            .test(/\.(bmp|gif|jpg|jpeg|png)$/)
-            .type('asset')
-            .parser({
-            dataUrlCondition: {
-                maxSize: inlineLimit,
-            },
-        })
-            .generator({
-            filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
-        });
-        const fallback = rule
-            .oneOf('fallback')
-            .exclude.add(/^$/) /* handle data: resources */
-            .add(/\.(js|mjs|jsx|ts|tsx)$/)
-            .add(/\.(css|less|sass|scss|stylus)$/)
-            .add(/\.html$/)
-            .add(/\.json$/);
-        if (userConfig.mdx) {
-            fallback.add(/\.mdx?$/);
-        }
-        fallback
-            .end()
-            .type('asset/resource')
-            .generator({
-            filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
-        });
+async function addAssetRules(opts) {
+    const { config, userConfig } = opts;
+    const inlineLimit = parseInt(userConfig.inlineLimit || '10000', 10);
+    const rule = config.module.rule('asset');
+    rule
+        .oneOf('avif')
+        .test(/\.avif$/)
+        .type('asset')
+        .mimetype('image/avif')
+        .parser({
+        dataUrlCondition: {
+            maxSize: inlineLimit,
+        },
+    })
+        .generator({
+        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
+    });
+    rule
+        .oneOf('image')
+        .test(/\.(bmp|gif|jpg|jpeg|png)$/)
+        .type('asset')
+        .parser({
+        dataUrlCondition: {
+            maxSize: inlineLimit,
+        },
+    })
+        .generator({
+        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
+    });
+    const fallback = rule
+        .oneOf('fallback')
+        .exclude.add(/^$/) /* handle data: resources */
+        .add(/\.(js|mjs|jsx|ts|tsx)$/)
+        .add(/\.(css|less|sass|scss|stylus)$/)
+        .add(/\.html$/)
+        .add(/\.json$/);
+    if (userConfig.mdx) {
+        fallback.add(/\.mdx?$/);
+    }
+    fallback
+        .end()
+        .type('asset/resource')
+        .generator({
+        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
     });
 }
 exports.addAssetRules = addAssetRules;

package/dist/config/bundleAnalyzerPlugin.js

@@ -1,30 +1,19 @@
 "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.addBundleAnalyzerPlugin = void 0;
 // @ts-ignore
 const webpack_bundle_analyzer_1 = require("@umijs/bundler-webpack/compiled/webpack-bundle-analyzer");
-function addBundleAnalyzerPlugin(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config } = opts;
-        config.plugin('webpack-bundle-analyzer').use(webpack_bundle_analyzer_1.BundleAnalyzerPlugin, [
-            // https://github.com/webpack-contrib/webpack-bundle-analyzer
-            {
-                analyzerMode: 'server',
-                analyzerPort: process.env.ANALYZE_PORT || 8888,
-                openAnalyzer: false,
-                logLevel: 'info',
-                defaultSizes: 'parsed',
-            },
-        ]);
-    });
+async function addBundleAnalyzerPlugin(opts) {
+    const { config } = opts;
+    config.plugin('webpack-bundle-analyzer').use(webpack_bundle_analyzer_1.BundleAnalyzerPlugin, [
+        // https://github.com/webpack-contrib/webpack-bundle-analyzer
+        {
+            analyzerMode: 'server',
+            analyzerPort: process.env.ANALYZE_PORT || 8888,
+            openAnalyzer: false,
+            logLevel: 'info',
+            defaultSizes: 'parsed',
+        },
+    ]);
 }
 exports.addBundleAnalyzerPlugin = addBundleAnalyzerPlugin;