@umijs/mfsu 4.0.0-beta.9 → 4.0.0-canary.202200505.1

package/dist/babelPlugins/awaitImport/awaitImport.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/babelPlugins/awaitImport/checkMatch.d.ts

@@ -1,12 +1,13 @@
 import * as Babel from '@umijs/bundler-utils/compiled/babel/core';
 import type { IOpts } from './awaitImport';
-export declare function checkMatch({ value, path, opts, isExportAll, depth, cache, }: {
+export declare function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, }: {
     value: string;
     path?: Babel.NodePath;
     opts?: IOpts;
     isExportAll?: boolean;
     depth?: number;
     cache?: Map<string, any>;
+    filename?: string;
 }): {
     isMatch: boolean;
     replaceValue: string;

package/dist/babelPlugins/awaitImport/checkMatch.js

@@ -12,7 +12,10 @@ const isExternals_1 = require("./isExternals");
 // const UNMATCH_LIBS = ['umi', 'dumi', '@alipay/bigfish'];
 const RE_NODE_MODULES = /node_modules/;
 const RE_UMI_LOCAL_DEV = /umi(-next)?\/packages\//;
-function checkMatch({ value, path, opts, isExportAll, depth, cache, }) {
+function isUmiLocalDev(path) {
+    return RE_UMI_LOCAL_DEV.test((0, utils_1.winPath)(path));
+}
+function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, }) {
     var _a, _b;
     let isMatch;
     let replaceValue = '';
@@ -20,9 +23,13 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, }) {
     (0, assert_1.default)(depth <= 10, `endless loop detected in checkMatch, please check your alias config.`);
     opts = opts || {};
     const remoteName = opts.remoteName || 'mf';
+    // FIXME: hard code for vite mode
+    value = value.replace(/^@fs\//, '/');
     if (
     // unMatch specified libs
     ((_a = opts.unMatchLibs) === null || _a === void 0 ? void 0 : _a.includes(value)) ||
+        // do not match bundler-webpack/client/client/client.js
+        value.includes('client/client/client.js') ||
         // already handled
         value.startsWith(`${remoteName}/`) ||
         // don't match dynamic path
@@ -38,7 +45,7 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, }) {
         isMatch = false;
     }
     else if ((0, path_1.isAbsolute)(value)) {
-        isMatch = RE_NODE_MODULES.test(value) || RE_UMI_LOCAL_DEV.test(value);
+        isMatch = RE_NODE_MODULES.test(value) || isUmiLocalDev(value);
     }
     else {
         const aliasedPath = (0, getAliasedPath_1.getAliasedPath)({
@@ -53,6 +60,7 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, }) {
                 isExportAll,
                 depth: depth + 1,
                 cache,
+                filename,
             });
         }
         else {
@@ -63,10 +71,10 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, }) {
         isMatch = !!(opts.exportAllMembers && value in opts.exportAllMembers);
     }
     if (isMatch) {
-        replaceValue = `${remoteName}/${value}`;
+        replaceValue = `${remoteName}/${(0, utils_1.winPath)(value)}`;
     }
     // @ts-ignore
-    const file = path === null || path === void 0 ? void 0 : path.hub.file.opts.filename;
+    const file = (path === null || path === void 0 ? void 0 : path.hub.file.opts.filename) || filename;
     (_b = opts.onTransformDeps) === null || _b === void 0 ? void 0 : _b.call(opts, {
         sourceValue: value,
         replaceValue,

package/dist/babelPlugins/awaitImport/getAliasedPath.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAliasedPath = void 0;
-const path_1 = require("path");
 function getAliasedPath({ value, alias, }) {
     const importValue = value;
+    // equal alias
+    if (alias[value]) {
+        return alias[value];
+    }
     for (const key of Object.keys(alias)) {
         const aliasValue = alias[key];
         // exact alias
@@ -15,21 +18,13 @@ function getAliasedPath({ value, alias, }) {
             else
                 continue;
         }
-        // e.g. foo: path/to/foo
-        if (importValue === key) {
-            return aliasValue;
-        }
         // e.g. foo: path/to/foo.js
-        const slashedKey = isJSFile(aliasValue) ? key : addLastSlash(key);
-        if (importValue.startsWith(slashedKey)) {
+        if (importValue.startsWith(addLastSlash(key))) {
             return importValue.replace(key, aliasValue);
         }
     }
 }
 exports.getAliasedPath = getAliasedPath;
-function isJSFile(path) {
-    return ['.js', '.jsx', '.ts', '.tsx'].includes((0, path_1.extname)(path));
-}
 function addLastSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }

package/dist/babelPlugins/awaitImport/parseSpecifiers.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/dep/dep.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 };
 };
@@ -24,70 +15,67 @@ const getExposeFromContent_1 = require("./getExposeFromContent");
 const resolver = enhanced_resolve_1.default.create({
     mainFields: ['module', 'browser', 'main'],
     extensions: ['.js', '.json', '.mjs'],
-    // TODO: support exports
-    // tried to add exports, but it don't work with swr
-    exportsFields: [],
+    exportsFields: ['exports'],
+    conditionNames: ['import', 'module', 'require', 'node'],
 });
-function resolve(context, path) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            resolver(context, path, (err, result) => err ? reject(err) : resolve(result));
-        });
+async function resolve(context, path) {
+    return new Promise((resolve, reject) => {
+        resolver(context, path, (err, result) => err ? reject(err) : resolve(result));
     });
 }
 class Dep {
     constructor(opts) {
-        this.file = opts.file;
+        this.file = (0, utils_1.winPath)(opts.file);
         this.version = opts.version;
         this.cwd = opts.cwd;
-        this.shortFile = this.file.replace(this.cwd, '$CWD$');
+        this.shortFile = this.file;
         this.normalizedFile = this.shortFile.replace(/\//g, '_').replace(/:/g, '_');
         this.filePath = `${constants_1.MF_VA_PREFIX}${this.normalizedFile}.js`;
         this.mfsu = opts.mfsu;
     }
-    buildExposeContent() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // node natives
-            // @ts-ignore
-            const isNodeNatives = !!process.binding('natives')[this.file];
-            if (isNodeNatives) {
-                return (0, trimFileContent_1.trimFileContent)(this.mfsu.opts.excludeNodeNatives
-                    ? `
+    async buildExposeContent() {
+        // node natives
+        // @ts-ignore
+        const isNodeNatives = !!process.binding('natives')[this.file];
+        if (isNodeNatives) {
+            return (0, trimFileContent_1.trimFileContent)(this.mfsu.opts.excludeNodeNatives
+                ? `
 const _ = require('${this.file}');
 module.exports = _;
       `
-                    : `
+                : `
 import _ from '${this.file}';
 export default _;
 export * from '${this.file}';
       `);
-            }
-            // none node natives
-            const realFile = yield this.getRealFile();
-            (0, assert_1.default)(realFile, `filePath not found of ${this.file}`);
-            const content = (0, fs_1.readFileSync)(realFile, 'utf-8');
-            return yield (0, getExposeFromContent_1.getExposeFromContent)({
-                content,
-                filePath: realFile,
-                dep: this,
-            });
+        }
+        // none node natives
+        const realFile = await this.getRealFile();
+        (0, assert_1.default)(realFile, `filePath not found of ${this.file}`);
+        const content = (0, fs_1.readFileSync)(realFile, 'utf-8');
+        return await (0, getExposeFromContent_1.getExposeFromContent)({
+            content,
+            filePath: realFile,
+            dep: this,
         });
     }
-    getRealFile() {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                // don't need to handle alias here
-                // it's already handled by babel plugin
-                return yield resolve(this.cwd, this.file);
-            }
-            catch (e) {
-                return null;
-            }
-        });
+    async getRealFile() {
+        try {
+            // don't need to handle alias here
+            // it's already handled by babel plugin
+            return await resolve(this.cwd, this.file);
+        }
+        catch (e) {
+            return null;
+        }
     }
     static buildDeps(opts) {
         return Object.keys(opts.deps).map((file) => {
-            return new Dep(Object.assign(Object.assign({}, opts.deps[file]), { cwd: opts.cwd, mfsu: opts.mfsu }));
+            return new Dep({
+                ...opts.deps[file],
+                cwd: opts.cwd,
+                mfsu: opts.mfsu,
+            });
         });
     }
     static getDepVersion(opts) {
@@ -98,7 +86,7 @@ export * from '${this.file}';
         const dep = (0, path_1.isAbsolute)(opts.dep)
             ? opts.dep
             : (0, path_1.join)(opts.cwd, 'node_modules', opts.dep);
-        const pkg = utils_1.pkgUp.sync({
+        const pkg = utils_1.pkgUp.pkgUpSync({
             cwd: dep,
         });
         (0, assert_1.default)(pkg, `package.json not found for ${opts.dep}`);

package/dist/dep/getExposeFromContent.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 };
 };
@@ -16,62 +7,60 @@ exports.getExposeFromContent = void 0;
 const assert_1 = __importDefault(require("assert"));
 const path_1 = require("path");
 const getModuleExports_1 = require("./getModuleExports");
-function getExposeFromContent(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Support CSS
-        if (opts.filePath &&
-            /\.(css|less|scss|sass|stylus|styl)$/.test(opts.filePath)) {
-            return `import '${opts.dep.file}';`;
-        }
-        // Support Assets Files
-        if (opts.filePath &&
-            /\.(json|svg|png|jpe?g|avif|gif|webp|ico|eot|woff|woff2|ttf|txt|text|mdx?)$/.test(opts.filePath)) {
-            return `
+async function getExposeFromContent(opts) {
+    // Support CSS
+    if (opts.filePath &&
+        /\.(css|less|scss|sass|stylus|styl)$/.test(opts.filePath)) {
+        return `import '${opts.dep.file}';`;
+    }
+    // Support Assets Files
+    if (opts.filePath &&
+        /\.(json|svg|png|jpe?g|avif|gif|webp|ico|eot|woff|woff2|ttf|txt|text|mdx?)$/.test(opts.filePath)) {
+        return `
 import _ from '${opts.dep.file}';
 export default _;`.trim();
+    }
+    (0, assert_1.default)(/(js|jsx|mjs|ts|tsx)$/.test(opts.filePath), `file type not supported for ${(0, path_1.basename)(opts.filePath)}.`);
+    const { exports, isCJS } = await (0, getModuleExports_1.getModuleExports)({
+        content: opts.content,
+        filePath: opts.filePath,
+    });
+    // cjs
+    if (isCJS) {
+        return [
+            `import _ from '${opts.dep.file}';`,
+            `export default _;`,
+            `export * from '${opts.dep.file}';`,
+        ].join('\n');
+    }
+    // esm
+    else {
+        const ret = [];
+        let hasExports = false;
+        if (exports.includes('default')) {
+            ret.push(`import _ from '${opts.dep.file}';`);
+            ret.push(`export default _;`);
+            hasExports = true;
         }
-        (0, assert_1.default)(/(js|jsx|mjs|ts|tsx)$/.test(opts.filePath), `file type not supported for ${(0, path_1.basename)(opts.filePath)}.`);
-        const { exports, isCJS } = yield (0, getModuleExports_1.getModuleExports)({
-            content: opts.content,
-            filePath: opts.filePath,
-        });
-        // cjs
-        if (isCJS) {
-            return [
-                `import _ from '${opts.dep.file}';`,
-                `export default _;`,
-                `export * from '${opts.dep.file}';`,
-            ].join('\n');
+        if (hasNonDefaultExports(exports) ||
+            // export * from 不会有 exports，只会有 imports
+            /export\s+\*\s+from/.test(opts.content)) {
+            ret.push(`export * from '${opts.dep.file}';`);
+            hasExports = true;
         }
-        // esm
-        else {
-            const ret = [];
-            let hasExports = false;
-            if (exports.includes('default')) {
+        if (!hasExports) {
+            // 只有 __esModule 的全量导出
+            if (exports.includes('__esModule')) {
                 ret.push(`import _ from '${opts.dep.file}';`);
                 ret.push(`export default _;`);
-                hasExports = true;
-            }
-            if (hasNonDefaultExports(exports) ||
-                // export * from 不会有 exports，只会有 imports
-                /export\s+\*\s+from/.test(opts.content)) {
                 ret.push(`export * from '${opts.dep.file}';`);
-                hasExports = true;
             }
-            if (!hasExports) {
-                // 只有 __esModule 的全量导出
-                if (exports.includes('__esModule')) {
-                    ret.push(`import _ from '${opts.dep.file}';`);
-                    ret.push(`export default _;`);
-                    ret.push(`export * from '${opts.dep.file}';`);
-                }
-                else {
-                    ret.push(`import '${opts.dep.file}';`);
-                }
+            else {
+                ret.push(`import '${opts.dep.file}';`);
             }
-            return ret.join('\n');
         }
-    });
+        return ret.join('\n');
+    }
 }
 exports.getExposeFromContent = getExposeFromContent;
 function hasNonDefaultExports(exports) {

package/dist/dep/getModuleExports.js

@@ -1,45 +1,34 @@
 "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.getModuleExports = void 0;
 const es_module_lexer_1 = require("@umijs/bundler-utils/compiled/es-module-lexer");
 const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
 const path_1 = require("path");
 const getCJSExports_1 = require("./getCJSExports");
-function getModuleExports({ content, filePath, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Support tsx and jsx
-        if (filePath && /\.(tsx|jsx)$/.test(filePath)) {
-            content = (yield (0, esbuild_1.transform)(content, {
-                sourcemap: false,
-                sourcefile: filePath,
-                format: 'esm',
-                target: 'es6',
-                loader: (0, path_1.extname)(filePath).slice(1),
-            })).code;
+async function getModuleExports({ content, filePath, }) {
+    // Support tsx and jsx
+    if (filePath && /\.(tsx|jsx)$/.test(filePath)) {
+        content = (await (0, esbuild_1.transform)(content, {
+            sourcemap: false,
+            sourcefile: filePath,
+            format: 'esm',
+            target: 'es6',
+            loader: (0, path_1.extname)(filePath).slice(1),
+        })).code;
+    }
+    await es_module_lexer_1.init;
+    const [imports, exports] = (0, es_module_lexer_1.parse)(content);
+    let isCJS = !imports.length && !exports.length;
+    let cjsEsmExports = null;
+    if (isCJS) {
+        cjsEsmExports = (0, getCJSExports_1.getCJSExports)({ content });
+        if (cjsEsmExports.includes('__esModule')) {
+            isCJS = false;
         }
-        yield es_module_lexer_1.init;
-        const [imports, exports] = (0, es_module_lexer_1.parse)(content);
-        let isCJS = !imports.length && !exports.length;
-        let cjsEsmExports = null;
-        if (isCJS) {
-            cjsEsmExports = (0, getCJSExports_1.getCJSExports)({ content });
-            if (cjsEsmExports.includes('__esModule')) {
-                isCJS = false;
-            }
-        }
-        return {
-            exports: cjsEsmExports || exports,
-            isCJS,
-        };
-    });
+    }
+    return {
+        exports: cjsEsmExports || exports,
+        isCJS,
+    };
 }
 exports.getModuleExports = getModuleExports;

package/dist/depBuilder/depBuilder.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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DepBuilder = void 0;
 const bundler_esbuild_1 = require("@umijs/bundler-esbuild");
@@ -24,72 +15,77 @@ class DepBuilder {
         this.isBuilding = false;
         this.opts = opts;
     }
-    buildWithWebpack(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const config = this.getWebpackConfig({ deps: opts.deps });
-            return new Promise((resolve, reject) => {
-                const compiler = this.opts.mfsu.opts.implementor(config);
-                compiler.run((err, stats) => {
-                    opts.onBuildComplete();
-                    if (err || (stats === null || stats === void 0 ? void 0 : stats.hasErrors())) {
-                        if (err) {
-                            reject(err);
-                        }
-                        if (stats) {
-                            const errorMsg = stats.toString('errors-only');
-                            // console.error(errorMsg);
-                            reject(new Error(errorMsg));
-                        }
+    async buildWithWebpack(opts) {
+        const config = this.getWebpackConfig({ deps: opts.deps });
+        return new Promise((resolve, reject) => {
+            const compiler = this.opts.mfsu.opts.implementor(config);
+            compiler.run((err, stats) => {
+                opts.onBuildComplete();
+                if (err || (stats === null || stats === void 0 ? void 0 : stats.hasErrors())) {
+                    if (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(() => { });
             });
         });
     }
     // TODO: support watch and rebuild
-    buildWithESBuild(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const entryContent = (0, getESBuildEntry_1.getESBuildEntry)({ deps: opts.deps });
-            const ENTRY_FILE = 'esbuild-entry.js';
-            const tmpDir = this.opts.mfsu.opts.tmpBase;
-            const entryPath = (0, path_1.join)(tmpDir, ENTRY_FILE);
-            (0, fs_1.writeFileSync)(entryPath, entryContent, 'utf-8');
-            const date = new Date().getTime();
-            yield (0, bundler_esbuild_1.build)({
-                cwd: this.opts.mfsu.opts.cwd,
-                entry: {
-                    [`${constants_1.MF_VA_PREFIX}remoteEntry`]: entryPath,
-                },
-                config: {
-                    outputPath: tmpDir,
-                    alias: this.opts.mfsu.alias,
-                    externals: this.opts.mfsu.externals,
-                },
-                inlineStyle: true,
-            });
-            utils_1.logger.event(`[mfsu] compiled with esbuild successfully in ${+new Date() - date} ms`);
-            opts.onBuildComplete();
+    async buildWithESBuild(opts) {
+        const entryContent = (0, getESBuildEntry_1.getESBuildEntry)({ deps: opts.deps });
+        const ENTRY_FILE = 'esbuild-entry.js';
+        const tmpDir = this.opts.mfsu.opts.tmpBase;
+        const entryPath = (0, path_1.join)(tmpDir, ENTRY_FILE);
+        (0, fs_1.writeFileSync)(entryPath, entryContent, 'utf-8');
+        const date = new Date().getTime();
+        await (0, bundler_esbuild_1.build)({
+            cwd: this.opts.mfsu.opts.cwd,
+            entry: {
+                [`${constants_1.MF_VA_PREFIX}remoteEntry`]: entryPath,
+            },
+            config: {
+                ...this.opts.mfsu.opts.depBuildConfig,
+                outputPath: tmpDir,
+                alias: this.opts.mfsu.alias,
+                externals: this.opts.mfsu.externals,
+            },
+            inlineStyle: true,
         });
+        utils_1.logger.event(`[mfsu] compiled with esbuild successfully in ${+new Date() - date} ms`);
+        opts.onBuildComplete();
     }
-    build(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.isBuilding = true;
-            yield this.writeMFFiles({ deps: opts.deps });
-            const newOpts = Object.assign(Object.assign({}, opts), { onBuildComplete: () => {
-                    this.isBuilding = false;
-                    this.completeFns.forEach((fn) => fn());
-                    this.completeFns = [];
-                } });
+    async build(opts) {
+        this.isBuilding = true;
+        const onBuildComplete = () => {
+            this.isBuilding = false;
+            this.completeFns.forEach((fn) => fn());
+            this.completeFns = [];
+        };
+        try {
+            await this.writeMFFiles({ deps: opts.deps });
+            const newOpts = {
+                ...opts,
+                onBuildComplete,
+            };
             if (this.opts.mfsu.opts.buildDepWithESBuild) {
-                yield this.buildWithESBuild(newOpts);
+                await this.buildWithESBuild(newOpts);
             }
             else {
-                yield this.buildWithWebpack(newOpts);
+                await this.buildWithWebpack(newOpts);
             }
-        });
+        }
+        catch (e) {
+            onBuildComplete();
+            throw e;
+        }
     }
     onBuildComplete(fn) {
         if (this.isBuilding) {
@@ -99,17 +95,16 @@ class DepBuilder {
             fn();
         }
     }
-    writeMFFiles(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tmpBase = this.opts.mfsu.opts.tmpBase;
-            // expose files
-            for (const dep of opts.deps) {
-                const content = yield dep.buildExposeContent();
-                (0, fs_1.writeFileSync)((0, path_1.join)(tmpBase, dep.filePath), content, 'utf-8');
-            }
-            // index file
-            (0, fs_1.writeFileSync)((0, path_1.join)(tmpBase, 'index.js'), '"😛"', 'utf-8');
-        });
+    async writeMFFiles(opts) {
+        const tmpBase = this.opts.mfsu.opts.tmpBase;
+        utils_1.fsExtra.mkdirpSync(tmpBase);
+        // expose files
+        for (const dep of opts.deps) {
+            const content = await dep.buildExposeContent();
+            (0, fs_1.writeFileSync)((0, path_1.join)(tmpBase, dep.filePath), content, 'utf-8');
+        }
+        // index file
+        (0, fs_1.writeFileSync)((0, path_1.join)(tmpBase, 'index.js'), '"😛"', 'utf-8');
     }
     getWebpackConfig(opts) {
         var _a, _b;
@@ -147,8 +142,11 @@ class DepBuilder {
         depConfig.plugins.push(new stripSourceMapUrlPlugin_1.StripSourceMapUrlPlugin({
             webpack: this.opts.mfsu.opts.implementor,
         }));
+        depConfig.plugins.push(new this.opts.mfsu.opts.implementor.ProgressPlugin((percent, msg) => {
+            this.opts.mfsu.onProgress({ percent, status: msg });
+        }));
         const exposes = opts.deps.reduce((memo, dep) => {
-            memo[`./${dep.shortFile}`] = (0, path_1.join)(this.opts.mfsu.opts.tmpBase, dep.filePath);
+            memo[`./${dep.file}`] = (0, path_1.join)(this.opts.mfsu.opts.tmpBase, dep.filePath);
             return memo;
         }, {});
         depConfig.plugins.push(new this.opts.mfsu.opts.implementor.container.ModuleFederationPlugin({