@umijs/mfsu 4.0.51 → 4.0.52

package/dist/babelPlugins/awaitImport/MFImport.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/babelPlugins/awaitImport/awaitImport.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -53,6 +57,7 @@ function awaitImport_default() {
             const node = path.node.body[index];
             if (t.isImportDeclaration(node)) {
               const { isMatch, replaceValue } = (0, import_checkMatch.checkMatch)({
+                // @ts-ignore
                 cache: this.cache,
                 value: node.source.value,
                 opts,
@@ -63,6 +68,7 @@ function awaitImport_default() {
               }
             } else if (t.isExportAllDeclaration(node)) {
               const { isMatch, replaceValue } = (0, import_checkMatch.checkMatch)({
+                // @ts-ignore
                 cache: this.cache,
                 value: node.source.value,
                 opts,
@@ -73,6 +79,7 @@ function awaitImport_default() {
               }
             } else if (t.isExportNamedDeclaration(node) && node.source) {
               const { isMatch, replaceValue } = (0, import_checkMatch.checkMatch)({
+                // @ts-ignore
                 cache: this.cache,
                 value: node.source.value,
                 opts,
@@ -91,6 +98,7 @@ function awaitImport_default() {
           const { node } = path;
           if (t.isImport(node.callee) && node.arguments.length === 1 && node.arguments[0].type === "StringLiteral") {
             const { isMatch, replaceValue } = (0, import_checkMatch.checkMatch)({
+              // @ts-ignore
               cache: this.cache,
               value: node.arguments[0].value,
               opts,

package/dist/babelPlugins/awaitImport/checkMatch.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -73,7 +77,17 @@ function checkMatch({
   value = value.replace(/^@fs\//, "/");
   const unMatchLibsRegex = genUnMatchLibsRegex(opts.unMatchLibs);
   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(".")) {
+  if (
+    // unMatch specified libs
+    (unMatchLibsRegex == null ? void 0 : unMatchLibsRegex.test(value)) || // do not match bundler-webpack/client/client/client.js
+    value.includes("client/client/client.js") || // don't match dynamic path
+    // e.g. @umijs/deps/compiled/babel/svgr-webpack.js?-svgo,+titleProp,+ref!./umi.svg
+    (0, import_utils.winPath)(value).includes("babel/svgr-webpack") || // don't match webpack loader
+    // e.g. !!dumi-raw-code-loader!/path/to/VerticalProgress/index.module.less?dumi-raw-code
+    value.startsWith("!!") || // don't match externals
+    (0, import_isExternals.isExternals)({ value, externals: opts.externals }) || // relative import
+    value.startsWith(".")
+  ) {
     isMatch = false;
   } else if (value.startsWith(mfPathInitial)) {
     isMatch = true;

package/dist/babelPlugins/awaitImport/parseSpecifiers.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/dep/dep.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/dep/getCJSExports.js

@@ -27,13 +27,19 @@ function getCJSExports({ content }) {
     /Object\.defineProperty\(\s*exports\s*\,\s*[\"|\'](\w+)[\"|\']/g,
     content
   ).concat(
+    // Support export['default']
+    // ref: https://unpkg.alibaba-inc.com/browse/echarts-for-react@2.0.16/lib/core.js
     matchAll(
       /exports(?:\.|\[(?:\'|\"))(\w+)(?:\s*|(?:\'|\")\])\s*\=/g,
       content
     )
   ).concat(
+    // Support __webpack_exports__["default"]
+    // ref: https://github.com/margox/braft-editor/blob/master/dist/index.js#L8429
     matchAll(/__webpack_exports__\[(?:\"|\')(\w+)(?:\"|\')\]\s*\=/g, content)
   ).concat(
+    // Support __webpack_require__.d(__webpack_exports, "EditorState")
+    // ref: https://github.com/margox/braft-editor/blob/master/dist/index.js#L8347
     matchAll(
       /__webpack_require__\.d\(\s*__webpack_exports__\s*,\s*(?:\"|\')(\w+)(?:\"|\')\s*,/g,
       content

package/dist/dep/getExposeFromContent.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -66,7 +70,10 @@ export default _;`.trim();
       ret.push(`export default _;`);
       hasExports = true;
     }
-    if (hasNonDefaultExports(exports) || /export\s*\*\s*from/.test(opts.content)) {
+    if (hasNonDefaultExports(exports) || // export * from 不会有 exports，只会有 imports
+    // case: export*from'.'
+    //       export * from '.'
+    /export\s*\*\s*from/.test(opts.content)) {
       ret.push(`export * from '${importPath}';`);
       hasExports = true;
     }

package/dist/depBuilder/depBuilder.d.ts

@@ -22,6 +22,7 @@ export declare class DepBuilder {
     }): Promise<void>;
     build(opts: {
         deps: Dep[];
+        useWorker: boolean;
     }): Promise<void>;
     onBuildComplete(fn: Function): void;
     writeMFFiles(opts: {

package/dist/depBuilder/depBuilder.js

@@ -59,6 +59,7 @@ var DepBuilder = class {
       });
     });
   }
+  // TODO: support watch and rebuild
   async buildWithESBuild(opts) {
     const entryContent = (0, import_getESBuildEntry.getESBuildEntry)({
       mfName: this.opts.mfsu.opts.mfName,
@@ -129,7 +130,7 @@ var DepBuilder = class {
         ...opts,
         onBuildComplete
       };
-      if (this.opts.mfsu.opts.strategy === "eager") {
+      if (this.opts.mfsu.opts.strategy === "eager" && opts.useWorker) {
         await this.buildWithWorker(buildOpts);
         return;
       }

package/dist/mfsu/mfsu.d.ts

@@ -46,7 +46,9 @@ export declare class MFSU {
         config: Configuration;
         depConfig: Configuration;
     }): Promise<void>;
-    buildDeps(): Promise<void>;
+    buildDeps(opts?: {
+        useWorker: boolean;
+    }): Promise<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[];

package/dist/mfsu/mfsu.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -90,6 +94,8 @@ var MFSU = class {
     this.strategy.loadCache();
     this.depBuilder = new import_depBuilder.DepBuilder({ mfsu: this });
   }
+  // swc don't support top-level await
+  // ref: https://github.com/vercel/next.js/issues/31054
   asyncImport(content) {
     return `await import('${(0, import_utils.winPath)(content)}');`;
   }
@@ -159,7 +165,10 @@ var MFSU = class {
           name: "__",
           shared: this.opts.shared || {},
           remotes: {
-            [mfName]: this.opts.runtimePublicPath ? `
+            [mfName]: this.opts.runtimePublicPath ? (
+              // ref:
+              // https://webpack.js.org/concepts/module-federation/#promise-based-dynamic-remotes
+              `
 promise new Promise(resolve => {
   const remoteUrlWithVersion = (window.publicPath || '/') + '${import_constants.REMOTE_FILE_FULL}';
   const script = document.createElement('script');
@@ -182,17 +191,24 @@ promise new Promise(resolve => {
   // inject this script with the src set to the versioned remoteEntry.js
   document.head.appendChild(script);
 })
-                `.trimLeft() : `${mfName}@${publicPath}${import_constants.REMOTE_FILE_FULL}`
+                `.trimStart()
+            ) : `${mfName}@${publicPath}${import_constants.REMOTE_FILE_FULL}`
+            // mfsu 的入口文件如果需要在其他的站点上被引用,需要显示的指定publicPath,以保证入口文件的正确访问
           }
         }),
         new import_buildDepPlugin.BuildDepPlugin(this.strategy.getBuildDepPlugConfig())
+        // new WriteCachePlugin({
+        //   onWriteCache: lodash.debounce(() => {
+        //     this.depInfo.writeCache();
+        //   }, 300),
+        // }),
       ]
     );
     import_utils.lodash.set(opts.config, "experiments.topLevelAwait", true);
     this.depConfig = opts.depConfig;
     this.strategy.init(opts.config);
   }
-  async buildDeps() {
+  async buildDeps(opts = { useWorker: true }) {
     try {
       const shouldBuild = this.strategy.shouldBuild();
       if (!shouldBuild) {
@@ -209,7 +225,8 @@ promise new Promise(resolve => {
       import_utils.logger.info(`[MFSU] buildDeps since ${shouldBuild}`);
       import_utils.logger.debug(deps.map((dep) => dep.file).join(", "));
       await this.depBuilder.build({
-        deps
+        deps,
+        useWorker: opts.useWorker
       });
       this.lastBuildError = null;
       this.strategy.writeCache();
@@ -260,6 +277,8 @@ promise new Promise(resolve => {
           next();
         }
       },
+      // 兜底依赖构建时, 代码中有指定 chunk 名的情况
+      // TODO: should respect to publicPath
       import_express.default.static(this.opts.tmpBase)
     ];
   }

package/dist/mfsu/strategyCompileTime.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -104,6 +108,7 @@ var StrategyCompileTime = class {
       }) => {
         this.depInfo.moduleGraph.onFileChange({
           file,
+          // @ts-ignore
           deps: [
             ...Array.from(data.matched).map((item) => ({
               file: item.sourceValue,

package/dist/mfsu/strategyStaticAnalyze.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/staticDepInfo/staticDepInfo.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/utils/resolveUtils.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/utils/webpackUtils.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -60,6 +64,7 @@ function getResolver(opts) {
   const context = opts.context ?? process.cwd();
   const resolveDefaults = {
     extensions: [".tsx", ".ts", ".jsx", ".js"],
+    // keep same with previous mfsu version
     roots: [context]
   };
   const mergedResolve = import_webpack.util.cleverMerge(resolveDefaults, opts.resolve);

package/dist/webpackPlugins/writeCachePlugin.js

@@ -29,7 +29,10 @@ var WriteCachePlugin = class {
   }
   apply(compiler) {
     compiler.cache.hooks.store.tap(
-      { name: PLUGIN_NAME, stage: 10 },
+      { name: PLUGIN_NAME, stage: (
+        /*Cache.STAGE_DISK*/
+        10
+      ) },
       () => {
         this.opts.onWriteCache();
       }

package/package.json

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