@umijs/mfsu 4.0.0-rc.9 → 4.0.2

package/dist/babelPlugins/awaitImport/checkMatch.js

@@ -11,9 +11,11 @@ const getAliasedPath_1 = require("./getAliasedPath");
 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 isUmiLocalDev(path) {
-    return RE_UMI_LOCAL_DEV.test((0, utils_1.winPath)(path));
+    const rootPath = (0, utils_1.isLocalDev)();
+    return rootPath
+        ? (0, utils_1.winPath)(path).startsWith((0, utils_1.winPath)((0, path_1.join)(rootPath, './packages')))
+        : false;
 }
 function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, }) {
     var _a, _b;

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 };
 };
@@ -23,16 +14,13 @@ const trimFileContent_1 = require("../utils/trimFileContent");
 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: [],
+    extensions: ['.wasm', '.mjs', '.js', '.jsx', '.ts', '.tsx', '.json'],
+    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 {
@@ -45,49 +33,49 @@ class Dep {
         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) {

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,75 +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: Object.assign(Object.assign({}, 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();
+    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;
-            const 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,
             };
-            try {
-                yield this.writeMFFiles({ deps: opts.deps });
-                const newOpts = Object.assign(Object.assign({}, opts), { onBuildComplete });
-                if (this.opts.mfsu.opts.buildDepWithESBuild) {
-                    yield this.buildWithESBuild(newOpts);
-                }
-                else {
-                    yield this.buildWithWebpack(newOpts);
-                }
+            if (this.opts.mfsu.opts.buildDepWithESBuild) {
+                await this.buildWithESBuild(newOpts);
             }
-            catch (e) {
-                onBuildComplete();
-                throw e;
+            else {
+                await this.buildWithWebpack(newOpts);
             }
-        });
+        }
+        catch (e) {
+            onBuildComplete();
+            throw e;
+        }
     }
     onBuildComplete(fn) {
         if (this.isBuilding) {
@@ -102,18 +95,16 @@ class DepBuilder {
             fn();
         }
     }
-    writeMFFiles(opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const tmpBase = this.opts.mfsu.opts.tmpBase;
-            utils_1.fsExtra.mkdirpSync(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;
@@ -151,6 +142,9 @@ 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.file}`] = (0, path_1.join)(this.opts.mfsu.opts.tmpBase, dep.filePath);
             return memo;

package/dist/depInfo.js

@@ -27,7 +27,7 @@ class DepInfo {
     }
     loadCache() {
         if ((0, fs_1.existsSync)(this.cacheFilePath)) {
-            utils_1.logger.info('MFSU restore cache');
+            utils_1.logger.info('[MFSU] restore cache');
             const { cacheDependency, moduleGraph } = JSON.parse((0, fs_1.readFileSync)(this.cacheFilePath, 'utf-8'));
             this.cacheDependency = cacheDependency;
             this.moduleGraph.restore(moduleGraph);
@@ -43,7 +43,7 @@ class DepInfo {
             (0, fs_1.readFileSync)(this.cacheFilePath, 'utf-8') === newContent) {
             return;
         }
-        utils_1.logger.info('MFSU write cache');
+        utils_1.logger.info('[MFSU] write cache');
         (0, fs_1.writeFileSync)(this.cacheFilePath, newContent, 'utf-8');
     }
 }

package/dist/loader/esbuild.js

@@ -1,54 +1,38 @@
 "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 __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 });
 exports.esbuildLoader = 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");
-function esbuildTranspiler(source) {
+async function esbuildTranspiler(source) {
     var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const done = this.async();
-        const options = this.getOptions();
-        const { handler = [], implementation } = options, otherOptions = __rest(options, ["handler", "implementation"]);
-        const transform = (implementation === null || implementation === void 0 ? void 0 : implementation.transform) || esbuild_1.transform;
-        const filePath = this.resourcePath;
-        const ext = (0, path_1.extname)(filePath).slice(1);
-        const transformOptions = Object.assign(Object.assign({}, otherOptions), { target: (_a = options.target) !== null && _a !== void 0 ? _a : 'es2015', loader: ext !== null && ext !== void 0 ? ext : 'js', sourcemap: this.sourceMap, sourcefile: filePath });
-        try {
-            let { code, map } = yield transform(source, transformOptions);
-            if (handler.length) {
-                yield es_module_lexer_1.init;
-                handler.forEach((handle) => {
-                    const [imports, exports] = (0, es_module_lexer_1.parse)(code);
-                    code = handle({ code, imports, exports, filePath });
-                });
-            }
-            done(null, code, map && JSON.parse(map));
-        }
-        catch (error) {
-            done(error);
+    const done = this.async();
+    const options = this.getOptions();
+    const { handler = [], implementation, ...otherOptions } = options;
+    const transform = (implementation === null || implementation === void 0 ? void 0 : implementation.transform) || esbuild_1.transform;
+    const filePath = this.resourcePath;
+    const ext = (0, path_1.extname)(filePath).slice(1);
+    const transformOptions = {
+        ...otherOptions,
+        target: (_a = options.target) !== null && _a !== void 0 ? _a : 'es2015',
+        loader: ext !== null && ext !== void 0 ? ext : 'js',
+        sourcemap: this.sourceMap,
+        sourcefile: filePath,
+    };
+    try {
+        let { code, map } = await transform(source, transformOptions);
+        if (handler.length) {
+            await es_module_lexer_1.init;
+            handler.forEach((handle) => {
+                const [imports, exports] = (0, es_module_lexer_1.parse)(code);
+                code = handle({ code, imports, exports, filePath });
+            });
         }
-    });
+        done(null, code, map && JSON.parse(map));
+    }
+    catch (error) {
+        done(error);
+    }
 }
 exports.default = esbuildTranspiler;
 exports.esbuildLoader = __filename;

package/dist/mfsu.d.ts

@@ -9,6 +9,7 @@ interface IOpts {
     excludeNodeNatives?: boolean;
     exportAllMembers?: Record<string, string[]>;
     getCacheDependency?: Function;
+    onMFSUProgress?: Function;
     mfName?: string;
     mode?: Mode;
     tmpBase?: string;
@@ -26,6 +27,9 @@ export declare class MFSU {
     depBuilder: DepBuilder;
     depConfig: Configuration | null;
     buildDepsAgain: boolean;
+    progress: any;
+    onProgress: Function;
+    publicPath: string;
     constructor(opts: IOpts);
     asyncImport(content: string): string;
     setWebpackConfig(opts: {

package/dist/mfsu.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 };
 };
@@ -37,12 +28,22 @@ class MFSU {
         this.externals = [];
         this.depConfig = null;
         this.buildDepsAgain = false;
+        this.progress = { done: false };
+        this.publicPath = '/';
         this.opts = opts;
         this.opts.mfName = this.opts.mfName || constants_1.DEFAULT_MF_NAME;
         this.opts.tmpBase =
             this.opts.tmpBase || (0, path_1.join)(process.cwd(), constants_1.DEFAULT_TMP_DIR_NAME);
         this.opts.mode = this.opts.mode || types_1.Mode.development;
         this.opts.getCacheDependency = this.opts.getCacheDependency || (() => ({}));
+        this.onProgress = (progress) => {
+            var _a, _b;
+            this.progress = {
+                ...this.progress,
+                ...progress,
+            };
+            (_b = (_a = this.opts).onMFSUProgress) === null || _b === void 0 ? void 0 : _b.call(_a, this.progress);
+        };
         this.opts.cwd = this.opts.cwd || process.cwd();
         this.depInfo = new depInfo_1.DepInfo({ mfsu: this });
         this.depBuilder = new depBuilder_1.DepBuilder({ mfsu: this });
@@ -54,86 +55,88 @@ class MFSU {
         return `await import('${(0, utils_1.winPath)(content)}');`;
         // return `(async () => await import('${content}'))();`;
     }
-    setWebpackConfig(opts) {
+    async setWebpackConfig(opts) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const { mfName } = this.opts;
-            /**
-             * config
-             */
-            // set alias and externals with reference for babel plugin
-            Object.assign(this.alias, ((_a = opts.config.resolve) === null || _a === void 0 ? void 0 : _a.alias) || {});
-            this.externals.push(...(0, makeArray_1.makeArray)(opts.config.externals || []));
-            // entry
-            const entry = {};
-            const virtualModules = {};
-            // ensure entry object type
-            const entryObject = utils_1.lodash.isString(opts.config.entry)
-                ? { default: [opts.config.entry] }
-                : opts.config.entry;
-            (0, assert_1.default)(utils_1.lodash.isPlainObject(entryObject), `webpack config 'entry' value must be a string or an object.`);
-            for (const key of Object.keys(entryObject)) {
-                const virtualPath = `./mfsu-virtual-entry/${key}.js`;
-                const virtualContent = [];
-                let index = 1;
-                let hasDefaultExport = false;
-                const entryFiles = utils_1.lodash.isArray(entryObject[key])
-                    ? entryObject[key]
-                    : [entryObject[key]];
-                for (let entry of entryFiles) {
-                    // ensure entry is a file
-                    if ((0, fs_1.statSync)(entry).isDirectory()) {
-                        const realEntry = (0, utils_1.tryPaths)([
-                            (0, path_1.join)(entry, 'index.tsx'),
-                            (0, path_1.join)(entry, 'index.ts'),
-                        ]);
-                        (0, assert_1.default)(realEntry, `entry file not found, please configure the specific entry path. (e.g. 'src/index.tsx')`);
-                        entry = realEntry;
-                    }
-                    const content = (0, fs_1.readFileSync)(entry, 'utf-8');
-                    const [_imports, exports] = yield (0, bundler_utils_1.parseModule)({ content, path: entry });
-                    if (exports.length) {
-                        virtualContent.push(`const k${index} = ${this.asyncImport(entry)}`);
-                        for (const exportName of exports) {
-                            if (exportName === 'default') {
-                                hasDefaultExport = true;
-                                virtualContent.push(`export default k${index}.${exportName}`);
-                            }
-                            else {
-                                virtualContent.push(`export const ${exportName} = k${index}.${exportName}`);
-                            }
+        const { mfName } = this.opts;
+        /**
+         * config
+         */
+        // set alias and externals with reference for babel plugin
+        Object.assign(this.alias, ((_a = opts.config.resolve) === null || _a === void 0 ? void 0 : _a.alias) || {});
+        this.externals.push(...(0, makeArray_1.makeArray)(opts.config.externals || []));
+        // entry
+        const entry = {};
+        const virtualModules = {};
+        // ensure entry object type
+        const entryObject = utils_1.lodash.isString(opts.config.entry)
+            ? { default: [opts.config.entry] }
+            : opts.config.entry;
+        (0, assert_1.default)(utils_1.lodash.isPlainObject(entryObject), `webpack config 'entry' value must be a string or an object.`);
+        for (const key of Object.keys(entryObject)) {
+            const virtualPath = `./mfsu-virtual-entry/${key}.js`;
+            const virtualContent = [];
+            let index = 1;
+            let hasDefaultExport = false;
+            const entryFiles = utils_1.lodash.isArray(entryObject[key])
+                ? entryObject[key]
+                : [entryObject[key]];
+            for (let entry of entryFiles) {
+                // ensure entry is a file
+                if ((0, fs_1.statSync)(entry).isDirectory()) {
+                    const realEntry = (0, utils_1.tryPaths)([
+                        (0, path_1.join)(entry, 'index.tsx'),
+                        (0, path_1.join)(entry, 'index.ts'),
+                        (0, path_1.join)(entry, 'index.jsx'),
+                        (0, path_1.join)(entry, 'index.js'),
+                    ]);
+                    (0, assert_1.default)(realEntry, `entry file not found, please configure the specific entry path. (e.g. 'src/index.tsx')`);
+                    entry = realEntry;
+                }
+                const content = (0, fs_1.readFileSync)(entry, 'utf-8');
+                const [_imports, exports] = await (0, bundler_utils_1.parseModule)({ content, path: entry });
+                if (exports.length) {
+                    virtualContent.push(`const k${index} = ${this.asyncImport(entry)}`);
+                    for (const exportName of exports) {
+                        if (exportName === 'default') {
+                            hasDefaultExport = true;
+                            virtualContent.push(`export default k${index}.${exportName}`);
+                        }
+                        else {
+                            virtualContent.push(`export const ${exportName} = k${index}.${exportName}`);
                         }
                     }
-                    else {
-                        virtualContent.push(this.asyncImport(entry));
-                    }
-                    index += 1;
                 }
-                if (!hasDefaultExport) {
-                    virtualContent.push(`export default 1;`);
+                else {
+                    virtualContent.push(this.asyncImport(entry));
                 }
-                virtualModules[virtualPath] = virtualContent.join('\n');
-                entry[key] = virtualPath;
+                index += 1;
             }
-            opts.config.entry = entry;
-            // plugins
-            opts.config.plugins = opts.config.plugins || [];
-            // support publicPath auto
-            let publicPath = opts.config.output.publicPath;
-            if (publicPath === 'auto') {
-                publicPath = '/';
+            if (!hasDefaultExport) {
+                virtualContent.push(`export default 1;`);
             }
-            opts.config.plugins.push(...[
-                new webpack_virtual_modules_1.default(virtualModules),
-                new this.opts.implementor.container.ModuleFederationPlugin({
-                    name: '__',
-                    remotes: {
-                        [mfName]: this.opts.runtimePublicPath
-                            ? // ref:
-                                // https://webpack.js.org/concepts/module-federation/#promise-based-dynamic-remotes
-                                `
+            virtualModules[virtualPath] = virtualContent.join('\n');
+            entry[key] = virtualPath;
+        }
+        opts.config.entry = entry;
+        // plugins
+        opts.config.plugins = opts.config.plugins || [];
+        // support publicPath auto
+        let publicPath = opts.config.output.publicPath;
+        if (publicPath === 'auto') {
+            publicPath = '/';
+        }
+        this.publicPath = publicPath;
+        opts.config.plugins.push(...[
+            new webpack_virtual_modules_1.default(virtualModules),
+            new this.opts.implementor.container.ModuleFederationPlugin({
+                name: '__',
+                remotes: {
+                    [mfName]: this.opts.runtimePublicPath
+                        ? // ref:
+                            // https://webpack.js.org/concepts/module-federation/#promise-based-dynamic-remotes
+                            `
 promise new Promise(resolve => {
-  const remoteUrlWithVersion = window.publicPath + '${constants_1.REMOTE_FILE_FULL}';
+  const remoteUrlWithVersion = (window.publicPath || '/') + '${constants_1.REMOTE_FILE_FULL}';
   const script = document.createElement('script');
   script.src = remoteUrlWithVersion;
   script.onload = () => {
@@ -155,68 +158,74 @@ promise new Promise(resolve => {
   document.head.appendChild(script);
 })
                 `.trimLeft()
-                            : `${mfName}@${publicPath}${constants_1.REMOTE_FILE_FULL}`,
-                    },
-                }),
-                new buildDepPlugin_1.BuildDepPlugin({
-                    onCompileDone: () => {
-                        if (this.depBuilder.isBuilding) {
-                            this.buildDepsAgain = true;
-                        }
-                        else {
-                            this.buildDeps().catch((e) => {
-                                utils_1.logger.error(e);
+                        : `${mfName}@${publicPath}${constants_1.REMOTE_FILE_FULL}`,
+                },
+            }),
+            new buildDepPlugin_1.BuildDepPlugin({
+                onCompileDone: () => {
+                    if (this.depBuilder.isBuilding) {
+                        this.buildDepsAgain = true;
+                    }
+                    else {
+                        this.buildDeps()
+                            .then(() => {
+                            this.onProgress({
+                                done: true,
                             });
-                        }
-                    },
-                }),
-                // new WriteCachePlugin({
-                //   onWriteCache: lodash.debounce(() => {
-                //     this.depInfo.writeCache();
-                //   }, 300),
-                // }),
-            ]);
-            // ensure topLevelAwait enabled
-            utils_1.lodash.set(opts.config, 'experiments.topLevelAwait', true);
-            /**
-             * depConfig
-             */
-            this.depConfig = opts.depConfig;
-        });
+                        })
+                            .catch((e) => {
+                            utils_1.logger.error(e);
+                            this.onProgress({
+                                done: true,
+                            });
+                        });
+                    }
+                },
+            }),
+            // new WriteCachePlugin({
+            //   onWriteCache: lodash.debounce(() => {
+            //     this.depInfo.writeCache();
+            //   }, 300),
+            // }),
+        ]);
+        // ensure topLevelAwait enabled
+        utils_1.lodash.set(opts.config, 'experiments.topLevelAwait', true);
+        /**
+         * depConfig
+         */
+        this.depConfig = opts.depConfig;
     }
-    buildDeps() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const shouldBuild = this.depInfo.shouldBuild();
-            if (!shouldBuild) {
-                utils_1.logger.info('MFSU skip buildDeps');
-                return;
-            }
-            this.depInfo.snapshot();
-            const deps = dep_1.Dep.buildDeps({
-                deps: this.depInfo.moduleGraph.depSnapshotModules,
-                cwd: this.opts.cwd,
-                mfsu: this,
-            });
-            utils_1.logger.info(`MFSU buildDeps since ${shouldBuild}`);
-            utils_1.logger.debug(deps.map((dep) => dep.file).join(', '));
-            yield this.depBuilder.build({
-                deps,
-            });
-            // Write cache
-            this.depInfo.writeCache();
-            if (this.buildDepsAgain) {
-                utils_1.logger.info('MFSU buildDepsAgain');
-                this.buildDepsAgain = false;
-                this.buildDeps().catch((e) => {
-                    utils_1.logger.error(e);
-                });
-            }
+    async buildDeps() {
+        const shouldBuild = this.depInfo.shouldBuild();
+        if (!shouldBuild) {
+            utils_1.logger.info('[MFSU] skip buildDeps');
+            return;
+        }
+        this.depInfo.snapshot();
+        const deps = dep_1.Dep.buildDeps({
+            deps: this.depInfo.moduleGraph.depSnapshotModules,
+            cwd: this.opts.cwd,
+            mfsu: this,
         });
+        utils_1.logger.info(`[MFSU] buildDeps since ${shouldBuild}`);
+        utils_1.logger.debug(deps.map((dep) => dep.file).join(', '));
+        await this.depBuilder.build({
+            deps,
+        });
+        // Write cache
+        this.depInfo.writeCache();
+        if (this.buildDepsAgain) {
+            utils_1.logger.info('[MFSU] buildDepsAgain');
+            this.buildDepsAgain = false;
+            this.buildDeps().catch((e) => {
+                utils_1.logger.error(e);
+            });
+        }
     }
     getMiddlewares() {
         return [
             (req, res, next) => {
-                const publicPath = '/';
+                const publicPath = this.publicPath;
                 const isMF = req.path.startsWith(`${publicPath}${constants_1.MF_VA_PREFIX}`) ||
                     req.path.startsWith(`${publicPath}${constants_1.MF_DEP_PREFIX}`) ||
                     req.path.startsWith(`${publicPath}${constants_1.MF_STATIC_PREFIX}`);

package/dist/moduleGraph.js

@@ -151,7 +151,7 @@ class ModuleGraph {
             this.deleteNode({ mod: importedModulesMap[key], importer: opts.mod });
         });
         newDeps.forEach((dep) => {
-            this.addNode(Object.assign(Object.assign({}, dep), { importer: opts.mod }));
+            this.addNode({ ...dep, importer: opts.mod });
         });
     }
     addNode(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-rc.9",
+  "version": "4.0.2",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -17,19 +17,19 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "build:deps": "umi-scripts bundleDeps",
+    "dev": "pnpm build --watch",
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-rc.9",
-    "@umijs/bundler-utils": "4.0.0-rc.9",
-    "@umijs/utils": "4.0.0-rc.9",
-    "enhanced-resolve": "5.9.2"
+    "@umijs/bundler-esbuild": "4.0.2",
+    "@umijs/bundler-utils": "4.0.2",
+    "@umijs/utils": "4.0.2",
+    "enhanced-resolve": "5.9.3"
   },
   "devDependencies": {
     "mrmime": "1.0.0",
-    "webpack": "5.70.0",
+    "webpack": "5.72.1",
     "webpack-virtual-modules": "0.4.3"
   },
   "publishConfig": {