@umijs/mfsu 4.0.31 → 4.0.33

package/dist/dep/dep.d.ts

@@ -7,11 +7,13 @@ export declare class Dep {
     normalizedFile: string;
     filePath: string;
     excludeNodeNatives: boolean;
+    importer: string | undefined;
     constructor(opts: {
         file: string;
         version: string;
         cwd: string;
         excludeNodeNatives: boolean;
+        importer?: string;
     });
     buildExposeContent(): Promise<string>;
     getRealFile(): Promise<string | null>;
@@ -19,6 +21,7 @@ export declare class Dep {
         deps: Record<string, {
             file: string;
             version: string;
+            importer?: string;
         }>;
         cwd: string;
         mfsu: MFSU;

package/dist/dep/dep.js

@@ -37,13 +37,23 @@ var resolver = import_enhanced_resolve.default.create({
   mainFields: ["module", "browser", "main"],
   extensions: [".wasm", ".mjs", ".js", ".jsx", ".ts", ".tsx", ".json"],
   exportsFields: ["exports"],
-  conditionNames: ["import", "module", "require", "node"]
+  conditionNames: ["import", "module", "require", "node"],
+  symlinks: false
 });
 async function resolve(context, path) {
   return new Promise((resolve2, reject) => {
     resolver(context, path, (err, result) => err ? reject(err) : resolve2(result));
   });
 }
+async function resolveFromContexts(contexts, path) {
+  for (const context of contexts) {
+    try {
+      return await resolve(context, path);
+    } catch (e) {
+    }
+  }
+  throw new Error(`Can't resolve ${path} from ${contexts.join(", ")}`);
+}
 var Dep = class {
   constructor(opts) {
     this.file = (0, import_utils.winPath)(opts.file);
@@ -53,6 +63,7 @@ var Dep = class {
     this.normalizedFile = this.shortFile.replace(/\//g, "_").replace(/:/g, "_");
     this.filePath = `${import_constants.MF_VA_PREFIX}${this.normalizedFile}.js`;
     this.excludeNodeNatives = opts.excludeNodeNatives;
+    this.importer = opts.importer;
   }
   async buildExposeContent() {
     const isNodeNatives = !!process.binding("natives")[this.file];
@@ -80,7 +91,11 @@ export * from '${this.file}';
   }
   async getRealFile() {
     try {
-      return await resolve(this.cwd, this.file);
+      const contexts = [this.cwd];
+      if (this.importer) {
+        contexts.push((0, import_path.dirname)(this.importer));
+      }
+      return await resolveFromContexts(contexts, this.file);
     } catch (e) {
       return null;
     }

package/dist/dep/getExposeFromContent.js

@@ -28,13 +28,15 @@ module.exports = __toCommonJS(getExposeFromContent_exports);
 var import_assert = __toESM(require("assert"));
 var import_path = require("path");
 var import_getModuleExports = require("./getModuleExports");
+var import_utils = require("@umijs/utils");
 async function getExposeFromContent(opts) {
+  const importPath = (0, import_utils.winPath)(opts.filePath);
   if (opts.filePath && /\.(css|less|scss|sass|stylus|styl)$/.test(opts.filePath)) {
-    return `import '${opts.dep.file}';`;
+    return `import '${importPath}';`;
   }
   if (opts.filePath && /\.(json|svg|png|jpe?g|avif|gif|webp|ico|eot|woff|woff2|ttf|txt|text|mdx?)$/.test(opts.filePath)) {
     return `
-import _ from '${opts.dep.file}';
+import _ from '${importPath}';
 export default _;`.trim();
   }
   (0, import_assert.default)(/(js|jsx|mjs|ts|tsx)$/.test(opts.filePath), `file type not supported for ${(0, import_path.basename)(opts.filePath)}.`);
@@ -44,29 +46,29 @@ export default _;`.trim();
   });
   if (isCJS) {
     return [
-      `import _ from '${opts.dep.file}';`,
+      `import _ from '${importPath}';`,
       `export default _;`,
-      `export * from '${opts.dep.file}';`
+      `export * from '${importPath}';`
     ].join("\n");
   } else {
     const ret = [];
     let hasExports = false;
     if (exports.includes("default")) {
-      ret.push(`import _ from '${opts.dep.file}';`);
+      ret.push(`import _ from '${importPath}';`);
       ret.push(`export default _;`);
       hasExports = true;
     }
     if (hasNonDefaultExports(exports) || /export\s*\*\s*from/.test(opts.content)) {
-      ret.push(`export * from '${opts.dep.file}';`);
+      ret.push(`export * from '${importPath}';`);
       hasExports = true;
     }
     if (!hasExports) {
       if (exports.includes("__esModule")) {
-        ret.push(`import _ from '${opts.dep.file}';`);
+        ret.push(`import _ from '${importPath}';`);
         ret.push(`export default _;`);
-        ret.push(`export * from '${opts.dep.file}';`);
+        ret.push(`export * from '${importPath}';`);
       } else {
-        ret.push(`import '${opts.dep.file}';`);
+        ret.push(`import '${importPath}';`);
       }
     }
     return ret.join("\n");

package/dist/depInfo.d.ts

@@ -6,6 +6,7 @@ interface IOpts {
 export declare type DepModule = {
     file: string;
     version: string;
+    importer?: string;
 };
 export interface IDepInfo {
     shouldBuild(): string | boolean;

package/dist/mfsu/strategyStaticAnalyze.js

@@ -122,15 +122,16 @@ var StaticAnalyzeStrategy = class {
       },
       onFileChange: async (c) => {
         import_utils.logger.debug("webpack found changes modified:", c.modifiedFiles, "removed:", c.removedFiles);
+        const cwd = this.mfsu.opts.cwd;
         const fileEvents = [
           ...this.staticDepInfo.opts.srcCodeCache.replayChangeEvents(),
-          ...extractJSCodeFiles(c.modifiedFiles).map((f) => {
+          ...extractJSCodeFiles(cwd, c.modifiedFiles).map((f) => {
             return {
               event: "change",
               path: f
             };
           }),
-          ...extractJSCodeFiles(c.removedFiles).map((f) => {
+          ...extractJSCodeFiles(cwd, c.removedFiles).map((f) => {
             return {
               event: "unlink",
               path: f
@@ -161,13 +162,13 @@ var StaticAnalyzeStrategy = class {
   }
 };
 var REG_CODE_EXT = /\.(jsx|js|ts|tsx)$/;
-function extractJSCodeFiles(files) {
+function extractJSCodeFiles(folderBase, files) {
   const jsFiles = [];
   if (!files) {
     return jsFiles;
   }
   for (let file of files.values()) {
-    if (REG_CODE_EXT.test(file)) {
+    if (file.startsWith(folderBase) && REG_CODE_EXT.test(file)) {
       jsFiles.push(file);
     }
   }

package/dist/moduleGraph.d.ts

@@ -44,6 +44,7 @@ export declare class ModuleGraph {
     getDepInfo(mod: ModuleNode): {
         file: string;
         version: string;
+        importer: string;
     };
     hasDepChanged(): boolean;
     onFileChange(opts: {

package/dist/moduleGraph.js

@@ -22,7 +22,6 @@ __export(moduleGraph_exports, {
   ModuleGraph: () => ModuleGraph
 });
 module.exports = __toCommonJS(moduleGraph_exports);
-var import_utils = require("@umijs/utils");
 var ModuleNode = class {
   constructor(file) {
     this.importers = /* @__PURE__ */ new Set();
@@ -124,14 +123,31 @@ var ModuleGraph = class {
     }, {});
   }
   getDepInfo(mod) {
+    const [importer] = mod.importers;
     return {
       file: mod.file,
-      version: mod.version
+      version: mod.version,
+      importer: importer == null ? void 0 : importer.file
     };
   }
   hasDepChanged() {
     const depModulesInfo = this.getDepsInfo(this.depToModules);
-    return !import_utils.lodash.isEqual(depModulesInfo, this.depSnapshotModules);
+    const depKeys = Object.keys(depModulesInfo);
+    const snapshotKeys = Object.keys(this.depSnapshotModules);
+    if (depKeys.length !== snapshotKeys.length) {
+      return true;
+    }
+    for (const k of depKeys) {
+      const dep = depModulesInfo[k];
+      const snapshot = this.depSnapshotModules[k];
+      if (dep.file !== (snapshot == null ? void 0 : snapshot.file)) {
+        return true;
+      }
+      if (dep.version !== (snapshot == null ? void 0 : snapshot.version)) {
+        return true;
+      }
+    }
+    return false;
   }
   onFileChange(opts) {
     if (this.fileToModules.has(opts.file)) {

package/package.json

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