@umijs/mfsu 4.0.15 → 4.0.18

package/dist/dep/dep.d.ts

@@ -6,12 +6,12 @@ export declare class Dep {
     shortFile: string;
     normalizedFile: string;
     filePath: string;
-    mfsu: MFSU;
+    excludeNodeNatives: boolean;
     constructor(opts: {
         file: string;
         version: string;
         cwd: string;
-        mfsu: MFSU;
+        excludeNodeNatives: boolean;
     });
     buildExposeContent(): Promise<string>;
     getRealFile(): Promise<string | null>;

package/dist/dep/dep.js

@@ -69,12 +69,12 @@ var Dep = class {
     this.shortFile = this.file;
     this.normalizedFile = this.shortFile.replace(/\//g, "_").replace(/:/g, "_");
     this.filePath = `${import_constants.MF_VA_PREFIX}${this.normalizedFile}.js`;
-    this.mfsu = opts.mfsu;
+    this.excludeNodeNatives = opts.excludeNodeNatives;
   }
   async buildExposeContent() {
     const isNodeNatives = !!process.binding("natives")[this.file];
     if (isNodeNatives) {
-      return (0, import_trimFileContent.trimFileContent)(this.mfsu.opts.excludeNodeNatives ? `
+      return (0, import_trimFileContent.trimFileContent)(this.excludeNodeNatives ? `
 const _ = require('${this.file}');
 module.exports = _;
       ` : `
@@ -103,7 +103,7 @@ export * from '${this.file}';
     return Object.keys(opts.deps).map((file) => {
       return new Dep(__spreadProps(__spreadValues({}, opts.deps[file]), {
         cwd: opts.cwd,
-        mfsu: opts.mfsu
+        excludeNodeNatives: opts.mfsu.opts.excludeNodeNatives
       }));
     });
   }

package/dist/depBuilder/depBuilder.d.ts

@@ -16,6 +16,10 @@ export declare class DepBuilder {
         onBuildComplete: Function;
         deps: Dep[];
     }): Promise<void>;
+    buildWithWorker(opts: {
+        onBuildComplete: Function;
+        deps: Dep[];
+    }): Promise<void>;
     build(opts: {
         deps: Dep[];
     }): Promise<void>;

package/dist/depBuilder/depBuilder.js

@@ -97,6 +97,38 @@ var DepBuilder = class {
     import_utils.logger.event(`[mfsu] compiled with esbuild successfully in ${+new Date() - date} ms`);
     opts.onBuildComplete();
   }
+  async buildWithWorker(opts) {
+    const worker = this.opts.mfsu.opts.startBuildWorker(opts.deps);
+    worker.postMessage(opts.deps);
+    return new Promise((resolve, reject) => {
+      const onMessage = ({
+        progress,
+        done,
+        error
+      }) => {
+        if (done) {
+          opts.onBuildComplete();
+          worker.off("message", onMessage);
+          resolve();
+        }
+        if (error) {
+          worker.off("message", onMessage);
+          opts.onBuildComplete();
+          import_utils.logger.error("[MFSU][eager] build failed", error);
+          reject(error);
+        }
+        if (progress) {
+          this.opts.mfsu.onProgress(progress);
+        }
+      };
+      worker.on("message", onMessage);
+      worker.once("error", (e) => {
+        import_utils.logger.error("[MFSU][eager] worker got Error", e);
+        opts.onBuildComplete();
+        reject(e);
+      });
+    });
+  }
   async build(opts) {
     this.isBuilding = true;
     const onBuildComplete = () => {
@@ -105,14 +137,18 @@ var DepBuilder = class {
       this.completeFns = [];
     };
     try {
-      await this.writeMFFiles({ deps: opts.deps });
-      const newOpts = __spreadProps(__spreadValues({}, opts), {
+      const buildOpts = __spreadProps(__spreadValues({}, opts), {
         onBuildComplete
       });
+      if (this.opts.mfsu.opts.strategy === "eager") {
+        await this.buildWithWorker(buildOpts);
+        return;
+      }
+      await this.writeMFFiles({ deps: opts.deps });
       if (this.opts.mfsu.opts.buildDepWithESBuild) {
-        await this.buildWithESBuild(newOpts);
+        await this.buildWithESBuild(buildOpts);
       } else {
-        await this.buildWithWebpack(newOpts);
+        await this.buildWithWebpack(buildOpts);
       }
     } catch (e) {
       onBuildComplete();

package/dist/mfsu/mfsu.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="node" />
 import type { NextFunction, Request, Response } from '@umijs/bundler-utils/compiled/express';
 import webpack, { Configuration } from 'webpack';
+import type { Worker } from 'worker_threads';
 import { DepBuilder } from '../depBuilder/depBuilder';
 import { DepModule } from '../depInfo';
 import { Mode } from '../types';
@@ -24,7 +26,7 @@ interface IOpts {
     shared?: any;
     remoteName?: string;
     remoteAliases?: string[];
-    serverBase?: string;
+    startBuildWorker: (dep: any[]) => Worker;
 }
 export declare class MFSU {
     opts: IOpts;

package/dist/mfsu/mfsu.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -71,7 +57,10 @@ var MFSU = class {
     this.opts.getCacheDependency = this.opts.getCacheDependency || (() => ({}));
     this.onProgress = (progress) => {
       var _a, _b;
-      this.progress = __spreadValues(__spreadValues({}, this.progress), progress);
+      this.progress = {
+        ...this.progress,
+        ...progress
+      };
       (_b = (_a = this.opts).onMFSUProgress) == null ? void 0 : _b.call(_a, this.progress);
     };
     this.opts.cwd = this.opts.cwd || process.cwd();
@@ -184,7 +173,7 @@ promise new Promise(resolve => {
   // inject this script with the src set to the versioned remoteEntry.js
   document.head.appendChild(script);
 })
-                `.trimLeft() : `${mfName}@${this.opts.serverBase || ""}${publicPath}${import_constants.REMOTE_FILE_FULL}`
+                `.trimLeft() : `${mfName}@${publicPath}${import_constants.REMOTE_FILE_FULL}`
         }
       }),
       new import_buildDepPlugin.BuildDepPlugin(this.strategy.getBuildDepPlugConfig())

package/dist/mfsu/strategyStaticAnalyze.js

@@ -100,10 +100,10 @@ var StaticAnalyzeStrategy = class {
     const mfsu = this.mfsu;
     return {
       beforeCompile: async () => {
-        import_utils.logger.event(`[MFSU][eager] start build deps`);
         if (mfsu.depBuilder.isBuilding) {
           mfsu.buildDepsAgain = true;
         } else {
+          import_utils.logger.event(`[MFSU][eager] start build deps`);
           this.staticDepInfo.consumeAllProducedEvents();
           mfsu.buildDeps().then(() => {
             mfsu.onProgress({

package/dist/webpackPlugins/buildDepPlugin.js

@@ -34,7 +34,11 @@ var BuildDepPlugin = class {
     });
     compiler.hooks.beforeCompile.tap(PLUGIN_NAME, () => {
       var _a, _b;
-      (_b = (_a = this.opts).beforeCompile) == null ? void 0 : _b.call(_a);
+      if (this.opts.beforeCompile) {
+        return (_b = (_a = this.opts).beforeCompile) == null ? void 0 : _b.call(_a);
+      } else {
+        return Promise.resolve();
+      }
     });
     compiler.hooks.done.tap(PLUGIN_NAME, (stats) => {
       if (!stats.hasErrors()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.15",
+  "version": "4.0.18",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -23,9 +23,9 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.15",
-    "@umijs/bundler-utils": "4.0.15",
-    "@umijs/utils": "4.0.15",
+    "@umijs/bundler-esbuild": "4.0.18",
+    "@umijs/bundler-utils": "4.0.18",
+    "@umijs/utils": "4.0.18",
     "enhanced-resolve": "5.9.3",
     "is-equal": "^1.6.4"
   },