@umijs/mfsu 4.6.67 → 4.6.69

package/dist/babelPlugins/awaitImport/isExternals.d.ts

@@ -1,5 +1,5 @@
-declare type IExternal = Record<string, string> | Function;
-declare type IExternals = IExternal[] | IExternal;
+type IExternal = Record<string, string> | Function;
+type IExternals = IExternal[] | IExternal;
 export declare function isExternals({ value, externals, }: {
     value: string;
     externals: IExternals;

package/dist/constants.d.ts

@@ -4,5 +4,5 @@ export declare const MF_STATIC_PREFIX = "mf-static/";
 export declare const DEFAULT_MF_NAME = "mf";
 export declare const DEFAULT_TMP_DIR_NAME = ".mfsu";
 export declare const REMOTE_FILE = "remoteEntry.js";
-export declare const REMOTE_FILE_FULL: string;
+export declare const REMOTE_FILE_FULL = "mf-va_remoteEntry.js";
 export declare const VIRTUAL_ENTRY_DIR = "mfsu-virtual-entry";

package/dist/dep/dep.js

@@ -41,15 +41,7 @@ var import_constants = require("../constants");
 var import_resolveUtils = require("../utils/resolveUtils");
 var import_trimFileContent = require("../utils/trimFileContent");
 var import_getExposeFromContent = require("./getExposeFromContent");
-var Dep = class _Dep {
-  file;
-  version;
-  cwd;
-  shortFile;
-  normalizedFile;
-  filePath;
-  excludeNodeNatives;
-  importer;
+var Dep = class {
   constructor(opts) {
     this.file = (0, import_utils.winPath)(opts.file);
     this.version = opts.version;
@@ -113,7 +105,7 @@ export * from '${this.file}';
   }
   static buildDeps(opts) {
     return Object.keys(opts.deps).map((file) => {
-      return new _Dep({
+      return new Dep({
         ...opts.deps[file],
         cwd: opts.cwd,
         excludeNodeNatives: opts.mfsu.opts.excludeNodeNatives

package/dist/dep/getExposeFromContent.js

@@ -59,7 +59,7 @@ export default _;`.trim();
     (0, import_utils.isJavaScriptFile)(opts.filePath),
     `file type not supported for ${(0, import_path.basename)(opts.filePath)}.`
   );
-  const { exports: exports2, isCJS } = await (0, import_getModuleExports.getModuleExports)({
+  const { exports, isCJS } = await (0, import_getModuleExports.getModuleExports)({
     content: opts.content,
     filePath: opts.filePath
   });
@@ -72,12 +72,12 @@ export default _;`.trim();
   } else {
     const ret = [];
     let hasExports = false;
-    if (exports2.includes("default")) {
+    if (exports.includes("default")) {
       ret.push(`import _ from '${importPath}';`);
       ret.push(`export default _;`);
       hasExports = true;
     }
-    if (hasNonDefaultExports(exports2) || // export * from 不会有 exports，只会有 imports
+    if (hasNonDefaultExports(exports) || // export * from 不会有 exports，只会有 imports
     // case: export*from'.'
     //       export * from '.'
     /export\s*\*\s*from/.test(opts.content)) {
@@ -85,7 +85,7 @@ export default _;`.trim();
       hasExports = true;
     }
     if (!hasExports) {
-      if (exports2.includes("__esModule")) {
+      if (exports.includes("__esModule")) {
         ret.push(`import _ from '${importPath}';`);
         ret.push(`export default _;`);
         ret.push(`export * from '${importPath}';`);
@@ -96,8 +96,8 @@ export default _;`.trim();
     return ret.join("\n");
   }
 }
-function hasNonDefaultExports(exports2) {
-  return exports2.filter((exp) => !["__esModule", "default"].includes(exp)).length > 0;
+function hasNonDefaultExports(exports) {
+  return exports.filter((exp) => !["__esModule", "default"].includes(exp)).length > 0;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/dep/getModuleExports.js

@@ -40,8 +40,8 @@ async function getModuleExports({
     })).code;
   }
   await import_es_module_lexer.init;
-  const [imports, exports2] = (0, import_es_module_lexer.parse)(content);
-  let isCJS = !imports.length && !exports2.length;
+  const [imports, exports] = (0, import_es_module_lexer.parse)(content);
+  let isCJS = !imports.length && !exports.length;
   let cjsEsmExports = null;
   if (isCJS) {
     cjsEsmExports = (0, import_getCJSExports.getCJSExports)({ content });
@@ -50,7 +50,7 @@ async function getModuleExports({
     }
   }
   return {
-    exports: cjsEsmExports || exports2,
+    exports: cjsEsmExports || exports,
     isCJS
   };
 }

package/dist/depBuilder/depBuilder.js

@@ -32,10 +32,9 @@ var import_stripSourceMapUrlPlugin = require("../webpackPlugins/stripSourceMapUr
 var import_getESBuildEntry = require("./getESBuildEntry");
 var MF_ENTRY = "mf_index.js";
 var DepBuilder = class {
-  opts;
-  completeFns = [];
-  isBuilding = false;
   constructor(opts) {
+    this.completeFns = [];
+    this.isBuilding = false;
     this.opts = opts;
   }
   async buildWithWebpack(opts) {
@@ -170,8 +169,10 @@ var DepBuilder = class {
     depConfig.output.path = this.opts.mfsu.opts.tmpBase;
     depConfig.output.publicPath = "auto";
     depConfig.devtool = false;
-    if ((_a = depConfig.output) == null ? void 0 : _a.library) delete depConfig.output.library;
-    if ((_b = depConfig.output) == null ? void 0 : _b.libraryTarget) delete depConfig.output.libraryTarget;
+    if ((_a = depConfig.output) == null ? void 0 : _a.library)
+      delete depConfig.output.library;
+    if ((_b = depConfig.output) == null ? void 0 : _b.libraryTarget)
+      delete depConfig.output.libraryTarget;
     depConfig.optimization || (depConfig.optimization = {});
     depConfig.optimization.splitChunks = {
       chunks: (chunk) => {

package/dist/depInfo.d.ts

@@ -3,7 +3,7 @@ import { ModuleGraph } from './moduleGraph';
 interface IOpts {
     mfsu: MFSU;
 }
-export declare type DepModule = {
+export type DepModule = {
     file: string;
     version: string;
     importer?: string;
@@ -22,7 +22,7 @@ export declare class DepInfo implements IDepInfo {
     moduleGraph: ModuleGraph;
     private cacheDependency;
     constructor(opts: IOpts);
-    shouldBuild(): false | "cacheDependency has changed" | "moduleGraph has changed";
+    shouldBuild(): "cacheDependency has changed" | "moduleGraph has changed" | false;
     snapshot(): void;
     loadCache(): void;
     writeCache(): void;

package/dist/depInfo.js

@@ -27,11 +27,9 @@ var import_fs = require("fs");
 var import_path = require("path");
 var import_moduleGraph = require("./moduleGraph");
 var DepInfo = class {
-  opts;
-  cacheFilePath;
-  moduleGraph = new import_moduleGraph.ModuleGraph();
-  cacheDependency = {};
   constructor(opts) {
+    this.moduleGraph = new import_moduleGraph.ModuleGraph();
+    this.cacheDependency = {};
     this.opts = opts;
     this.cacheFilePath = (0, import_path.join)(this.opts.mfsu.opts.tmpBase, "MFSU_CACHE.json");
   }

package/dist/esbuildHandlers/awaitImport/index.js

@@ -30,7 +30,8 @@ function getImportHandlerV4(params) {
     let { code } = opts;
     const { imports } = opts;
     imports.forEach((i) => {
-      if (!i.n) return;
+      if (!i.n)
+        return;
       const isLazyImport = i.d > 0;
       const from = i.n;
       const replaceValue = params.resolveImportSource(from);
@@ -52,7 +53,8 @@ function getAwaitImportHandler(params) {
     let { code } = opts;
     const { filePath, imports } = opts;
     imports.forEach((i) => {
-      if (!i.n) return;
+      if (!i.n)
+        return;
       const isLazyImport = i.d > 0;
       const from = i.n;
       const { isMatch, replaceValue } = (0, import_checkMatch.checkMatch)({

package/dist/loader/esbuild.js

@@ -62,8 +62,8 @@ async function esbuildTranspiler(source) {
     if (handler.length) {
       await import_es_module_lexer.init;
       handler.forEach((handle) => {
-        const [imports, exports2] = (0, import_es_module_lexer.parse)(code);
-        code = handle({ code, imports, exports: exports2, filePath });
+        const [imports, exports] = (0, import_es_module_lexer.parse)(code);
+        code = handle({ code, imports, exports, filePath });
       });
     }
     done(null, code, map && JSON.parse(map));

package/dist/mfsu/mfsu.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { NextFunction, Request, Response } from '@umijs/bundler-utils/compiled/express';
 import webpack, { Configuration } from 'webpack';
 import type { Worker } from 'worker_threads';
@@ -49,7 +48,7 @@ export declare class MFSU {
     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>>>)[];
+    getMiddlewares(): (import("@umijs/bundler-utils/compiled/express/serve-static").RequestHandler<Response<any, Record<string, any>>> | ((req: Request, res: Response, next: NextFunction) => void))[];
     getBabelPlugins(): any[][];
     getEsbuildLoaderHandler(): any[];
     getCacheFilePath(): string;

package/dist/mfsu/mfsu.js

@@ -53,18 +53,14 @@ var import_buildDepPlugin = require("../webpackPlugins/buildDepPlugin");
 var import_strategyCompileTime = require("./strategyCompileTime");
 var import_strategyStaticAnalyze = require("./strategyStaticAnalyze");
 var MFSU = class {
-  opts;
-  alias = {};
-  externals = [];
-  depBuilder;
-  depConfig = null;
-  buildDepsAgain = false;
-  progress = { done: false };
-  onProgress;
-  publicPath = "/";
-  strategy;
-  lastBuildError = null;
   constructor(opts) {
+    this.alias = {};
+    this.externals = [];
+    this.depConfig = null;
+    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);
@@ -134,10 +130,10 @@ var MFSU = class {
         );
         entry2 = realEntry;
         const content = (0, import_fs.readFileSync)(entry2, "utf-8");
-        const [_imports, exports2] = await (0, import_bundler_utils.parseModule)({ content, path: entry2 });
-        if (exports2.length) {
+        const [_imports, exports] = await (0, import_bundler_utils.parseModule)({ content, path: entry2 });
+        if (exports.length) {
           virtualContent.push(`const k${index} = ${this.asyncImport(entry2)}`);
-          for (const exportName of exports2) {
+          for (const exportName of exports) {
             if (exportName === "default") {
               hasDefaultExport = true;
               virtualContent.push(`export default k${index}.${exportName}`);

package/dist/mfsu/strategyCompileTime.d.ts

@@ -10,7 +10,7 @@ export declare class StrategyCompileTime implements IMFSUStrategy {
     getDepModules(): Record<string, DepModule>;
     getCacheFilePath(): string;
     init(): void;
-    shouldBuild(): false | "cacheDependency has changed" | "moduleGraph has changed";
+    shouldBuild(): "cacheDependency has changed" | "moduleGraph has changed" | false;
     loadCache(): void;
     writeCache(): void;
     refresh(): void;

package/dist/mfsu/strategyCompileTime.js

@@ -38,8 +38,6 @@ var import_getRealPath = require("../babelPlugins/awaitImport/getRealPath");
 var import_dep = require("../dep/dep");
 var import_depInfo = require("../depInfo");
 var StrategyCompileTime = class {
-  mfsu;
-  depInfo;
   constructor({ mfsu }) {
     this.mfsu = mfsu;
     this.depInfo = new import_depInfo.DepInfo({ mfsu });

package/dist/mfsu/strategyStaticAnalyze.d.ts

@@ -14,7 +14,7 @@ export declare class StaticAnalyzeStrategy implements IMFSUStrategy {
         version: string;
     }>;
     getCacheFilePath(): string;
-    shouldBuild(): false | "cacheDependency has changed" | "dependencies changed";
+    shouldBuild(): "cacheDependency has changed" | "dependencies changed" | false;
     writeCache(): void;
     getBabelPlugin(): any[];
     private getMfImportOpts;

package/dist/mfsu/strategyStaticAnalyze.js

@@ -38,8 +38,6 @@ var import_MFImport = __toESM(require("../babelPlugins/awaitImport/MFImport"));
 var import_staticDepInfo = require("../staticDepInfo/staticDepInfo");
 var import_webpackUtils = require("../utils/webpackUtils");
 var StaticAnalyzeStrategy = class {
-  mfsu;
-  staticDepInfo;
   constructor({ mfsu, srcCodeCache }) {
     this.mfsu = mfsu;
     this.staticDepInfo = new import_staticDepInfo.StaticDepInfo({

package/dist/moduleGraph.d.ts

@@ -29,7 +29,7 @@ export declare class ModuleGraph {
         roots: string[];
         fileModules: Record<string, {
             importedModules: string[];
-            isRoot?: boolean | undefined;
+            isRoot?: boolean;
         }>;
         depModules: Record<string, {
             version: string | null;

package/dist/moduleGraph.js

@@ -23,22 +23,21 @@ __export(moduleGraph_exports, {
 });
 module.exports = __toCommonJS(moduleGraph_exports);
 var ModuleNode = class {
-  file;
-  importers = /* @__PURE__ */ new Set();
-  importedModules = /* @__PURE__ */ new Set();
-  isDependency = false;
-  isRoot = false;
-  version = null;
   constructor(file) {
+    this.importers = /* @__PURE__ */ new Set();
+    this.importedModules = /* @__PURE__ */ new Set();
+    this.isDependency = false;
+    this.isRoot = false;
+    this.version = null;
     this.file = file;
   }
 };
 var ModuleGraph = class {
-  fileToModules = /* @__PURE__ */ new Map();
-  depToModules = /* @__PURE__ */ new Map();
-  depSnapshotModules = {};
-  rootModules = /* @__PURE__ */ new Set();
   constructor() {
+    this.fileToModules = /* @__PURE__ */ new Map();
+    this.depToModules = /* @__PURE__ */ new Map();
+    this.depSnapshotModules = {};
+    this.rootModules = /* @__PURE__ */ new Set();
   }
   restore(data) {
     const getModuleNode = (file) => {
@@ -61,7 +60,8 @@ var ModuleGraph = class {
         info = data.depModules[file];
         isDependency = true;
       }
-      if (info.isRoot) mod.isRoot = true;
+      if (info.isRoot)
+        mod.isRoot = true;
       if (importer) {
         mod.importers.add(importer);
         if (!importer.importedModules.has(mod)) {
@@ -201,11 +201,13 @@ var ModuleGraph = class {
     let mod;
     if (modules.has(opts.file)) {
       mod = modules.get(opts.file);
-      if (opts.version !== void 0) mod.version = opts.version;
+      if (opts.version !== void 0)
+        mod.version = opts.version;
     } else {
       mod = new ModuleNode(opts.file);
       mod.isDependency = opts.isDependency;
-      if (opts.version !== void 0) mod.version = opts.version;
+      if (opts.version !== void 0)
+        mod.version = opts.version;
       modules.set(opts.file, mod);
     }
     if (!mod.importers.has(opts.importer)) {

package/dist/staticDepInfo/importParser.js

@@ -22,7 +22,7 @@ __export(importParser_exports, {
   default: () => parse
 });
 module.exports = __toCommonJS(importParser_exports);
-var import_importParser = require("../../vendors/importParser/_importParser.js");
+var { parse: _parse } = require("../../vendors/importParser/_importParser.js");
 function parse(code) {
-  return (0, import_importParser.parse)(code);
+  return _parse(code);
 }

package/dist/staticDepInfo/staticDepInfo.d.ts

@@ -1,16 +1,16 @@
 import { ImportSpecifier } from '@umijs/bundler-utils/compiled/es-module-lexer';
 import { checkMatch } from '../babelPlugins/awaitImport/checkMatch';
 import { MFSU } from '../mfsu/mfsu';
-declare type FileChangeEvent = {
+type FileChangeEvent = {
     event: 'unlink' | 'change' | 'add';
     path: string;
 };
-declare type MergedCodeInfo = {
+type MergedCodeInfo = {
     imports: readonly ImportSpecifier[];
     code: string;
     events: FileChangeEvent[];
 };
-declare type AutoUpdateSrcCodeCache = {
+type AutoUpdateSrcCodeCache = {
     register(listener: (info: MergedCodeInfo) => void): void;
     getMergedCode(): MergedCodeInfo;
     handleFileChangeEvents(events: FileChangeEvent[]): void;
@@ -22,7 +22,7 @@ interface IOpts {
     srcCodeCache: AutoUpdateSrcCodeCache;
     safeList?: string[];
 }
-export declare type Match = ReturnType<typeof checkMatch> & {
+export type Match = ReturnType<typeof checkMatch> & {
     version: string;
 };
 export declare class StaticDepInfo {
@@ -41,7 +41,7 @@ export declare class StaticDepInfo {
         changes: unknown[];
     }[];
     consumeAllProducedEvents(): void;
-    shouldBuild(): false | "cacheDependency has changed" | "dependencies changed";
+    shouldBuild(): "cacheDependency has changed" | "dependencies changed" | false;
     getDepModules(): Record<string, {
         file: string;
         version: string;

package/dist/staticDepInfo/staticDepInfo.js

@@ -40,17 +40,11 @@ var import_checkMatch = require("../babelPlugins/awaitImport/checkMatch");
 var import_dep = require("../dep/dep");
 var import_babel_plugin_import = __toESM(require("./simulations/babel-plugin-import"));
 var StaticDepInfo = class {
-  opts;
-  cacheFilePath;
-  mfsu;
-  include;
-  currentDep = {};
-  builtWithDep = {};
-  cacheDependency = {};
-  produced = [];
-  cwd;
-  runtimeSimulations;
   constructor(opts) {
+    this.currentDep = {};
+    this.builtWithDep = {};
+    this.cacheDependency = {};
+    this.produced = [];
     this.mfsu = opts.mfsu;
     this.include = this.mfsu.opts.include || [];
     this.opts = opts;

package/dist/webpackPlugins/buildDepPlugin.js

@@ -25,7 +25,6 @@ module.exports = __toCommonJS(buildDepPlugin_exports);
 var import_utils = require("@umijs/utils");
 var PLUGIN_NAME = "MFSUBuildDeps";
 var BuildDepPlugin = class {
-  opts;
   constructor(opts) {
     this.opts = opts;
   }

package/dist/webpackPlugins/stripSourceMapUrlPlugin.js

@@ -23,7 +23,6 @@ __export(stripSourceMapUrlPlugin_exports, {
 });
 module.exports = __toCommonJS(stripSourceMapUrlPlugin_exports);
 var StripSourceMapUrlPlugin = class {
-  opts;
   constructor(opts) {
     this.opts = opts;
   }

package/dist/webpackPlugins/writeCachePlugin.js

@@ -24,7 +24,6 @@ __export(writeCachePlugin_exports, {
 module.exports = __toCommonJS(writeCachePlugin_exports);
 var PLUGIN_NAME = "MFSUWriteCache";
 var WriteCachePlugin = class {
-  opts;
   constructor(opts) {
     this.opts = opts;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.6.67",
+  "version": "4.6.69",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -19,9 +19,9 @@
   "dependencies": {
     "enhanced-resolve": "5.9.3",
     "is-equal": "^1.6.4",
-    "@umijs/utils": "4.6.67",
-    "@umijs/bundler-esbuild": "4.6.67",
-    "@umijs/bundler-utils": "4.6.67"
+    "@umijs/bundler-esbuild": "4.6.69",
+    "@umijs/bundler-utils": "4.6.69",
+    "@umijs/utils": "4.6.69"
   },
   "devDependencies": {
     "is-absolute-url": "^4.0.1",

package/vendors/importParser/_importParser.js

@@ -185,8 +185,7 @@ parse: function parse(input) {
         vstack.length = vstack.length - n;
         lstack.length = lstack.length - n;
     }
-    _token_stack:
-        var lex = function () {
+    var lex = function () {
             var token;
             token = lexer.lex() || EOF;
             if (typeof token !== 'number') {
@@ -680,4 +679,4 @@ exports.main = function commonjsMain (args) {
 if (typeof module !== 'undefined' && require.main === module) {
   exports.main(process.argv.slice(1));
 }
-}
+}