@umijs/mfsu 4.0.0-canary.20221121.1 → 4.0.0-canary.20221208.1

package/dist/babelPlugins/awaitImport/checkMatch.js

@@ -67,8 +67,11 @@ function checkMatch({
   const remoteName = opts.remoteName || "mf";
   value = value.replace(/^@fs\//, "/");
   const unMatchLibsRegex = genUnMatchLibsRegex(opts.unMatchLibs);
-  if ((unMatchLibsRegex == null ? void 0 : unMatchLibsRegex.test(value)) || value.includes("client/client/client.js") || value.startsWith(`${remoteName}/`) || (0, import_utils.winPath)(value).includes("babel/svgr-webpack") || value.startsWith("!!") || (0, import_isExternals.isExternals)({ value, externals: opts.externals }) || value.startsWith(".")) {
+  const mfPathInitial = `${remoteName}/`;
+  if ((unMatchLibsRegex == null ? void 0 : unMatchLibsRegex.test(value)) || value.includes("client/client/client.js") || (0, import_utils.winPath)(value).includes("babel/svgr-webpack") || value.startsWith("!!") || (0, import_isExternals.isExternals)({ value, externals: opts.externals }) || value.startsWith(".")) {
     isMatch = false;
+  } else if (value.startsWith(mfPathInitial)) {
+    isMatch = true;
   } else if ((0, import_path.isAbsolute)(value)) {
     isMatch = RE_NODE_MODULES.test(value) || isUmiLocalDev(value);
   } else {
@@ -94,7 +97,12 @@ function checkMatch({
     isMatch = !!(opts.exportAllMembers && value in opts.exportAllMembers);
   }
   if (isMatch) {
-    replaceValue = `${remoteName}/${(0, import_utils.winPath)(value)}`;
+    if (value.startsWith(mfPathInitial)) {
+      replaceValue = value;
+      value = value.replace(mfPathInitial, "");
+    } else {
+      replaceValue = `${remoteName}/${(0, import_utils.winPath)(value)}`;
+    }
   }
   const file = (path == null ? void 0 : path.hub.file.opts.filename) || filename;
   (_a = opts.onTransformDeps) == null ? void 0 : _a.call(opts, {

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

@@ -27,23 +27,12 @@ __export(dep_exports, {
 module.exports = __toCommonJS(dep_exports);
 var import_utils = require("@umijs/utils");
 var import_assert = __toESM(require("assert"));
-var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
 var import_fs = require("fs");
 var import_path = require("path");
 var import_constants = require("../constants");
 var import_trimFileContent = require("../utils/trimFileContent");
 var import_getExposeFromContent = require("./getExposeFromContent");
-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"]
-});
-async function resolve(context, path) {
-  return new Promise((resolve2, reject) => {
-    resolver(context, path, (err, result) => err ? reject(err) : resolve2(result));
-  });
-}
+var import_resolveUtils = require("../utils/resolveUtils");
 var Dep = class {
   constructor(opts) {
     this.file = (0, import_utils.winPath)(opts.file);
@@ -53,6 +42,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 +70,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 (0, import_resolveUtils.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/depBuilder/depBuilder.js

@@ -60,7 +60,10 @@ var DepBuilder = class {
     });
   }
   async buildWithESBuild(opts) {
-    const entryContent = (0, import_getESBuildEntry.getESBuildEntry)({ deps: opts.deps });
+    const entryContent = (0, import_getESBuildEntry.getESBuildEntry)({
+      mfName: this.opts.mfsu.opts.mfName,
+      deps: opts.deps
+    });
     const ENTRY_FILE = "esbuild-entry.js";
     const tmpDir = this.opts.mfsu.opts.tmpBase;
     const entryPath = (0, import_path.join)(tmpDir, ENTRY_FILE);

package/dist/depBuilder/getESBuildEntry.d.ts

@@ -1,4 +1,5 @@
 import { Dep } from '../dep/dep';
 export declare function getESBuildEntry(opts: {
+    mfName: string;
     deps: Dep[];
 }): string;

package/dist/depBuilder/getESBuildEntry.js

@@ -328,7 +328,7 @@ ${opts.deps.map(getDepModuleStr).join(",\n")}
     get: function() { return get; },
     init: function() { return init; }
   });
-  self.mf = __webpack_exports__;
+  self.${opts.mfName} = __webpack_exports__;
 })();
 })();
   `;

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/mfsu.js

@@ -41,6 +41,7 @@ var import_depBuilder = require("../depBuilder/depBuilder");
 var import_awaitImport = __toESM(require("../esbuildHandlers/awaitImport"));
 var import_types = require("../types");
 var import_makeArray = require("../utils/makeArray");
+var import_webpackUtils = require("../utils/webpackUtils");
 var import_buildDepPlugin = require("../webpackPlugins/buildDepPlugin");
 var import_strategyCompileTime = require("./strategyCompileTime");
 var import_strategyStaticAnalyze = require("./strategyStaticAnalyze");
@@ -106,17 +107,11 @@ var MFSU = class {
       let index = 1;
       let hasDefaultExport = false;
       const entryFiles = import_utils.lodash.isArray(entryObject[key]) ? entryObject[key] : [entryObject[key]];
+      const resolver = (0, import_webpackUtils.getResolver)(opts.config);
       for (let entry2 of entryFiles) {
-        if ((0, import_fs.statSync)(entry2).isDirectory()) {
-          const realEntry = (0, import_utils.tryPaths)([
-            (0, import_path.join)(entry2, "index.tsx"),
-            (0, import_path.join)(entry2, "index.ts"),
-            (0, import_path.join)(entry2, "index.jsx"),
-            (0, import_path.join)(entry2, "index.js")
-          ]);
-          (0, import_assert.default)(realEntry, `entry file not found, please configure the specific entry path. (e.g. 'src/index.tsx')`);
-          entry2 = realEntry;
-        }
+        const realEntry = resolver(entry2);
+        (0, import_assert.default)(realEntry, `entry file not found (${entry2}), please configure the specific entry path. (e.g. 'src/index.tsx')`);
+        entry2 = realEntry;
         const content = (0, import_fs.readFileSync)(entry2, "utf-8");
         const [_imports, exports] = await (0, import_bundler_utils.parseModule)({ content, path: entry2 });
         if (exports.length) {

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/dist/utils/resolveUtils.d.ts

@@ -0,0 +1 @@
+export declare function resolveFromContexts(contexts: string[], path: string): Promise<string>;

package/dist/utils/resolveUtils.js

@@ -0,0 +1,89 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/resolveUtils.ts
+var resolveUtils_exports = {};
+__export(resolveUtils_exports, {
+  resolveFromContexts: () => resolveFromContexts
+});
+module.exports = __toCommonJS(resolveUtils_exports);
+var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
+var ORDERED_MAIN_FIELDS = ["browser", "module", "main"];
+var SUPPORTED_EXTS = [".wasm", ".mjs", ".js", ".jsx", ".ts", ".tsx", ".json"];
+var EXPORTS_FIELDS = ["exports"];
+var browserResolver = import_enhanced_resolve.default.create({
+  mainFields: ORDERED_MAIN_FIELDS,
+  extensions: SUPPORTED_EXTS,
+  exportsFields: EXPORTS_FIELDS,
+  conditionNames: ["browser", "import"],
+  symlinks: false
+});
+var esmResolver = import_enhanced_resolve.default.create({
+  mainFields: ORDERED_MAIN_FIELDS,
+  extensions: SUPPORTED_EXTS,
+  exportsFields: EXPORTS_FIELDS,
+  conditionNames: ["module"],
+  symlinks: false
+});
+var cjsResolver = import_enhanced_resolve.default.create({
+  mainFields: ORDERED_MAIN_FIELDS,
+  extensions: SUPPORTED_EXTS,
+  exportsFields: EXPORTS_FIELDS,
+  conditionNames: ["require", "node"],
+  symlinks: false
+});
+async function resolveWith(resolver, context, path) {
+  return new Promise((resolve2, reject) => {
+    resolver(context, path, (err, result) => err ? reject(err) : resolve2(result));
+  });
+}
+async function tryResolvers(rs, context, path) {
+  let result = "";
+  let lastError = null;
+  for (const r of rs) {
+    try {
+      result = await resolveWith(r, context, path);
+      return result;
+    } catch (e) {
+      lastError = e;
+    }
+  }
+  if (!result) {
+    throw lastError || Error(`can't resolve ${path} from ${context}`);
+  }
+  return result;
+}
+async function resolve(context, path) {
+  return await tryResolvers([browserResolver, esmResolver, cjsResolver], context, path);
+}
+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(", ")}`);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolveFromContexts
+});

package/dist/utils/webpackUtils.d.ts

@@ -1,2 +1,3 @@
-import type { Configuration } from 'webpack';
+import { Configuration } from 'webpack';
 export declare function extractBabelPluginImportOptions(webpackConfig: Configuration): Map<string, any>;
+export declare function getResolver(opts: Configuration): (path: string) => string | false;

package/dist/utils/webpackUtils.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,15 +16,19 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/utils/webpackUtils.ts
 var webpackUtils_exports = {};
 __export(webpackUtils_exports, {
-  extractBabelPluginImportOptions: () => extractBabelPluginImportOptions
+  extractBabelPluginImportOptions: () => extractBabelPluginImportOptions,
+  getResolver: () => getResolver
 });
 module.exports = __toCommonJS(webpackUtils_exports);
+var import_webpack = require("webpack");
 var import_utils = require("@umijs/utils");
+var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
 var { property, compact, flatMap } = import_utils.lodash;
 function extractBabelPluginImportOptions(webpackConfig) {
   var _a;
@@ -41,7 +47,20 @@ function extractBabelPluginImportOptions(webpackConfig) {
   }
   return configs;
 }
+function getResolver(opts) {
+  const context = opts.context ?? process.cwd();
+  const resolveDefaults = {
+    extensions: [".tsx", ".ts", ".jsx", ".js"],
+    roots: [context]
+  };
+  const mergedResolve = import_webpack.util.cleverMerge(resolveDefaults, opts.resolve);
+  const resolver = import_enhanced_resolve.default.create.sync(mergedResolve);
+  return (path) => {
+    return resolver(context, path);
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  extractBabelPluginImportOptions
+  extractBabelPluginImportOptions,
+  getResolver
 });

package/package.json

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