@umijs/mfsu 4.0.29 → 4.0.31

package/dist/depBuilder/depBuilder.js

@@ -30,6 +30,7 @@ var import_constants = require("../constants");
 var import_depChunkIdPrefixPlugin = require("../webpackPlugins/depChunkIdPrefixPlugin");
 var import_stripSourceMapUrlPlugin = require("../webpackPlugins/stripSourceMapUrlPlugin");
 var import_getESBuildEntry = require("./getESBuildEntry");
+var MF_ENTRY = "mf_index.js";
 var DepBuilder = class {
   constructor(opts) {
     this.completeFns = [];
@@ -154,13 +155,13 @@ var DepBuilder = class {
       const content = await dep.buildExposeContent();
       (0, import_fs.writeFileSync)((0, import_path.join)(tmpBase, dep.filePath), content, "utf-8");
     }
-    (0, import_fs.writeFileSync)((0, import_path.join)(tmpBase, "index.js"), '"\u{1F61B}"', "utf-8");
+    (0, import_fs.writeFileSync)((0, import_path.join)(tmpBase, MF_ENTRY), '"\u{1F61B}"', "utf-8");
   }
   getWebpackConfig(opts) {
     var _a, _b;
     const mfName = this.opts.mfsu.opts.mfName;
     const depConfig = import_utils.lodash.cloneDeep(this.opts.mfsu.depConfig);
-    depConfig.entry = (0, import_path.join)(this.opts.mfsu.opts.tmpBase, "index.js");
+    depConfig.entry = (0, import_path.join)(this.opts.mfsu.opts.tmpBase, MF_ENTRY);
     depConfig.output.path = this.opts.mfsu.opts.tmpBase;
     depConfig.output.publicPath = "auto";
     depConfig.devtool = false;

package/dist/mfsu/mfsu.d.ts

@@ -47,11 +47,12 @@ export declare class MFSU {
         depConfig: Configuration;
     }): Promise<void>;
     buildDeps(): Promise<void>;
-    getMiddlewares(): ((req: Request, res: Response, next: NextFunction) => void)[];
+    getMiddlewares(): (((req: Request, res: Response, next: NextFunction) => void) | import("@umijs/bundler-utils/compiled/express/serve-static").RequestHandler<Response<any, Record<string, any>>>)[];
     getBabelPlugins(): any[][];
     getEsbuildLoaderHandler(): any[];
     getCacheFilePath(): string;
 }
+export declare function resolvePublicPath(config: Configuration): string;
 export interface IMFSUStrategy {
     init(webpackConfig: Configuration): void;
     shouldBuild(): string | boolean;

package/dist/mfsu/mfsu.js

@@ -22,10 +22,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/mfsu/mfsu.ts
 var mfsu_exports = {};
 __export(mfsu_exports, {
-  MFSU: () => MFSU
+  MFSU: () => MFSU,
+  resolvePublicPath: () => resolvePublicPath
 });
 module.exports = __toCommonJS(mfsu_exports);
 var import_bundler_utils = require("@umijs/bundler-utils");
+var import_express = __toESM(require("@umijs/bundler-utils/compiled/express"));
 var import_utils = require("@umijs/utils");
 var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
@@ -140,10 +142,7 @@ var MFSU = class {
     }
     opts.config.entry = entry;
     opts.config.plugins = opts.config.plugins || [];
-    let publicPath = opts.config.output.publicPath;
-    if (publicPath === "auto") {
-      publicPath = "/";
-    }
+    let publicPath = resolvePublicPath(opts.config);
     this.publicPath = publicPath;
     opts.config.plugins.push(...[
       new import_webpack_virtual_modules.default(virtualModules),
@@ -244,7 +243,8 @@ promise new Promise(resolve => {
         } else {
           next();
         }
-      }
+      },
+      import_express.default.static(this.opts.tmpBase)
     ];
   }
   getBabelPlugins() {
@@ -268,7 +268,17 @@ promise new Promise(resolve => {
     return this.strategy.getCacheFilePath();
   }
 };
+function resolvePublicPath(config) {
+  var _a;
+  let publicPath = ((_a = config.output) == null ? void 0 : _a.publicPath) ?? "auto";
+  if (publicPath === "auto") {
+    publicPath = "/";
+  }
+  (0, import_assert.default)(typeof publicPath === "string", "Not support function publicPath now");
+  return publicPath;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  MFSU
+  MFSU,
+  resolvePublicPath
 });

package/dist/mfsu/strategyStaticAnalyze.d.ts

@@ -14,7 +14,7 @@ export declare class StaticAnalyzeStrategy implements IMFSUStrategy {
         version: string;
     }>;
     getCacheFilePath(): string;
-    shouldBuild(): false | "dependencies changed";
+    shouldBuild(): false | "cacheDependency has changed" | "dependencies changed";
     writeCache(): void;
     getBabelPlugin(): any[];
     private getMfImportOpts;

package/dist/mfsu/strategyStaticAnalyze.js

@@ -122,21 +122,30 @@ var StaticAnalyzeStrategy = class {
       },
       onFileChange: async (c) => {
         import_utils.logger.debug("webpack found changes modified:", c.modifiedFiles, "removed:", c.removedFiles);
-        if (!c.modifiedFiles || c.modifiedFiles.size === 0) {
-          return;
-        }
-        if (!hasJSCodeFiles(c.modifiedFiles) && !hasJSCodeFiles(c.removedFiles)) {
+        const fileEvents = [
+          ...this.staticDepInfo.opts.srcCodeCache.replayChangeEvents(),
+          ...extractJSCodeFiles(c.modifiedFiles).map((f) => {
+            return {
+              event: "change",
+              path: f
+            };
+          }),
+          ...extractJSCodeFiles(c.removedFiles).map((f) => {
+            return {
+              event: "unlink",
+              path: f
+            };
+          })
+        ];
+        import_utils.logger.debug("all file events", fileEvents);
+        if (fileEvents.length === 0) {
           return;
         }
         const start = Date.now();
-        let event = this.staticDepInfo.getProducedEvent();
-        while (event.length === 0) {
-          await sleep(100);
-          event = this.staticDepInfo.getProducedEvent();
-          if (Date.now() - start > 5e3) {
-            import_utils.logger.warn("webpack wait mfsu deps too long");
-            break;
-          }
+        try {
+          await this.staticDepInfo.opts.srcCodeCache.handleFileChangeEvents(fileEvents);
+        } catch (e) {
+          import_utils.logger.error("MFSU[eager] analyze dependencies failed with error", e);
         }
         import_utils.logger.debug(`webpack waited ${Date.now() - start} ms`);
       },
@@ -151,21 +160,18 @@ var StaticAnalyzeStrategy = class {
     this.staticDepInfo.snapshot();
   }
 };
-function sleep(ms) {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve();
-    }, ms);
-  });
-}
 var REG_CODE_EXT = /\.(jsx|js|ts|tsx)$/;
-function hasJSCodeFiles(files) {
+function extractJSCodeFiles(files) {
+  const jsFiles = [];
+  if (!files) {
+    return jsFiles;
+  }
   for (let file of files.values()) {
     if (REG_CODE_EXT.test(file)) {
-      return true;
+      jsFiles.push(file);
     }
   }
-  return false;
+  return jsFiles;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/staticDepInfo/staticDepInfo.d.ts

@@ -13,6 +13,8 @@ declare type MergedCodeInfo = {
 declare type AutoUpdateSrcCodeCache = {
     register(listener: (info: MergedCodeInfo) => void): void;
     getMergedCode(): MergedCodeInfo;
+    handleFileChangeEvents(events: FileChangeEvent[]): void;
+    replayChangeEvents(): FileChangeEvent[];
 };
 interface IOpts {
     mfsu: MFSU;
@@ -23,7 +25,7 @@ export declare type Match = ReturnType<typeof checkMatch> & {
     version: string;
 };
 export declare class StaticDepInfo {
-    private opts;
+    opts: IOpts;
     private readonly cacheFilePath;
     private mfsu;
     private readonly include;

package/dist/staticDepInfo/staticDepInfo.js

@@ -44,7 +44,6 @@ var StaticDepInfo = class {
     this.cacheFilePath = (0, import_path.join)(this.opts.mfsu.opts.tmpBase, "MFSU_CACHE_v4.json");
     this.cwd = this.mfsu.opts.cwd;
     opts.srcCodeCache.register((info) => {
-      this.produced.push({ changes: info.events });
       this.currentDep = this._getDependencies(info.code, info.imports);
     });
     this.runtimeSimulations = [];

package/dist/webpackPlugins/buildDepPlugin.js

@@ -22,6 +22,7 @@ __export(buildDepPlugin_exports, {
   BuildDepPlugin: () => BuildDepPlugin
 });
 module.exports = __toCommonJS(buildDepPlugin_exports);
+var import_utils = require("@umijs/utils");
 var PLUGIN_NAME = "MFSUBuildDeps";
 var BuildDepPlugin = class {
   constructor(opts) {
@@ -30,6 +31,7 @@ var BuildDepPlugin = class {
   apply(compiler) {
     compiler.hooks.watchRun.tapPromise(PLUGIN_NAME, (c) => {
       var _a, _b;
+      import_utils.logger.debug("webpack watched change", "modified: ", c.modifiedFiles, "removed: ", c.removedFiles);
       return ((_b = (_a = this.opts).onFileChange) == null ? void 0 : _b.call(_a, c)) || Promise.resolve();
     });
     compiler.hooks.beforeCompile.tap(PLUGIN_NAME, () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.29",
+  "version": "4.0.31",
   "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.29",
-    "@umijs/bundler-utils": "4.0.29",
-    "@umijs/utils": "4.0.29",
+    "@umijs/bundler-esbuild": "4.0.31",
+    "@umijs/bundler-utils": "4.0.31",
+    "@umijs/utils": "4.0.31",
     "enhanced-resolve": "5.9.3",
     "is-equal": "^1.6.4"
   },