@umijs/mfsu 4.0.24 → 4.0.26

package/dist/babelPlugins/awaitImport/MFImport.js

@@ -48,9 +48,9 @@ function MFImport_default() {
       CallExpression: {
         exit(path, { opts }) {
           const { node } = path;
-          if (t.isImport(node.callee) && node.arguments.length === 1 && node.arguments[0].type === "StringLiteral") {
+          if (t.isImport(node.callee) && node.arguments.length === 1 && t.isStringLiteral(node.arguments[0])) {
             const newValue = opts.resolveImportSource(node.arguments[0].value);
-            node.arguments[0] = t.stringLiteral(newValue);
+            node.arguments[0].value = newValue;
           }
         }
       }

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,7 +8,7 @@ export declare class StaticAnalyzeStrategy implements IMFSUStrategy {
         mfsu: MFSU;
         srcCodeCache: any;
     });
-    init(): void;
+    init(webpackConfig: Configuration): void;
     getDepModules(): Record<string, {
         file: string;
         version: string;

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() {
@@ -122,16 +125,20 @@ var StaticAnalyzeStrategy = class {
         if (!c.modifiedFiles || c.modifiedFiles.size === 0) {
           return;
         }
+        if (!hasJSCodeFiles(c.modifiedFiles) && !hasJSCodeFiles(c.removedFiles)) {
+          return;
+        }
         const start = Date.now();
         let event = this.staticDepInfo.getProducedEvent();
         while (event.length === 0) {
-          await sleep(200);
+          await sleep(100);
           event = this.staticDepInfo.getProducedEvent();
           if (Date.now() - start > 5e3) {
             import_utils.logger.warn("webpack wait mfsu deps too long");
             break;
           }
         }
+        import_utils.logger.debug(`webpack waited ${Date.now() - start} ms`);
       },
       onCompileDone: () => {
       }
@@ -151,6 +158,15 @@ function sleep(ms) {
     }, ms);
   });
 }
+var REG_CODE_EXT = /\.(jsx|js|ts|tsx)$/;
+function hasJSCodeFiles(files) {
+  for (let file of files.values()) {
+    if (REG_CODE_EXT.test(file)) {
+      return true;
+    }
+  }
+  return false;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StaticAnalyzeStrategy

package/dist/staticDepInfo/simulations/babel-plugin-import.js

@@ -46,7 +46,7 @@ function createHandle(importOptions) {
         retMatched.push({
           isMatch: true,
           value: unAliasedModulePath,
-          replaceValue: `${mfName}/${unAliasedModulePath}`,
+          replaceValue: `${mfName}/${(0, import_utils.winPath)(unAliasedModulePath)}`,
           version
         });
         const unAliasedStylePath = (0, import_getAliasedPath.getAliasedPathWithLoopDetect)({
@@ -56,7 +56,7 @@ function createHandle(importOptions) {
         retMatched.push({
           isMatch: true,
           value: unAliasedStylePath,
-          replaceValue: `${mfName}/${unAliasedStylePath}`,
+          replaceValue: `${mfName}/${(0, import_utils.winPath)(unAliasedStylePath)}`,
           version
         });
       };

package/dist/staticDepInfo/staticDepInfo.d.ts

@@ -52,5 +52,6 @@ export declare class StaticDepInfo {
     private simulateRuntimeTransform;
     private appendIncludeList;
     allRuntimeHelpers(): Promise<void>;
+    setBabelPluginImportConfig(config: Map<string, any>): void;
 }
 export {};

package/dist/staticDepInfo/staticDepInfo.js

@@ -46,24 +46,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;
@@ -150,6 +133,9 @@ var StaticDepInfo = class {
     const pkgNames = this.runtimeSimulations.map(({ packageName }) => packageName);
     const groupedMockImports = {};
     for (const imp of imports) {
+      if (!imp.n) {
+        continue;
+      }
       if (pkgNames.indexOf(imp.n) >= 0) {
         const name = imp.n;
         if (groupedMockImports[name]) {
@@ -230,6 +216,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.24",
+  "version": "4.0.26",
   "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.24",
-    "@umijs/bundler-utils": "4.0.24",
-    "@umijs/utils": "4.0.24",
+    "@umijs/bundler-esbuild": "4.0.26",
+    "@umijs/bundler-utils": "4.0.26",
+    "@umijs/utils": "4.0.26",
     "enhanced-resolve": "5.9.3",
     "is-equal": "^1.6.4"
   },