@umijs/mfsu 4.0.0-canary.20220831.2 → 4.0.0-canary.20220920.1

package/dist/dep/dep.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -84,7 +67,10 @@ export * from '${this.file}';
       `);
     }
     const realFile = await this.getRealFile();
-    (0, import_assert.default)(realFile, `filePath not found of ${this.file}`);
+    if (!realFile) {
+      import_utils.logger.error(`Can not resolve dependence : '${import_utils.chalk.red(this.file)}', please install it`);
+    }
+    (0, import_assert.default)(realFile, `dependence not found: ${this.file}`);
     const content = (0, import_fs.readFileSync)(realFile, "utf-8");
     return await (0, import_getExposeFromContent.getExposeFromContent)({
       content,
@@ -101,10 +87,11 @@ export * from '${this.file}';
   }
   static buildDeps(opts) {
     return Object.keys(opts.deps).map((file) => {
-      return new Dep(__spreadProps(__spreadValues({}, opts.deps[file]), {
+      return new Dep({
+        ...opts.deps[file],
         cwd: opts.cwd,
         excludeNodeNatives: opts.mfsu.opts.excludeNodeNatives
-      }));
+      });
     });
   }
   static getDepVersion(opts) {

package/dist/depBuilder/depBuilder.js

@@ -1,24 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -87,11 +70,12 @@ var DepBuilder = class {
       entry: {
         [`${import_constants.MF_VA_PREFIX}remoteEntry`]: entryPath
       },
-      config: __spreadProps(__spreadValues({}, this.opts.mfsu.opts.depBuildConfig), {
+      config: {
+        ...this.opts.mfsu.opts.depBuildConfig,
         outputPath: tmpDir,
         alias: this.opts.mfsu.alias,
         externals: this.opts.mfsu.externals
-      }),
+      },
       inlineStyle: true
     });
     import_utils.logger.event(`[mfsu] compiled with esbuild successfully in ${+new Date() - date} ms`);
@@ -137,9 +121,10 @@ var DepBuilder = class {
       this.completeFns = [];
     };
     try {
-      const buildOpts = __spreadProps(__spreadValues({}, opts), {
+      const buildOpts = {
+        ...opts,
         onBuildComplete
-      });
+      };
       if (this.opts.mfsu.opts.strategy === "eager") {
         await this.buildWithWorker(buildOpts);
         return;

package/dist/loader/esbuild.js

@@ -1,36 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -58,16 +29,17 @@ var import_path = require("path");
 async function esbuildTranspiler(source) {
   const done = this.async();
   const options = this.getOptions();
-  const _a = options, { handler = [], implementation } = _a, otherOptions = __objRest(_a, ["handler", "implementation"]);
+  const { handler = [], implementation, ...otherOptions } = options;
   const transform = (implementation == null ? void 0 : implementation.transform) || import_esbuild.transform;
   const filePath = this.resourcePath;
   const ext = (0, import_path.extname)(filePath).slice(1);
-  const transformOptions = __spreadProps(__spreadValues({}, otherOptions), {
+  const transformOptions = {
+    ...otherOptions,
     target: options.target ?? "es2015",
     loader: ext ?? "js",
     sourcemap: this.sourceMap,
     sourcefile: filePath
-  });
+  };
   try {
     let { code, map } = await transform(source, transformOptions);
     if (handler.length) {

package/dist/mfsu/mfsu.d.ts

@@ -26,7 +26,6 @@ interface IOpts {
     shared?: any;
     remoteName?: string;
     remoteAliases?: string[];
-    serverBase?: string;
     startBuildWorker: (dep: any[]) => Worker;
 }
 export declare class MFSU {
@@ -40,6 +39,7 @@ export declare class MFSU {
     onProgress: Function;
     publicPath: string;
     private strategy;
+    private lastBuildError;
     constructor(opts: IOpts);
     asyncImport(content: string): string;
     setWebpackConfig(opts: {

package/dist/mfsu/mfsu.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -64,6 +50,7 @@ var MFSU = class {
     this.buildDepsAgain = false;
     this.progress = { done: false };
     this.publicPath = "/";
+    this.lastBuildError = null;
     this.opts = opts;
     this.opts.mfName = this.opts.mfName || import_constants.DEFAULT_MF_NAME;
     this.opts.tmpBase = this.opts.tmpBase || (0, import_path.join)(process.cwd(), import_constants.DEFAULT_TMP_DIR_NAME);
@@ -71,7 +58,10 @@ var MFSU = class {
     this.opts.getCacheDependency = this.opts.getCacheDependency || (() => ({}));
     this.onProgress = (progress) => {
       var _a, _b;
-      this.progress = __spreadValues(__spreadValues({}, this.progress), progress);
+      this.progress = {
+        ...this.progress,
+        ...progress
+      };
       (_b = (_a = this.opts).onMFSUProgress) == null ? void 0 : _b.call(_a, this.progress);
     };
     this.opts.cwd = this.opts.cwd || process.cwd();
@@ -184,7 +174,7 @@ promise new Promise(resolve => {
   // inject this script with the src set to the versioned remoteEntry.js
   document.head.appendChild(script);
 })
-                `.trimLeft() : `${mfName}@${this.opts.serverBase || ""}${publicPath}${import_constants.REMOTE_FILE_FULL}`
+                `.trimLeft() : `${mfName}@${publicPath}${import_constants.REMOTE_FILE_FULL}`
         }
       }),
       new import_buildDepPlugin.BuildDepPlugin(this.strategy.getBuildDepPlugConfig())
@@ -194,30 +184,36 @@ promise new Promise(resolve => {
     this.strategy.init();
   }
   async buildDeps() {
-    const shouldBuild = this.strategy.shouldBuild();
-    if (!shouldBuild) {
-      import_utils.logger.info("[MFSU] skip buildDeps");
-      return;
-    }
-    this.strategy.refresh();
-    const staticDeps = this.strategy.getDepModules();
-    const deps = import_dep.Dep.buildDeps({
-      deps: staticDeps,
-      cwd: this.opts.cwd,
-      mfsu: this
-    });
-    import_utils.logger.info(`[MFSU] buildDeps since ${shouldBuild}`);
-    import_utils.logger.debug(deps.map((dep) => dep.file).join(", "));
-    await this.depBuilder.build({
-      deps
-    });
-    this.strategy.writeCache();
-    if (this.buildDepsAgain) {
-      import_utils.logger.info("[MFSU] buildDepsAgain");
-      this.buildDepsAgain = false;
-      this.buildDeps().catch((e) => {
-        import_utils.printHelp.runtime(e);
+    try {
+      const shouldBuild = this.strategy.shouldBuild();
+      if (!shouldBuild) {
+        import_utils.logger.info("[MFSU] skip buildDeps");
+        return;
+      }
+      this.strategy.refresh();
+      const staticDeps = this.strategy.getDepModules();
+      const deps = import_dep.Dep.buildDeps({
+        deps: staticDeps,
+        cwd: this.opts.cwd,
+        mfsu: this
       });
+      import_utils.logger.info(`[MFSU] buildDeps since ${shouldBuild}`);
+      import_utils.logger.debug(deps.map((dep) => dep.file).join(", "));
+      await this.depBuilder.build({
+        deps
+      });
+      this.lastBuildError = null;
+      this.strategy.writeCache();
+      if (this.buildDepsAgain) {
+        import_utils.logger.info("[MFSU] buildDepsAgain");
+        this.buildDepsAgain = false;
+        this.buildDeps().catch((e) => {
+          import_utils.printHelp.runtime(e);
+        });
+      }
+    } catch (e) {
+      this.lastBuildError = e;
+      throw e;
     }
   }
   getMiddlewares() {
@@ -233,7 +229,16 @@ promise new Promise(resolve => {
             }
             res.setHeader("content-type", (0, import_mrmime.lookup)((0, import_path.extname)(req.path)) || "text/plain");
             const relativePath = req.path.replace(new RegExp(`^${relativePublicPath}`), "/");
-            const content = (0, import_fs.readFileSync)((0, import_path.join)(this.opts.tmpBase, relativePath));
+            const realFilePath = (0, import_path.join)(this.opts.tmpBase, relativePath);
+            if (!(0, import_fs.existsSync)(realFilePath)) {
+              import_utils.logger.error(`MFSU dist file: ${realFilePath} not found`);
+              if (this.lastBuildError) {
+                import_utils.logger.error(`MFSU latest build error: `, this.lastBuildError);
+              }
+              res.status(404);
+              return res.end();
+            }
+            const content = (0, import_fs.readFileSync)(realFilePath);
             res.send(content);
           });
         } else {

package/dist/moduleGraph.js

@@ -1,24 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -192,7 +175,7 @@ var ModuleGraph = class {
       this.deleteNode({ mod: importedModulesMap[key], importer: opts.mod });
     });
     newDeps.forEach((dep) => {
-      this.addNode(__spreadProps(__spreadValues({}, dep), { importer: opts.mod }));
+      this.addNode({ ...dep, importer: opts.mod });
     });
   }
   addNode(opts) {

package/dist/staticDepInfo/staticDepInfo.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -185,12 +168,13 @@ var StaticDepInfo = class {
         opts
       });
       if (match.isMatch) {
-        matched[match.value] = __spreadProps(__spreadValues({}, match), {
+        matched[match.value] = {
+          ...match,
           version: import_dep.Dep.getDepVersion({
             dep: match.value,
             cwd
           })
-        });
+        };
       } else {
         unMatched.add(imp.n);
       }
@@ -230,12 +214,13 @@ var StaticDepInfo = class {
         opts
       });
       if (match.isMatch) {
-        matched[match.value] = __spreadProps(__spreadValues({}, match), {
+        matched[match.value] = {
+          ...match,
           version: import_dep.Dep.getDepVersion({
             dep: match.value,
             cwd: this.cwd
           })
-        });
+        };
       }
     }
   }

package/package.json

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