@umijs/mfsu 4.0.0-rc.11 → 4.0.0-rc.14

package/dist/dep/dep.js

@@ -24,9 +24,8 @@ 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* () {

package/dist/depBuilder/depBuilder.js

@@ -151,6 +151,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/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

@@ -37,12 +37,19 @@ 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 = Object.assign(Object.assign({}, 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 });
@@ -123,6 +130,7 @@ class MFSU {
             if (publicPath === 'auto') {
                 publicPath = '/';
             }
+            this.publicPath = publicPath;
             opts.config.plugins.push(...[
                 new webpack_virtual_modules_1.default(virtualModules),
                 new this.opts.implementor.container.ModuleFederationPlugin({
@@ -164,8 +172,17 @@ promise new Promise(resolve => {
                             this.buildDepsAgain = true;
                         }
                         else {
-                            this.buildDeps().catch((e) => {
+                            this.buildDeps()
+                                .then(() => {
+                                this.onProgress({
+                                    done: true,
+                                });
+                            })
+                                .catch((e) => {
                                 utils_1.logger.error(e);
+                                this.onProgress({
+                                    done: true,
+                                });
                             });
                         }
                     },
@@ -216,7 +233,7 @@ promise new Promise(resolve => {
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-rc.11",
+  "version": "4.0.0-rc.14",
   "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",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-rc.11",
-    "@umijs/bundler-utils": "4.0.0-rc.11",
-    "@umijs/utils": "4.0.0-rc.11",
+    "@umijs/bundler-esbuild": "4.0.0-rc.14",
+    "@umijs/bundler-utils": "4.0.0-rc.14",
+    "@umijs/utils": "4.0.0-rc.14",
     "enhanced-resolve": "5.9.2"
   },
   "devDependencies": {
     "mrmime": "1.0.0",
-    "webpack": "5.70.0",
+    "webpack": "5.72.0",
     "webpack-virtual-modules": "0.4.3"
   },
   "publishConfig": {