@umijs/bundler-webpack 4.0.0-beta.7 → 4.0.0-canary.202200505.1

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 };
 };
@@ -22,7 +13,7 @@ const dev_1 = require("./dev");
 const args = (0, utils_1.yParser)(process.argv.slice(2), {});
 const command = args._[0];
 const cwd = process.cwd();
-const entry = tryPaths([
+const entry = (0, utils_1.tryPaths)([
     (0, path_1.join)(cwd, 'src/index.tsx'),
     (0, path_1.join)(cwd, 'src/index.ts'),
     (0, path_1.join)(cwd, 'index.tsx'),
@@ -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,26 +46,29 @@ 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,
                 entry: {
                     [getEntryKey(entry)]: entry,
                 },
+                cache: {
+                    buildDependencies: [].filter(Boolean),
+                },
             });
         }
         catch (e) {
             console.error(e);
         }
-    }))();
+    })();
 }
 else {
     error(`Unsupported command ${command}.`);
@@ -82,12 +76,6 @@ else {
 function error(msg) {
     console.error(utils_1.chalk.red(msg));
 }
-function tryPaths(paths) {
-    for (const path of paths) {
-        if ((0, fs_1.existsSync)(path))
-            return path;
-    }
-}
 function getEntryKey(path) {
     return (0, path_1.basename)(path, (0, path_1.extname)(path));
 }

package/dist/client/client.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -18,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 };
 };
@@ -37,15 +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 getHost() {
+    if (process.env.SOCKET_SERVER) {
+        return new URL(process.env.SOCKET_SERVER);
+    }
+    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;
-const host = location.host;
-const wsUrl = `ws://${host}`;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(wsUrl, '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.`);
@@ -56,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;
@@ -215,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,57 +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]`,
-        });
-        rule
-            .oneOf('fallback')
-            .exclude.add(/^$/) /* handle data: resources */
-            .add(/\.(js|mjs|jsx|ts|tsx)$/)
-            .add(/\.(css|less|sass|scss|stylus)$/)
-            .add(/\.html$/)
-            .add(/\.json$/)
-            .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;

package/dist/config/compressPlugin.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,61 +8,76 @@ exports.addCompressPlugin = void 0;
 const css_minimizer_webpack_plugin_1 = __importDefault(require("@umijs/bundler-webpack/compiled/css-minimizer-webpack-plugin"));
 const terser_webpack_plugin_1 = __importDefault(require("../../compiled/terser-webpack-plugin"));
 const ESBuildCSSMinifyPlugin_1 = __importDefault(require("../plugins/ESBuildCSSMinifyPlugin"));
+const ParcelCSSMinifyPlugin_1 = require("../plugins/ParcelCSSMinifyPlugin");
 const types_1 = require("../types");
-function addCompressPlugin(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig, env } = opts;
-        const jsMinifier = userConfig.jsMinifier || types_1.JSMinifier.esbuild;
-        const cssMinifier = userConfig.cssMinifier || types_1.CSSMinifier.esbuild;
-        if (env === types_1.Env.development ||
-            process.env.COMPRESS === 'none' ||
-            (jsMinifier === types_1.JSMinifier.none && cssMinifier === types_1.CSSMinifier.none)) {
-            config.optimization.minimize(false);
-            return;
-        }
-        config.optimization.minimize(true);
-        let minify;
-        if (jsMinifier === types_1.JSMinifier.esbuild) {
-            minify = terser_webpack_plugin_1.default.esbuildMinify;
-        }
-        else if (jsMinifier === types_1.JSMinifier.terser) {
-            minify = terser_webpack_plugin_1.default.terserMinify;
-        }
-        else if (jsMinifier === types_1.JSMinifier.swc) {
-            minify = terser_webpack_plugin_1.default.swcMinify;
-        }
-        else if (jsMinifier === types_1.JSMinifier.uglifyJs) {
-            minify = terser_webpack_plugin_1.default.uglifyJsMinify;
-        }
-        else if (jsMinifier !== types_1.JSMinifier.none) {
-            throw new Error(`Unsupported jsMinifier ${userConfig.jsMinifier}.`);
-        }
-        if (jsMinifier !== types_1.JSMinifier.none) {
-            config.optimization.minimizer(`js-${jsMinifier}`).use(terser_webpack_plugin_1.default, [
-                {
-                    minify,
-                    terserOptions: userConfig.jsMinifierOptions,
-                },
-            ]);
-        }
-        if (cssMinifier === types_1.CSSMinifier.esbuild) {
-            config.optimization
-                .minimizer(`css-${cssMinifier}`)
-                .use(ESBuildCSSMinifyPlugin_1.default, [userConfig.cssMinifierOptions]);
-        }
-        else if (cssMinifier === types_1.CSSMinifier.cssnano) {
-            config.optimization
-                .minimizer(`css-${cssMinifier}`)
-                .use(css_minimizer_webpack_plugin_1.default, [
-                {
-                    minimizerOptions: userConfig.cssMinifierOptions,
-                    parallel: true,
-                },
-            ]);
-        }
-        else if (cssMinifier !== types_1.CSSMinifier.none) {
-            throw new Error(`Unsupported cssMinifier ${userConfig.cssMinifier}.`);
-        }
-    });
+const getEsBuildTarget_1 = require("../utils/getEsBuildTarget");
+async function addCompressPlugin(opts) {
+    const { config, userConfig, env } = opts;
+    const jsMinifier = userConfig.jsMinifier || types_1.JSMinifier.esbuild;
+    const cssMinifier = userConfig.cssMinifier || types_1.CSSMinifier.esbuild;
+    if (env === types_1.Env.development ||
+        process.env.COMPRESS === 'none' ||
+        (jsMinifier === types_1.JSMinifier.none && cssMinifier === types_1.CSSMinifier.none)) {
+        config.optimization.minimize(false);
+        return;
+    }
+    config.optimization.minimize(true);
+    let minify;
+    let terserOptions;
+    if (jsMinifier === types_1.JSMinifier.esbuild) {
+        minify = terser_webpack_plugin_1.default.esbuildMinify;
+        terserOptions = {
+            target: (0, getEsBuildTarget_1.getEsBuildTarget)({
+                targets: userConfig.targets || {},
+            }),
+        };
+    }
+    else if (jsMinifier === types_1.JSMinifier.terser) {
+        minify = terser_webpack_plugin_1.default.terserMinify;
+    }
+    else if (jsMinifier === types_1.JSMinifier.swc) {
+        minify = terser_webpack_plugin_1.default.swcMinify;
+    }
+    else if (jsMinifier === types_1.JSMinifier.uglifyJs) {
+        minify = terser_webpack_plugin_1.default.uglifyJsMinify;
+    }
+    else if (jsMinifier !== types_1.JSMinifier.none) {
+        throw new Error(`Unsupported jsMinifier ${userConfig.jsMinifier}.`);
+    }
+    terserOptions = {
+        ...terserOptions,
+        ...userConfig.jsMinifierOptions,
+    };
+    if (jsMinifier !== types_1.JSMinifier.none) {
+        config.optimization.minimizer(`js-${jsMinifier}`).use(terser_webpack_plugin_1.default, [
+            {
+                minify,
+                terserOptions,
+            },
+        ]);
+    }
+    if (cssMinifier === types_1.CSSMinifier.esbuild) {
+        config.optimization
+            .minimizer(`css-${cssMinifier}`)
+            .use(ESBuildCSSMinifyPlugin_1.default, [userConfig.cssMinifierOptions]);
+    }
+    else if (cssMinifier === types_1.CSSMinifier.cssnano) {
+        config.optimization
+            .minimizer(`css-${cssMinifier}`)
+            .use(css_minimizer_webpack_plugin_1.default, [
+            {
+                minimizerOptions: userConfig.cssMinifierOptions,
+                parallel: true,
+            },
+        ]);
+    }
+    else if (cssMinifier === types_1.CSSMinifier.parcelCSS) {
+        config.optimization
+            .minimizer(`css-${cssMinifier}`)
+            .use(ParcelCSSMinifyPlugin_1.ParcelCSSMinifyPlugin);
+    }
+    else if (cssMinifier !== types_1.CSSMinifier.none) {
+        throw new Error(`Unsupported cssMinifier ${userConfig.cssMinifier}.`);
+    }
 }
 exports.addCompressPlugin = addCompressPlugin;

package/dist/config/config.d.ts

@@ -1,11 +1,14 @@
 import { Configuration } from '../../compiled/webpack';
 import { Env, IConfig } from '../types';
-interface IOpts {
+export interface IOpts {
     cwd: string;
+    rootDir?: string;
     env: Env;
     entry: Record<string, string>;
     extraBabelPresets?: any[];
     extraBabelPlugins?: any[];
+    extraBabelIncludes?: string[];
+    extraEsbuildLoaderHandler?: any[];
     babelPreset?: any;
     chainWebpack?: Function;
     modifyWebpackConfig?: Function;
@@ -15,6 +18,10 @@ interface IOpts {
     userConfig: IConfig;
     analyze?: any;
     name?: string;
+    cache?: {
+        absNodeModulesPath?: string;
+        buildDependencies?: string[];
+        cacheDirectory?: string;
+    };
 }
 export declare function getConfig(opts: IOpts): Promise<Configuration>;
-export {};