@umijs/mfsu 4.0.25 → 4.0.27

package/dist/mfsu/mfsu.d.ts

@@ -53,7 +53,7 @@ export declare class MFSU {
     getCacheFilePath(): string;
 }
 export interface IMFSUStrategy {
-    init(): void;
+    init(webpackConfig: Configuration): void;
     shouldBuild(): string | boolean;
     getBabelPlugin(): any[];
     getBuildDepPlugConfig(): IBuildDepPluginOpts;

package/dist/mfsu/mfsu.js

@@ -181,7 +181,7 @@ promise new Promise(resolve => {
     ]);
     import_utils.lodash.set(opts.config, "experiments.topLevelAwait", true);
     this.depConfig = opts.depConfig;
-    this.strategy.init();
+    this.strategy.init(opts.config);
   }
   async buildDeps() {
     try {

package/dist/mfsu/strategyStaticAnalyze.d.ts

@@ -1,5 +1,6 @@
 import { IBuildDepPluginOpts } from '../webpackPlugins/buildDepPlugin';
 import type { IMFSUStrategy, MFSU } from './mfsu';
+import type { Configuration } from 'webpack';
 export declare class StaticAnalyzeStrategy implements IMFSUStrategy {
     private readonly mfsu;
     private staticDepInfo;
@@ -7,13 +8,13 @@ export declare class StaticAnalyzeStrategy implements IMFSUStrategy {
         mfsu: MFSU;
         srcCodeCache: any;
     });
-    init(): void;
+    init(webpackConfig: Configuration): void;
     getDepModules(): Record<string, {
         file: string;
         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

@@ -29,6 +29,7 @@ var import_utils = require("@umijs/utils");
 var import_checkMatch = require("../babelPlugins/awaitImport/checkMatch");
 var import_MFImport = __toESM(require("../babelPlugins/awaitImport/MFImport"));
 var import_staticDepInfo = require("../staticDepInfo/staticDepInfo");
+var import_webpackUtils = require("../utils/webpackUtils");
 var StaticAnalyzeStrategy = class {
   constructor({ mfsu, srcCodeCache }) {
     this.mfsu = mfsu;
@@ -37,7 +38,9 @@ var StaticAnalyzeStrategy = class {
       srcCodeCache
     });
   }
-  init() {
+  init(webpackConfig) {
+    const config = (0, import_webpackUtils.extractBabelPluginImportOptions)(webpackConfig);
+    this.staticDepInfo.setBabelPluginImportConfig(config);
     this.staticDepInfo.init();
   }
   getDepModules() {

package/dist/staticDepInfo/staticDepInfo.d.ts

@@ -29,6 +29,7 @@ export declare class StaticDepInfo {
     private readonly include;
     private currentDep;
     private builtWithDep;
+    private cacheDependency;
     private produced;
     private readonly cwd;
     private readonly runtimeSimulations;
@@ -37,7 +38,7 @@ export declare class StaticDepInfo {
         changes: unknown[];
     }[];
     consumeAllProducedEvents(): void;
-    shouldBuild(): false | "dependencies changed";
+    shouldBuild(): false | "cacheDependency has changed" | "dependencies changed";
     getDepModules(): Record<string, {
         file: string;
         version: string;
@@ -52,5 +53,6 @@ export declare class StaticDepInfo {
     private simulateRuntimeTransform;
     private appendIncludeList;
     allRuntimeHelpers(): Promise<void>;
+    setBabelPluginImportConfig(config: Map<string, any>): void;
 }
 export {};

package/dist/staticDepInfo/staticDepInfo.js

@@ -36,6 +36,7 @@ var StaticDepInfo = class {
   constructor(opts) {
     this.currentDep = {};
     this.builtWithDep = {};
+    this.cacheDependency = {};
     this.produced = [];
     this.mfsu = opts.mfsu;
     this.include = this.mfsu.opts.include || [];
@@ -46,24 +47,7 @@ var StaticDepInfo = class {
       this.produced.push({ changes: info.events });
       this.currentDep = this._getDependencies(info.code, info.imports);
     });
-    this.runtimeSimulations = [
-      {
-        packageName: "antd",
-        handleImports: (0, import_babel_plugin_import.default)({
-          libraryName: "antd",
-          style: true,
-          libraryDirectory: "es"
-        })
-      },
-      {
-        packageName: "@alipay/bigfish/antd",
-        handleImports: (0, import_babel_plugin_import.default)({
-          libraryName: "@alipay/bigfish/antd",
-          style: true,
-          libraryDirectory: "es"
-        })
-      }
-    ];
+    this.runtimeSimulations = [];
   }
   getProducedEvent() {
     return this.produced;
@@ -72,6 +56,14 @@ var StaticDepInfo = class {
     this.produced = [];
   }
   shouldBuild() {
+    const currentCacheDep = this.opts.mfsu.opts.getCacheDependency();
+    if (!import_utils.lodash.isEqual(this.cacheDependency, currentCacheDep)) {
+      if (process.env.DEBUG_UMI) {
+        const reason = (0, import_why.default)(this.cacheDependency, currentCacheDep);
+        import_utils.logger.info("[MFSU][eager]: isEqual(cacheDependency,currentCacheDep) === false, because ", reason);
+      }
+      return "cacheDependency has changed";
+    }
     if (import_utils.lodash.isEqual(this.builtWithDep, this.currentDep)) {
       return false;
     } else {
@@ -96,11 +88,14 @@ var StaticDepInfo = class {
   }
   snapshot() {
     this.builtWithDep = this.currentDep;
+    this.cacheDependency = this.mfsu.opts.getCacheDependency();
   }
   loadCache() {
     if ((0, import_fs.existsSync)(this.cacheFilePath)) {
       try {
-        this.builtWithDep = JSON.parse((0, import_fs.readFileSync)(this.cacheFilePath, "utf-8"));
+        const { dep = {}, cacheDependency = {} } = JSON.parse((0, import_fs.readFileSync)(this.cacheFilePath, "utf-8"));
+        this.builtWithDep = dep;
+        this.cacheDependency = cacheDependency;
         import_utils.logger.info("[MFSU][eager] restored cache");
       } catch (e) {
         import_utils.logger.warn("[MFSU][eager] restore cache failed, fallback to Empty dependency", e);
@@ -109,7 +104,10 @@ var StaticDepInfo = class {
   }
   writeCache() {
     import_utils.fsExtra.mkdirpSync((0, import_path.dirname)(this.cacheFilePath));
-    const newContent = JSON.stringify(this.builtWithDep, null, 2);
+    const newContent = JSON.stringify({
+      dep: this.builtWithDep,
+      cacheDependency: this.cacheDependency
+    }, null, 2);
     if ((0, import_fs.existsSync)(this.cacheFilePath) && (0, import_fs.readFileSync)(this.cacheFilePath, "utf-8") === newContent) {
       return;
     }
@@ -233,6 +231,14 @@ var StaticDepInfo = class {
   }
   async allRuntimeHelpers() {
   }
+  setBabelPluginImportConfig(config) {
+    for (const [key, c] of config.entries()) {
+      this.runtimeSimulations.push({
+        packageName: key,
+        handleImports: (0, import_babel_plugin_import.default)(c)
+      });
+    }
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/utils/webpackUtils.d.ts

@@ -0,0 +1,2 @@
+import type { Configuration } from 'webpack';
+export declare function extractBabelPluginImportOptions(webpackConfig: Configuration): Map<string, any>;

package/dist/utils/webpackUtils.js

@@ -0,0 +1,47 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/webpackUtils.ts
+var webpackUtils_exports = {};
+__export(webpackUtils_exports, {
+  extractBabelPluginImportOptions: () => extractBabelPluginImportOptions
+});
+module.exports = __toCommonJS(webpackUtils_exports);
+var import_utils = require("@umijs/utils");
+var { property, compact, flatMap } = import_utils.lodash;
+function extractBabelPluginImportOptions(webpackConfig) {
+  var _a;
+  const rules = ((_a = webpackConfig.module) == null ? void 0 : _a.rules) || [];
+  const uses = compact(flatMap(rules, property(["use"]))).filter((u) => {
+    var _a2;
+    return ((_a2 = u == null ? void 0 : u.loader) == null ? void 0 : _a2.indexOf("babel-loader")) >= 0;
+  });
+  const pluginConfigs = compact(flatMap(uses, property(["options", "plugins"]))).filter((p) => {
+    var _a2, _b;
+    return Array.isArray(p) && ((_b = (_a2 = p[0]) == null ? void 0 : _a2.indexOf) == null ? void 0 : _b.call(_a2, "babel-plugin-import")) >= 0;
+  });
+  const configs = /* @__PURE__ */ new Map();
+  for (const c of pluginConfigs) {
+    !configs.has(c[1].libraryName) && configs.set(c[1].libraryName, c[1]);
+  }
+  return configs;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  extractBabelPluginImportOptions
+});

package/package.json

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