@umijs/mfsu 4.0.0-beta.9 → 4.0.0-rc.1

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(path);
+}
+function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, }) {
     var _a, _b;
     let isMatch;
     let replaceValue = '';
@@ -20,6 +23,8 @@ 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)) ||
@@ -38,7 +43,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 +58,7 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, }) {
                 isExportAll,
                 depth: depth + 1,
                 cache,
+                filename,
             });
         }
         else {
@@ -66,7 +72,7 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, }) {
         replaceValue = `${remoteName}/${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/dep/dep.js

@@ -40,7 +40,7 @@ class Dep {
         this.file = 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;

package/dist/depBuilder/depBuilder.js

@@ -63,11 +63,7 @@ class DepBuilder {
                 entry: {
                     [`${constants_1.MF_VA_PREFIX}remoteEntry`]: entryPath,
                 },
-                config: {
-                    outputPath: tmpDir,
-                    alias: this.opts.mfsu.alias,
-                    externals: this.opts.mfsu.externals,
-                },
+                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`);
@@ -102,6 +98,7 @@ class DepBuilder {
     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();
@@ -148,7 +145,7 @@ class DepBuilder {
             webpack: this.opts.mfsu.opts.implementor,
         }));
         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({

package/dist/depInfo.js

@@ -27,6 +27,7 @@ class DepInfo {
     }
     loadCache() {
         if ((0, fs_1.existsSync)(this.cacheFilePath)) {
+            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);
@@ -34,6 +35,7 @@ class DepInfo {
     }
     writeCache() {
         utils_1.fsExtra.mkdirpSync((0, path_1.dirname)(this.cacheFilePath));
+        utils_1.logger.info('MFSU write cache');
         (0, fs_1.writeFileSync)(this.cacheFilePath, JSON.stringify({
             cacheDependency: this.cacheDependency,
             moduleGraph: this.moduleGraph.toJSON(),

package/dist/esbuildHandlers/autoExport.d.ts

@@ -0,0 +1,6 @@
+interface IOpts {
+    exports: string[];
+    code: string;
+}
+export default function autoExportHandler(opts: IOpts): string;
+export {};

package/dist/esbuildHandlers/autoExport.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function autoExportHandler(opts) {
+    if (!opts.exports.length) {
+        return `${opts.code};\nexport const __mfsu = 1;`;
+    }
+    return opts.code;
+}
+exports.default = autoExportHandler;

package/dist/esbuildHandlers/awaitImport/index.d.ts

@@ -0,0 +1,12 @@
+import type { ImportSpecifier } from '@umijs/bundler-utils/compiled/es-module-lexer';
+interface IParams {
+    cache: Map<string, any>;
+    opts: any;
+}
+interface IOpts {
+    code: string;
+    imports: ImportSpecifier[];
+    filePath: string;
+}
+export default function getAwaitImportHandler(params: IParams): (opts: IOpts) => string;
+export {};

package/dist/esbuildHandlers/awaitImport/index.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const checkMatch_1 = require("../../babelPlugins/awaitImport/checkMatch");
+function getAwaitImportHandler(params) {
+    return function awaitImportHandler(opts) {
+        var _a, _b;
+        let offset = 0;
+        let { code } = opts;
+        const { filePath, imports } = opts;
+        imports.forEach((i) => {
+            if (!i.n)
+                return;
+            const isLazyImport = i.d > 0;
+            const from = i.n;
+            const { isMatch, replaceValue } = (0, checkMatch_1.checkMatch)({
+                cache: params.cache,
+                value: from,
+                opts: params.opts,
+                filename: filePath,
+            });
+            if (isMatch) {
+                // case: import x from './index.ts';
+                //       import('./index.ts');
+                // import x from '
+                // import(
+                const preSeg = code.substring(0, i.s + offset);
+                // ';
+                // );
+                const tailSeg = code.substring(i.e + offset);
+                const quote = isLazyImport ? '"' : '';
+                code = `${preSeg}${quote}${replaceValue}${quote}${tailSeg}`;
+                offset += replaceValue.length - from.length;
+            }
+        });
+        if (params.cache.has(filePath)) {
+            (_b = (_a = params.opts).onCollect) === null || _b === void 0 ? void 0 : _b.call(_a, {
+                file: filePath,
+                data: params.cache.get(filePath),
+            });
+        }
+        return code;
+    };
+}
+exports.default = getAwaitImportHandler;

package/dist/mfsu.d.ts

@@ -14,8 +14,10 @@ interface IOpts {
     mode?: Mode;
     tmpBase?: string;
     unMatchLibs?: string[];
+    runtimePublicPath?: boolean | string;
     implementor: typeof webpack;
     buildDepWithESBuild?: boolean;
+    depBuildConfig: any;
 }
 export declare class MFSU {
     opts: IOpts;
@@ -25,13 +27,15 @@ export declare class MFSU {
     depBuilder: DepBuilder;
     depConfig: Configuration | null;
     constructor(opts: IOpts);
+    asyncImport(content: string): string;
     setWebpackConfig(opts: {
         config: Configuration;
         depConfig: Configuration;
-    }): void;
+    }): Promise<void>;
     buildDeps(): Promise<void>;
     getMiddlewares(): ((req: Request, res: Response, next: NextFunction) => void)[];
-    getBabelPlugins(): (typeof autoExport | (typeof awaitImport | {
+    private getAwaitImportCollectOpts;
+    getBabelPlugins(): (typeof autoExport | ({
         onTransformDeps: () => void;
         onCollect: ({ file, data, }: {
             file: string;
@@ -49,6 +53,7 @@ export declare class MFSU {
         remoteName: string | undefined;
         alias: Record<string, string>;
         externals: (Function | Record<string, string>)[];
-    })[])[];
+    } | typeof awaitImport)[])[];
+    getEsbuildLoaderHandler(): any[];
 }
 export {};

package/dist/mfsu.js

@@ -13,7 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MFSU = void 0;
+const bundler_utils_1 = require("@umijs/bundler-utils");
 const utils_1 = require("@umijs/utils");
+const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
 const mrmime_1 = require("../compiled/mrmime");
@@ -26,6 +28,8 @@ const constants_1 = require("./constants");
 const dep_1 = require("./dep/dep");
 const depBuilder_1 = require("./depBuilder/depBuilder");
 const depInfo_1 = require("./depInfo");
+const autoExport_2 = __importDefault(require("./esbuildHandlers/autoExport"));
+const awaitImport_2 = __importDefault(require("./esbuildHandlers/awaitImport"));
 const types_1 = require("./types");
 const makeArray_1 = require("./utils/makeArray");
 const buildDepPlugin_1 = require("./webpackPlugins/buildDepPlugin");
@@ -46,67 +50,151 @@ class MFSU {
         this.depBuilder = new depBuilder_1.DepBuilder({ mfsu: this });
         this.depInfo.loadCache();
     }
+    // swc don't support top-level await
+    // ref: https://github.com/vercel/next.js/issues/31054
+    asyncImport(content) {
+        return `await import('${content}');`;
+        // return `(async () => await import('${content}'))();`;
+    }
     setWebpackConfig(opts) {
         var _a;
-        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 = {};
-        Object.keys(opts.config.entry).forEach((key) => {
-            const virtualPath = `./mfsu-virtual-entry/${key}.js`;
-            virtualModules[virtualPath] =
-                // @ts-ignore
-                opts.config
-                    .entry[key].map((entry) => `await import('${entry}')`)
-                    .join('\n') + `\nexport default 1;`;
-            entry[key] = virtualPath;
+        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}`);
+                            }
+                        }
+                    }
+                    else {
+                        virtualContent.push(this.asyncImport(entry));
+                    }
+                    index += 1;
+                }
+                if (!hasDefaultExport) {
+                    virtualContent.push(`export default 1;`);
+                }
+                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 = '/';
+            }
+            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 script = document.createElement('script');
+  script.src = remoteUrlWithVersion;
+  script.onload = () => {
+    // the injected script has loaded and is available on window
+    // we can now resolve this Promise
+    const proxy = {
+      get: (request) => window['${mfName}'].get(request),
+      init: (arg) => {
+        try {
+          return window['${mfName}'].init(arg);
+        } catch(e) {
+          console.log('remote container already initialized');
+        }
+      }
+    }
+    resolve(proxy);
+  }
+  // inject this script with the src set to the versioned remoteEntry.js
+  document.head.appendChild(script);
+})
+                `.trimLeft()
+                            : `${mfName}@${publicPath}${constants_1.REMOTE_FILE_FULL}`,
+                    },
+                }),
+                new buildDepPlugin_1.BuildDepPlugin({
+                    onCompileDone: () => {
+                        this.buildDeps().catch((e) => {
+                            utils_1.logger.error(e);
+                        });
+                    },
+                }),
+                new writeCachePlugin_1.WriteCachePlugin({
+                    onWriteCache: utils_1.lodash.debounce(() => {
+                        this.depInfo.writeCache();
+                    }, 300),
+                }),
+            ]);
+            // ensure topLevelAwait enabled
+            utils_1.lodash.set(opts.config, 'experiments.topLevelAwait', true);
+            /**
+             * depConfig
+             */
+            this.depConfig = opts.depConfig;
         });
-        opts.config.entry = entry;
-        // plugins
-        opts.config.plugins = opts.config.plugins || [];
-        opts.config.plugins.push(...[
-            new webpack_virtual_modules_1.default(virtualModules),
-            new this.opts.implementor.container.ModuleFederationPlugin({
-                name: '__',
-                remotes: {
-                    // TODO: support runtime public path
-                    [mfName]: `${mfName}@${opts.config.output.publicPath}${constants_1.REMOTE_FILE_FULL}`,
-                },
-            }),
-            new buildDepPlugin_1.BuildDepPlugin({
-                onCompileDone: () => {
-                    this.buildDeps().catch((e) => {
-                        utils_1.logger.error(e);
-                    });
-                },
-            }),
-            new writeCachePlugin_1.WriteCachePlugin({
-                onWriteCache: () => {
-                    this.depInfo.writeCache();
-                },
-            }),
-        ]);
-        /**
-         * depConfig
-         */
-        this.depConfig = opts.depConfig;
     }
     buildDeps() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.depInfo.shouldBuild())
+            if (!this.depInfo.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');
+            utils_1.logger.debug(deps.map((dep) => dep.file).join(', '));
             yield this.depBuilder.build({
                 deps,
             });
@@ -126,7 +214,7 @@ class MFSU {
                         }
                         res.setHeader('content-type', (0, mrmime_1.lookup)((0, path_1.extname)(req.path)) || 'text/plain');
                         const relativePath = req.path.replace(new RegExp(`^${publicPath}`), '/');
-                        const content = (0, fs_1.readFileSync)((0, path_1.join)(this.opts.tmpBase, relativePath), 'utf-8');
+                        const content = (0, fs_1.readFileSync)((0, path_1.join)(this.opts.tmpBase, relativePath));
                         res.send(content);
                     });
                 }
@@ -136,43 +224,51 @@ class MFSU {
             },
         ];
     }
+    getAwaitImportCollectOpts() {
+        return {
+            onTransformDeps: () => { },
+            onCollect: ({ file, data, }) => {
+                this.depInfo.moduleGraph.onFileChange({
+                    file,
+                    // @ts-ignore
+                    deps: [
+                        ...Array.from(data.matched).map((item) => ({
+                            file: item.sourceValue,
+                            isDependency: true,
+                            version: dep_1.Dep.getDepVersion({
+                                dep: item.sourceValue,
+                                cwd: this.opts.cwd,
+                            }),
+                        })),
+                        ...Array.from(data.unMatched).map((item) => ({
+                            file: (0, getRealPath_1.getRealPath)({
+                                file,
+                                dep: item.sourceValue,
+                            }),
+                            isDependency: false,
+                        })),
+                    ],
+                });
+            },
+            exportAllMembers: this.opts.exportAllMembers,
+            unMatchLibs: this.opts.unMatchLibs,
+            remoteName: this.opts.mfName,
+            alias: this.alias,
+            externals: this.externals,
+        };
+    }
     getBabelPlugins() {
+        return [autoExport_1.default, [awaitImport_1.default, this.getAwaitImportCollectOpts()]];
+    }
+    getEsbuildLoaderHandler() {
+        const cache = new Map();
+        const checkOpts = this.getAwaitImportCollectOpts();
         return [
-            autoExport_1.default,
-            [
-                awaitImport_1.default,
-                {
-                    onTransformDeps: () => { },
-                    onCollect: ({ file, data, }) => {
-                        this.depInfo.moduleGraph.onFileChange({
-                            file,
-                            // @ts-ignore
-                            deps: [
-                                ...Array.from(data.matched).map((item) => ({
-                                    file: item.sourceValue,
-                                    isDependency: true,
-                                    version: dep_1.Dep.getDepVersion({
-                                        dep: item.sourceValue,
-                                        cwd: this.opts.cwd,
-                                    }),
-                                })),
-                                ...Array.from(data.unMatched).map((item) => ({
-                                    file: (0, getRealPath_1.getRealPath)({
-                                        file,
-                                        dep: item.sourceValue,
-                                    }),
-                                    isDependency: false,
-                                })),
-                            ],
-                        });
-                    },
-                    exportAllMembers: this.opts.exportAllMembers,
-                    unMatchLibs: this.opts.unMatchLibs,
-                    remoteName: this.opts.mfName,
-                    alias: this.alias,
-                    externals: this.externals,
-                },
-            ],
+            autoExport_2.default,
+            (0, awaitImport_2.default)({
+                cache,
+                opts: checkOpts,
+            }),
         ];
     }
 }

package/dist/moduleGraph.d.ts

@@ -31,6 +31,7 @@ export declare class ModuleGraph {
         roots: string[];
         fileModules: Record<string, {
             importedModules: string[];
+            isRoot?: boolean | undefined;
         }>;
         depModules: Record<string, {
             version: string | null;

package/dist/moduleGraph.js

@@ -20,7 +20,12 @@ class ModuleGraph {
         this.rootModules = new Set();
     }
     restore(data) {
+        let fileMap = new Map();
         const addNode = ({ file, importer }) => {
+            // fix circular dependency
+            if (fileMap.has(file))
+                return;
+            fileMap.set(file, true);
             const mod = new ModuleNode(file);
             let isDependency = false;
             let info;
@@ -33,8 +38,10 @@ class ModuleGraph {
             }
             if (info.isRoot)
                 mod.isRoot = true;
-            if (importer)
+            if (importer) {
                 mod.importers.add(importer);
+                importer.importedModules.add(mod);
+            }
             mod.isDependency = isDependency;
             if (info.version !== undefined) {
                 mod.version = info.version;
@@ -68,6 +75,7 @@ class ModuleGraph {
                 importedModules: Array.from(value.importedModules).map((item) => item.file),
             };
             if (value.isRoot) {
+                fileModules[key].isRoot = true;
                 roots.push(key);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-beta.9",
+  "version": "4.0.0-rc.1",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -21,15 +21,15 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-beta.9",
-    "@umijs/bundler-utils": "4.0.0-beta.9",
-    "@umijs/utils": "4.0.0-beta.9"
+    "@umijs/bundler-esbuild": "4.0.0-rc.1",
+    "@umijs/bundler-utils": "4.0.0-rc.1",
+    "@umijs/utils": "4.0.0-rc.1"
   },
   "devDependencies": {
     "@types/express": "4.17.13",
     "enhanced-resolve": "5.8.3",
     "mrmime": "1.0.0",
-    "webpack": "5.61.0",
+    "webpack": "5.64.4",
     "webpack-virtual-modules": "0.4.3"
   },
   "publishConfig": {