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

package/dist/config/svgRules.js

@@ -13,24 +13,25 @@ exports.addSVGRules = void 0;
 function addSVGRules(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const { config, userConfig } = opts;
-        const { svgr, svgo } = userConfig;
+        const { svgr, svgo = {} } = userConfig;
         if (svgr) {
-            // https://react-svgr.com/docs/webpack/#handle-svg-in-css-sass-or-less
-            // https://github.com/gregberge/svgr/issues/551#issuecomment-883073902
-            // https://github.com/webpack/webpack/issues/9309
             const svgrRule = config.module.rule('svgr');
             svgrRule
                 .test(/\.svg$/)
                 .issuer(/\.[jt]sx?$/)
                 .type('javascript/auto')
-                .use('babel-loader')
-                .loader(require.resolve('@umijs/bundler-webpack/compiled/babel-loader'))
-                .end()
                 .use('svgr-loader')
-                .loader(require.resolve('@umijs/bundler-webpack/compiled/@svgr/webpack'))
-                .options(Object.assign(Object.assign({ svgoConfig: {
-                    plugins: [{ removeViewBox: false }],
-                } }, svgr), { svgo }))
+                .loader(require.resolve('../loader/svgr'))
+                .options(Object.assign(Object.assign({ svgoConfig: Object.assign({ plugins: [
+                        {
+                            name: 'preset-default',
+                            params: {
+                                overrides: {
+                                    removeTitle: false,
+                                },
+                            },
+                        },
+                    ] }, svgo) }, svgr), { svgo: !!svgo }))
                 .end()
                 .use('url-loader')
                 .loader(require.resolve('@umijs/bundler-webpack/compiled/url-loader'))

package/dist/constants.d.ts

@@ -9,3 +9,6 @@ export declare enum MESSAGE_TYPE {
     stillOk = "still-ok",
     invalid = "invalid"
 }
+export declare const DEFAULT_BROWSER_TARGETS: {
+    chrome: number;
+};

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MESSAGE_TYPE = exports.MFSU_NAME = exports.DEFAULT_OUTPUT_PATH = exports.DEFAULT_DEVTOOL = void 0;
+exports.DEFAULT_BROWSER_TARGETS = exports.MESSAGE_TYPE = exports.MFSU_NAME = exports.DEFAULT_OUTPUT_PATH = exports.DEFAULT_DEVTOOL = void 0;
 exports.DEFAULT_DEVTOOL = 'cheap-module-source-map';
 exports.DEFAULT_OUTPUT_PATH = 'dist';
 exports.MFSU_NAME = 'MFSU';
@@ -13,3 +13,6 @@ var MESSAGE_TYPE;
     MESSAGE_TYPE["stillOk"] = "still-ok";
     MESSAGE_TYPE["invalid"] = "invalid";
 })(MESSAGE_TYPE = exports.MESSAGE_TYPE || (exports.MESSAGE_TYPE = {}));
+exports.DEFAULT_BROWSER_TARGETS = {
+    chrome: 80,
+};

package/dist/dev.d.ts

@@ -1,10 +1,12 @@
+import { IOpts as IConfigOpts } from './config/config';
 import { IConfig } from './types';
-interface IOpts {
+declare type IOpts = {
     afterMiddlewares?: any[];
     beforeMiddlewares?: any[];
     onDevCompileDone?: Function;
     port?: number;
     host?: string;
+    babelPreset?: any;
     chainWebpack?: Function;
     modifyWebpackConfig?: Function;
     beforeBabelPlugins?: any[];
@@ -14,6 +16,6 @@ interface IOpts {
     cwd: string;
     config: IConfig;
     entry: Record<string, string>;
-}
+} & Pick<IConfigOpts, 'cache'>;
 export declare function dev(opts: IOpts): Promise<void>;
 export {};

package/dist/dev.js

@@ -14,37 +14,63 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dev = void 0;
 const mfsu_1 = require("@umijs/mfsu");
+const utils_1 = require("@umijs/utils");
+const path_1 = require("path");
 const webpack_1 = __importDefault(require("../compiled/webpack"));
 const config_1 = require("./config/config");
 const constants_1 = require("./constants");
 const server_1 = require("./server/server");
 const types_1 = require("./types");
 function dev(opts) {
-    var _a;
-    var _b;
+    var _a, _b, _c, _d, _e;
+    var _f;
     return __awaiter(this, void 0, void 0, function* () {
-        const mfsu = new mfsu_1.MFSU({
-            implementor: webpack_1.default,
-            buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
-        });
+        const enableMFSU = opts.config.mfsu !== false;
+        let mfsu = null;
+        if (enableMFSU) {
+            if (opts.config.srcTranspiler === types_1.Transpiler.swc) {
+                utils_1.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
+            }
+            mfsu = new mfsu_1.MFSU({
+                implementor: webpack_1.default,
+                buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
+                depBuildConfig: {
+                    extraPostCSSPlugins: ((_b = opts.config) === null || _b === void 0 ? void 0 : _b.extraPostCSSPlugins) || [],
+                },
+                mfName: (_c = opts.config.mfsu) === null || _c === void 0 ? void 0 : _c.mfName,
+                runtimePublicPath: opts.config.runtimePublicPath,
+                tmpBase: ((_d = opts.config.mfsu) === null || _d === void 0 ? void 0 : _d.cacheDirectory) ||
+                    (0, path_1.join)(opts.cwd, 'node_modules/.cache/mfsu'),
+                getCacheDependency() {
+                    var _a;
+                    return {
+                        version: require('../package.json').version,
+                        esbuildMode: !!((_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild),
+                    };
+                },
+            });
+        }
         const webpackConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
             env: types_1.Env.development,
             entry: opts.entry,
             userConfig: opts.config,
+            babelPreset: opts.babelPreset,
             extraBabelPlugins: [
                 ...(opts.beforeBabelPlugins || []),
-                ...mfsu.getBabelPlugins(),
+                ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getBabelPlugins()) || []),
                 ...(opts.extraBabelPlugins || []),
             ],
             extraBabelPresets: [
                 ...(opts.beforeBabelPresets || []),
                 ...(opts.extraBabelPresets || []),
             ],
+            extraEsbuildLoaderHandler: (mfsu === null || mfsu === void 0 ? void 0 : mfsu.getEsbuildLoaderHandler()) || [],
             chainWebpack: opts.chainWebpack,
             modifyWebpackConfig: opts.modifyWebpackConfig,
             hmr: true,
             analyze: process.env.ANALYZE,
+            cache: opts.cache,
         });
         const depConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
@@ -54,23 +80,27 @@ function dev(opts) {
             hash: true,
             staticPathPrefix: mfsu_1.MF_DEP_PREFIX,
             name: constants_1.MFSU_NAME,
+            cache: {
+                buildDependencies: (_e = opts.cache) === null || _e === void 0 ? void 0 : _e.buildDependencies,
+                cacheDirectory: (0, path_1.join)(opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
+            },
         });
-        (_b = webpackConfig.resolve).alias || (_b.alias = {});
+        (_f = webpackConfig.resolve).alias || (_f.alias = {});
         // TODO: REMOVE ME
         ['@umijs/utils/compiled/strip-ansi', 'react-error-overlay'].forEach((dep) => {
             // @ts-ignore
             webpackConfig.resolve.alias[dep] = require.resolve(dep);
         });
-        mfsu.setWebpackConfig({
+        yield (mfsu === null || mfsu === void 0 ? void 0 : mfsu.setWebpackConfig({
             config: webpackConfig,
             depConfig: depConfig,
-        });
+        }));
         yield (0, server_1.createServer)({
             webpackConfig,
             userConfig: opts.config,
             cwd: opts.cwd,
             beforeMiddlewares: [
-                ...mfsu.getMiddlewares(),
+                ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getMiddlewares()) || []),
                 ...(opts.beforeMiddlewares || []),
             ],
             port: opts.port,

package/dist/index.d.ts

@@ -1,5 +1,8 @@
+import type webpack from '../compiled/webpack';
 export type { RequestHandler } from '../compiled/express';
+export type { Compiler, Stats } from '../compiled/webpack';
 export * from './build';
 export * from './config/config';
 export * from './dev';
 export * from './schema';
+export { webpack };

package/dist/index.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];

package/dist/loader/svgr.d.ts

@@ -0,0 +1,4 @@
+import { Config } from '@svgr/core';
+import type { LoaderContext } from '../../compiled/webpack';
+declare function svgrLoader(this: LoaderContext<Config>, contents: string): void;
+export default svgrLoader;

package/dist/loader/svgr.js

@@ -0,0 +1,67 @@
+"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 });
+// MIT: https://github.com/gregberge/svgr/blob/main/packages/webpack/src/index.ts
+// TODO: prebuild @svgr/core @svgr/plugin-jsx @svgr/plugin-svgo
+const core_1 = require("@svgr/core");
+// @ts-ignore
+const plugin_jsx_1 = __importDefault(require("@svgr/plugin-jsx"));
+// @ts-ignore
+const plugin_svgo_1 = __importDefault(require("@svgr/plugin-svgo"));
+const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
+const path_1 = require("path");
+const util_1 = require("util");
+const tranformSvg = (0, util_1.callbackify)((contents, options, state) => __awaiter(void 0, void 0, void 0, function* () {
+    const jsCode = yield (0, core_1.transform)(contents, options, state);
+    const result = yield (0, esbuild_1.transform)(jsCode, {
+        loader: 'tsx',
+        target: 'es2015',
+    });
+    if (!(result === null || result === void 0 ? void 0 : result.code)) {
+        throw new Error(`Error while transforming using Esbuild`);
+    }
+    return result.code;
+}));
+function svgrLoader(contents) {
+    this.cacheable && this.cacheable();
+    const callback = this.async();
+    const options = this.getOptions();
+    const previousExport = (() => {
+        if (contents.startsWith('export '))
+            return contents;
+        const exportMatches = contents.match(/^module.exports\s*=\s*(.*)/);
+        return exportMatches ? `export default ${exportMatches[1]}` : null;
+    })();
+    const state = {
+        caller: {
+            name: 'svgr-loader',
+            previousExport,
+            defaultPlugins: [plugin_svgo_1.default, plugin_jsx_1.default],
+        },
+        filePath: (0, path_1.normalize)(this.resourcePath),
+    };
+    if (!previousExport) {
+        tranformSvg(contents, options, state, callback);
+    }
+    else {
+        this.fs.readFile(this.resourcePath, (err, result) => {
+            if (err) {
+                callback(err);
+                return;
+            }
+            tranformSvg(String(result), options, state, callback);
+        });
+    }
+}
+exports.default = svgrLoader;

package/dist/loader/swc.d.ts

@@ -0,0 +1,4 @@
+import type { LoaderContext } from '../../compiled/webpack';
+import { SwcOptions } from '../types';
+declare function swcLoader(this: LoaderContext<SwcOptions>, contents: string): void;
+export default swcLoader;

package/dist/loader/swc.js

@@ -0,0 +1,79 @@
+"use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@swc/core");
+const types_1 = require("../types");
+function getBaseOpts({ filename }) {
+    const isTSFile = filename.endsWith('.ts');
+    const isTypeScript = isTSFile || filename.endsWith('.tsx');
+    const isDev = process.env.NODE_ENV === types_1.Env.development;
+    /**
+     * Not use swc auto polyfill , depend on `preset-umi/features/polyfill/polyfill` imported polyfill file
+     *
+     * @issue https://github.com/swc-project/swc/issues/2607
+     *        https://github.com/swc-project/swc/issues/1604
+     */
+    const swcOpts = {
+        module: {
+            // @ts-ignore
+            type: 'es6',
+            ignoreDynamic: true,
+        },
+        jsc: {
+            parser: {
+                syntax: isTypeScript ? 'typescript' : 'ecmascript',
+                [isTypeScript ? 'tsx' : 'jsx']: !isTSFile,
+                dynamicImport: isTypeScript,
+            },
+            target: 'es2015',
+            transform: {
+                react: {
+                    runtime: 'automatic',
+                    pragma: 'React.createElement',
+                    pragmaFrag: 'React.Fragment',
+                    throwIfNamespace: true,
+                    development: isDev,
+                    useBuiltins: true,
+                },
+            },
+        },
+    };
+    return swcOpts;
+}
+function swcLoader(contents) {
+    // 启用异步模式
+    const callback = this.async();
+    const loaderOpts = this.getOptions();
+    const { sync = false, parseMap = false } = loaderOpts, otherOpts = __rest(loaderOpts, ["sync", "parseMap"]);
+    const filename = this.resourcePath;
+    const swcOpts = Object.assign(Object.assign(Object.assign({}, getBaseOpts({
+        filename,
+    })), { filename, sourceMaps: this.sourceMap, sourceFileName: filename }), otherOpts);
+    try {
+        if (sync) {
+            const output = (0, core_1.transformSync)(contents, swcOpts);
+            callback(null, output.code, parseMap ? JSON.parse(output.map) : output.map);
+        }
+        else {
+            (0, core_1.transform)(contents, swcOpts).then((output) => {
+                callback(null, output.code, parseMap ? JSON.parse(output.map) : output.map);
+            }, (err) => {
+                callback(err);
+            });
+        }
+    }
+    catch (e) {
+        callback(e);
+    }
+}
+exports.default = swcLoader;

package/dist/plugins/ESBuildCSSMinifyPlugin.js

@@ -38,9 +38,7 @@ class ESBuildCSSMinifyPlugin {
     transformAssets(compilation) {
         return __awaiter(this, void 0, void 0, function* () {
             const { options: { devtool }, } = compilation.compiler;
-            const sourcemap = this.options.sourcemap === undefined
-                ? devtool && devtool
-                : this.options.sourcemap;
+            const sourcemap = this.options.sourcemap === undefined ? !!devtool : this.options.sourcemap;
             const assets = compilation.getAssets().filter((asset) => {
                 return !asset.info.minimized && RE_CSS_FILE.test(asset.name);
             });

package/dist/plugins/ParcelCSSMinifyPlugin.d.ts

@@ -0,0 +1,10 @@
+import type { TransformOptions } from '@parcel/css';
+import type { Compiler } from '../../compiled/webpack/types';
+declare type MinifyPluginOpts = Omit<TransformOptions, 'filename' | 'code' | 'minify'>;
+export declare class ParcelCSSMinifyPlugin {
+    private readonly options;
+    constructor(opts?: MinifyPluginOpts);
+    apply(compiler: Compiler): void;
+    private transformAssets;
+}
+export {};

package/dist/plugins/ParcelCSSMinifyPlugin.js

@@ -0,0 +1,75 @@
+"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.ParcelCSSMinifyPlugin = void 0;
+const utils_1 = require("@umijs/utils");
+const buffer_1 = require("buffer");
+const path_1 = require("path");
+const webpack_sources_1 = require("../../compiled/webpack-sources");
+const pkgPath = (0, path_1.join)(__dirname, '../../package.json');
+const pkg = require(pkgPath);
+const PLUGIN_NAME = 'parcel-css-minify-plugin';
+const CSS_FILE_REG = /\.css(?:\?.*)?$/i;
+class ParcelCSSMinifyPlugin {
+    constructor(opts = {}) {
+        this.options = opts;
+    }
+    apply(compiler) {
+        const meta = JSON.stringify({
+            name: pkg.name,
+            version: pkg.version,
+            options: this.options,
+        });
+        compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.chunkHash.tap(PLUGIN_NAME, (_, hash) => hash.update(meta));
+            compilation.hooks.processAssets.tapPromise({
+                name: PLUGIN_NAME,
+                // @ts-ignore
+                stage: compilation.constructor.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE,
+                additionalAssets: true,
+            }, () => __awaiter(this, void 0, void 0, function* () { return yield this.transformAssets(compilation); }));
+            compilation.hooks.statsPrinter.tap(PLUGIN_NAME, (statsPrinter) => {
+                statsPrinter.hooks.print
+                    .for('asset.info.minimized')
+                    // @ts-ignore
+                    .tap(PLUGIN_NAME, (minimized, { green, formatFlag }) => {
+                    // @ts-ignore
+                    return minimized ? green(formatFlag('minimized')) : undefined;
+                });
+            });
+        });
+    }
+    transformAssets(compilation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { options: { devtool }, } = compilation.compiler;
+            const sourcemap = this.options.sourceMap === undefined
+                ? (devtool && devtool.includes('source-map'))
+                : this.options.sourceMap;
+            const assets = compilation.getAssets().filter((asset) => {
+                return !asset.info.minimized && CSS_FILE_REG.test(asset.name);
+            });
+            yield Promise.all(assets.map((asset) => __awaiter(this, void 0, void 0, function* () {
+                const { source, map } = asset.source.sourceAndMap();
+                const sourceAsString = source.toString();
+                const code = typeof source === 'string' ? buffer_1.Buffer.from(source) : source;
+                const { transform } = (0, utils_1.importLazy)('@parcel/css');
+                const result = yield transform(Object.assign({ filename: asset.name, code, minify: true, sourceMap: sourcemap }, this.options));
+                const codeString = result.code.toString();
+                compilation.updateAsset(asset.name, 
+                // @ts-ignore
+                sourcemap
+                    ? new webpack_sources_1.SourceMapSource(codeString, asset.name, JSON.parse(result.map.toString()), sourceAsString, map, true)
+                    : new webpack_sources_1.RawSource(codeString), Object.assign(Object.assign({}, asset.info), { minimized: true }));
+            })));
+        });
+    }
+}
+exports.ParcelCSSMinifyPlugin = ParcelCSSMinifyPlugin;

package/dist/plugins/ProgressPlugin.js

@@ -13,7 +13,7 @@ class UmiProgressPlugin extends webpack_1.ProgressPlugin {
     }
     apply(compiler) {
         compiler.hooks.invalid.tap(PLUGIN_NAME, () => {
-            utils_1.logger.wait('compiling...');
+            utils_1.logger.wait('Compiling...');
         });
         compiler.hooks.done.tap(PLUGIN_NAME, (stats) => {
             const { errors, warnings } = stats.toJson({
@@ -33,7 +33,7 @@ class UmiProgressPlugin extends webpack_1.ProgressPlugin {
             }
             else {
                 const prefix = this.options.name ? `${this.options.name} ` : '';
-                utils_1.logger.event(`${prefix}compiled successfully in ${stats.endTime - stats.startTime} ms (${stats.compilation.modules.size} modules)`);
+                utils_1.logger.event(`${prefix}Compiled successfully in ${stats.endTime - stats.startTime} ms (${stats.compilation.modules.size} modules)`);
             }
         });
     }

package/dist/plugins/RuntimePublicPathPlugin.d.ts

@@ -0,0 +1,4 @@
+import type { Compiler } from '@umijs/bundler-webpack/compiled/webpack';
+export declare class RuntimePublicPathPlugin {
+    apply(compiler: Compiler): void;
+}

package/dist/plugins/RuntimePublicPathPlugin.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RuntimePublicPathPlugin = void 0;
+const PLUGIN_NAME = 'RuntimePublicPath';
+// ref: https://gist.github.com/ScriptedAlchemy/60d0c49ce049184f6ce3e86ca351fdca
+class RuntimePublicPathPlugin {
+    apply(compiler) {
+        compiler.hooks.make.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.runtimeModule.tap(PLUGIN_NAME, (module) => {
+                // The hook to get the public path ('__webpack_require__.p')
+                // https://github.com/webpack/webpack/blob/master/lib/runtime/PublicPathRuntimeModule.js
+                if (module.constructor.name === 'PublicPathRuntimeModule') {
+                    // @ts-ignore
+                    module._cachedGeneratedCode = `__webpack_require__.p = (globalThis || window).publicPath;`;
+                }
+            });
+        });
+    }
+}
+exports.RuntimePublicPathPlugin = RuntimePublicPathPlugin;

package/dist/requireHook.js

@@ -17,7 +17,7 @@ const hookPropertyMap = new Map([
     ['webpack/lib/webpack.js', '@umijs/bundler-webpack/compiled/webpack'],
 ]);
 deepImports_json_1.default.forEach((item) => {
-    const name = item.split('/').unshift();
+    const name = item.split('/').pop();
     hookPropertyMap.set(item, `@umijs/bundler-webpack/compiled/webpack/${name}`);
     hookPropertyMap.set(`${item}.js`, `@umijs/bundler-webpack/compiled/webpack/${name}`);
 });

package/dist/schema.js

@@ -24,6 +24,7 @@ function getSchemas() {
     return {
         alias: (Joi) => Joi.object(),
         autoCSSModules: (Joi) => Joi.boolean(),
+        autoprefixer: (Joi) => Joi.object(),
         chainWebpack: (Joi) => Joi.function(),
         copy: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.object({
             from: Joi.string(),
@@ -31,42 +32,49 @@ function getSchemas() {
         }), Joi.string())),
         cssLoader: (Joi) => Joi.object(),
         cssLoaderModules: (Joi) => Joi.object(),
-        cssMinifier: (Joi) => Joi.string().valid(types_1.CSSMinifier.cssnano, types_1.CSSMinifier.esbuild, types_1.CSSMinifier.none),
+        cssMinifier: (Joi) => Joi.string().valid(types_1.CSSMinifier.cssnano, types_1.CSSMinifier.esbuild, types_1.CSSMinifier.parcelCSS, types_1.CSSMinifier.none),
         cssMinifierOptions: (Joi) => Joi.object(),
+        deadCode: (Joi) => Joi.object(),
         define: (Joi) => Joi.object(),
         depTranspiler: (Joi) => Joi.string().valid(types_1.Transpiler.babel, types_1.Transpiler.esbuild, types_1.Transpiler.swc, types_1.Transpiler.none),
         devtool: (Joi) => Joi.alternatives().try(Joi.string().regex(DEVTOOL_REGEX), Joi.boolean()),
-        externals: (Joi) => Joi.alternatives().try(Joi.object().pattern(/.+/, [
-            Joi.string(),
-            Joi.boolean(),
-            Joi.object().pattern(/.+/, [Joi.string(), Joi.boolean()]),
-        ]), Joi.string(), Joi.func().arity(3), Joi.object().regex()),
+        esm: (Joi) => Joi.object(),
+        externals: (Joi) => Joi.alternatives().try(Joi.object(), Joi.string(), Joi.func()),
         extraBabelPlugins: (Joi) => Joi.alternatives().try(Joi.string(), Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object()))),
         extraBabelPresets: (Joi) => Joi.alternatives().try(Joi.string(), Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object()))),
         extraPostCSSPlugins: (Joi) => Joi.array(),
         fastRefresh: (Joi) => Joi.boolean(),
+        forkTSChecker: (Joi) => Joi.object(),
         hash: (Joi) => Joi.boolean(),
         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),
         jsMinifierOptions: (Joi) => Joi.object(),
         lessLoader: (Joi) => Joi.object(),
+        manifest: (Joi) => Joi.object(),
+        mdx: (Joi) => Joi.object({
+            loader: Joi.string(),
+            loaderOptions: Joi.object(),
+        }),
         mfsu: (Joi) => Joi.alternatives(Joi.object({
+            cacheDirectory: Joi.string(),
             esbuild: Joi.boolean(),
+            mfName: Joi.string(),
         }), Joi.boolean()),
         outputPath: (Joi) => Joi.string(),
         postcssLoader: (Joi) => Joi.object(),
         proxy: (Joi) => Joi.object(),
         publicPath: (Joi) => Joi.string(),
         purgeCSS: (Joi) => Joi.object(),
+        runtimePublicPath: (Joi) => Joi.object(),
         sassLoader: (Joi) => Joi.object(),
         srcTranspiler: (Joi) => Joi.string().valid(types_1.Transpiler.babel, types_1.Transpiler.esbuild, types_1.Transpiler.swc, types_1.Transpiler.none),
         styleLoader: (Joi) => Joi.object(),
-        svgr: (Joi) => Joi.object(),
         svgo: (Joi) => Joi.alternatives().try(Joi.object(), Joi.boolean()),
+        svgr: (Joi) => Joi.object(),
         targets: (Joi) => Joi.object(),
-        writeToDisk: (Joi) => Joi.boolean(),
-        esm: (Joi) => Joi.object(),
         theme: (Joi) => Joi.object(),
+        writeToDisk: (Joi) => Joi.boolean(),
     };
 }
 exports.getSchemas = getSchemas;

package/dist/server/server.js

@@ -27,6 +27,25 @@ function createServer(opts) {
         const { webpackConfig, userConfig } = opts;
         const { proxy } = userConfig;
         const app = (0, express_1.default)();
+        // basename middleware
+        app.use((req, _res, next) => {
+            const { url, path } = req;
+            const { basename, history } = userConfig;
+            if ((history === null || history === void 0 ? void 0 : history.type) === 'browser' &&
+                basename !== '/' &&
+                url.startsWith(basename)) {
+                req.url = url.slice(basename.length);
+                req.path = path.slice(basename.length);
+            }
+            next();
+        });
+        // 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-Methods', 'GET, HEAD, PUT, POST, PATCH, DELETE, OPTIONS');
+            next();
+        });
         // compression
         app.use(require('@umijs/bundler-webpack/compiled/compression')());
         // TODO: headers
@@ -118,7 +137,10 @@ function createServer(opts) {
             });
         }
         // after middlewares
-        (opts.afterMiddlewares || []).forEach((m) => app.use(m));
+        (opts.afterMiddlewares || []).forEach((m) => {
+            // TODO: FIXME
+            app.use(m.toString().includes(`{ compiler }`) ? m({ compiler }) : m);
+        });
         // history fallback
         app.use(require('@umijs/bundler-webpack/compiled/connect-history-api-fallback')({
             index: '/',
@@ -150,7 +172,7 @@ function createServer(opts) {
         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 http://${host}:${port}`);
+            utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`http://${host}:${port}`)}`);
         });
         return server;
     });

package/dist/server/ws.d.ts

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