@umijs/mfsu 4.0.0-beta.14 → 4.0.0-beta.18

package/dist/babelPlugins/awaitImport/checkMatch.js

@@ -23,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)) ||

package/dist/depBuilder/depBuilder.js

@@ -98,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();

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/mfsu.d.ts

@@ -27,6 +27,7 @@ export declare class MFSU {
     depBuilder: DepBuilder;
     depConfig: Configuration | null;
     constructor(opts: IOpts);
+    asyncImport(content: string): string;
     setWebpackConfig(opts: {
         config: Configuration;
         depConfig: Configuration;

package/dist/mfsu.js

@@ -15,6 +15,7 @@ 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");
@@ -47,6 +48,12 @@ 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;
         return __awaiter(this, void 0, void 0, function* () {
@@ -60,26 +67,51 @@ class MFSU {
             // entry
             const entry = {};
             const virtualModules = {};
-            for (const key of Object.keys(opts.config.entry)) {
+            // 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;
-                // @ts-ignore
-                for (const entry of opts.config.entry[key]) {
+                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} = await import('${entry}');`);
+                        virtualContent.push(`const k${index} = ${this.asyncImport(entry)}`);
                         for (const exportName of exports) {
-                            virtualContent.push(`export const ${exportName} = k${index}.${exportName}`);
+                            if (exportName === 'default') {
+                                hasDefaultExport = true;
+                                virtualContent.push(`export default k${index}.${exportName}`);
+                            }
+                            else {
+                                virtualContent.push(`export const ${exportName} = k${index}.${exportName}`);
+                            }
                         }
                     }
                     else {
-                        virtualContent.push(`await import('${entry}')`);
+                        virtualContent.push(this.asyncImport(entry));
                     }
                     index += 1;
                 }
-                virtualContent.push(`export default 1;`);
+                if (!hasDefaultExport) {
+                    virtualContent.push(`export default 1;`);
+                }
                 virtualModules[virtualPath] = virtualContent.join('\n');
                 entry[key] = virtualPath;
             }
@@ -97,7 +129,9 @@ class MFSU {
                     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');
@@ -132,11 +166,13 @@ promise new Promise(resolve => {
                     },
                 }),
                 new writeCachePlugin_1.WriteCachePlugin({
-                    onWriteCache: () => {
+                    onWriteCache: utils_1.lodash.debounce(() => {
                         this.depInfo.writeCache();
-                    },
+                    }, 300),
                 }),
             ]);
+            // ensure topLevelAwait enabled
+            utils_1.lodash.set(opts.config, 'experiments.topLevelAwait', true);
             /**
              * depConfig
              */
@@ -145,14 +181,18 @@ promise new Promise(resolve => {
     }
     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,
             });

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

@@ -38,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;
@@ -73,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.14",
+  "version": "4.0.0-beta.18",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -21,9 +21,9 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-beta.14",
-    "@umijs/bundler-utils": "4.0.0-beta.14",
-    "@umijs/utils": "4.0.0-beta.14"
+    "@umijs/bundler-esbuild": "4.0.0-beta.18",
+    "@umijs/bundler-utils": "4.0.0-beta.18",
+    "@umijs/utils": "4.0.0-beta.18"
   },
   "devDependencies": {
     "@types/express": "4.17.13",