@umijs/mfsu 4.0.0-rc.1 → 4.0.0-rc.12

package/dist/babelPlugins/awaitImport/awaitImport.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/babelPlugins/awaitImport/checkMatch.js

@@ -13,7 +13,7 @@ const isExternals_1 = require("./isExternals");
 const RE_NODE_MODULES = /node_modules/;
 const RE_UMI_LOCAL_DEV = /umi(-next)?\/packages\//;
 function isUmiLocalDev(path) {
-    return RE_UMI_LOCAL_DEV.test(path);
+    return RE_UMI_LOCAL_DEV.test((0, utils_1.winPath)(path));
 }
 function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, }) {
     var _a, _b;
@@ -28,6 +28,8 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, })
     if (
     // unMatch specified libs
     ((_a = opts.unMatchLibs) === null || _a === void 0 ? void 0 : _a.includes(value)) ||
+        // do not match bundler-webpack/client/client/client.js
+        value.includes('client/client/client.js') ||
         // already handled
         value.startsWith(`${remoteName}/`) ||
         // don't match dynamic path
@@ -69,7 +71,7 @@ function checkMatch({ value, path, opts, isExportAll, depth, cache, filename, })
         isMatch = !!(opts.exportAllMembers && value in opts.exportAllMembers);
     }
     if (isMatch) {
-        replaceValue = `${remoteName}/${value}`;
+        replaceValue = `${remoteName}/${(0, utils_1.winPath)(value)}`;
     }
     // @ts-ignore
     const file = (path === null || path === void 0 ? void 0 : path.hub.file.opts.filename) || filename;

package/dist/babelPlugins/awaitImport/getAliasedPath.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAliasedPath = void 0;
-const path_1 = require("path");
 function getAliasedPath({ value, alias, }) {
     const importValue = value;
+    // equal alias
+    if (alias[value]) {
+        return alias[value];
+    }
     for (const key of Object.keys(alias)) {
         const aliasValue = alias[key];
         // exact alias
@@ -15,21 +18,13 @@ function getAliasedPath({ value, alias, }) {
             else
                 continue;
         }
-        // e.g. foo: path/to/foo
-        if (importValue === key) {
-            return aliasValue;
-        }
         // e.g. foo: path/to/foo.js
-        const slashedKey = isJSFile(aliasValue) ? key : addLastSlash(key);
-        if (importValue.startsWith(slashedKey)) {
+        if (importValue.startsWith(addLastSlash(key))) {
             return importValue.replace(key, aliasValue);
         }
     }
 }
 exports.getAliasedPath = getAliasedPath;
-function isJSFile(path) {
-    return ['.js', '.jsx', '.ts', '.tsx'].includes((0, path_1.extname)(path));
-}
 function addLastSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }

package/dist/babelPlugins/awaitImport/parseSpecifiers.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/dep/dep.js

@@ -24,9 +24,8 @@ const getExposeFromContent_1 = require("./getExposeFromContent");
 const resolver = enhanced_resolve_1.default.create({
     mainFields: ['module', 'browser', 'main'],
     extensions: ['.js', '.json', '.mjs'],
-    // TODO: support exports
-    // tried to add exports, but it don't work with swr
-    exportsFields: [],
+    exportsFields: ['exports'],
+    conditionNames: ['import', 'module', 'require', 'node'],
 });
 function resolve(context, path) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -37,7 +36,7 @@ function resolve(context, path) {
 }
 class Dep {
     constructor(opts) {
-        this.file = opts.file;
+        this.file = (0, utils_1.winPath)(opts.file);
         this.version = opts.version;
         this.cwd = opts.cwd;
         this.shortFile = this.file;
@@ -98,7 +97,7 @@ export * from '${this.file}';
         const dep = (0, path_1.isAbsolute)(opts.dep)
             ? opts.dep
             : (0, path_1.join)(opts.cwd, 'node_modules', opts.dep);
-        const pkg = utils_1.pkgUp.sync({
+        const pkg = utils_1.pkgUp.pkgUpSync({
             cwd: dep,
         });
         (0, assert_1.default)(pkg, `package.json not found for ${opts.dep}`);

package/dist/depBuilder/depBuilder.js

@@ -73,17 +73,24 @@ class DepBuilder {
     build(opts) {
         return __awaiter(this, void 0, void 0, function* () {
             this.isBuilding = true;
-            yield this.writeMFFiles({ deps: opts.deps });
-            const newOpts = Object.assign(Object.assign({}, opts), { onBuildComplete: () => {
-                    this.isBuilding = false;
-                    this.completeFns.forEach((fn) => fn());
-                    this.completeFns = [];
-                } });
-            if (this.opts.mfsu.opts.buildDepWithESBuild) {
-                yield this.buildWithESBuild(newOpts);
+            const onBuildComplete = () => {
+                this.isBuilding = false;
+                this.completeFns.forEach((fn) => fn());
+                this.completeFns = [];
+            };
+            try {
+                yield this.writeMFFiles({ deps: opts.deps });
+                const newOpts = Object.assign(Object.assign({}, opts), { onBuildComplete });
+                if (this.opts.mfsu.opts.buildDepWithESBuild) {
+                    yield this.buildWithESBuild(newOpts);
+                }
+                else {
+                    yield this.buildWithWebpack(newOpts);
+                }
             }
-            else {
-                yield this.buildWithWebpack(newOpts);
+            catch (e) {
+                onBuildComplete();
+                throw e;
             }
         });
     }
@@ -144,6 +151,9 @@ class DepBuilder {
         depConfig.plugins.push(new stripSourceMapUrlPlugin_1.StripSourceMapUrlPlugin({
             webpack: this.opts.mfsu.opts.implementor,
         }));
+        depConfig.plugins.push(new this.opts.mfsu.opts.implementor.ProgressPlugin((percent, msg) => {
+            this.opts.mfsu.onProgress({ percent, status: msg });
+        }));
         const exposes = opts.deps.reduce((memo, dep) => {
             memo[`./${dep.file}`] = (0, path_1.join)(this.opts.mfsu.opts.tmpBase, dep.filePath);
             return memo;

package/dist/depBuilder/getESBuildEntry.js

@@ -2,6 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getESBuildEntry = void 0;
 const constants_1 = require("../constants");
+// from typescript `esModuleInterop`
+const ES_INTEROP_FUNC = `__exportStar`;
+const ES_INTEROP_HELPER = `
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+}));
+var ${ES_INTEROP_FUNC} = (this && this.__exportStar) || function(m, exports) {
+  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+`;
 function getESBuildEntry(opts) {
     return `
 (function() {
@@ -266,6 +280,7 @@ function getESBuildEntry(opts) {
 var __webpack_exports__ = {};
 (function() {
   var exports = __webpack_exports__;
+${ES_INTEROP_HELPER}
   var moduleMap = {
 ${opts.deps.map(getDepModuleStr).join(',\n')}
   };
@@ -299,15 +314,13 @@ ${opts.deps.map(getDepModuleStr).join(',\n')}
   `;
 }
 exports.getESBuildEntry = getESBuildEntry;
-function normalizeFile(file) {
-    return file.replace(/\//g, '_');
-}
 function getDepModuleStr(dep) {
     return `
 "./${dep.file}": function() {
   return new Promise(resolve => {
-    import('./${constants_1.MF_VA_PREFIX}${normalizeFile(dep.file)}.js').then(module => {
-      resolve(() => module);
+    import('./${constants_1.MF_VA_PREFIX}${dep.normalizedFile}.js').then(module => {
+      module.default && ${ES_INTEROP_FUNC}(module, module.default);
+      resolve(() => module.default || module);
     });
   })
 }

package/dist/depInfo.d.ts

@@ -9,7 +9,7 @@ export declare class DepInfo {
     moduleGraph: ModuleGraph;
     cacheDependency: object;
     constructor(opts: IOpts);
-    shouldBuild(): boolean;
+    shouldBuild(): false | "cacheDependency has changed" | "moduleGraph has changed";
     snapshot(): void;
     loadCache(): void;
     writeCache(): void;

package/dist/depInfo.js

@@ -14,10 +14,10 @@ class DepInfo {
     }
     shouldBuild() {
         if (!utils_1.lodash.isEqual(this.cacheDependency, this.opts.mfsu.opts.getCacheDependency())) {
-            return true;
+            return 'cacheDependency has changed';
         }
         if (this.moduleGraph.hasDepChanged()) {
-            return true;
+            return 'moduleGraph has changed';
         }
         return false;
     }
@@ -35,11 +35,16 @@ class DepInfo {
     }
     writeCache() {
         utils_1.fsExtra.mkdirpSync((0, path_1.dirname)(this.cacheFilePath));
-        utils_1.logger.info('MFSU write cache');
-        (0, fs_1.writeFileSync)(this.cacheFilePath, JSON.stringify({
+        const newContent = JSON.stringify({
             cacheDependency: this.cacheDependency,
             moduleGraph: this.moduleGraph.toJSON(),
-        }, null, 2), 'utf-8');
+        }, null, 2);
+        if ((0, fs_1.existsSync)(this.cacheFilePath) &&
+            (0, fs_1.readFileSync)(this.cacheFilePath, 'utf-8') === newContent) {
+            return;
+        }
+        utils_1.logger.info('MFSU write cache');
+        (0, fs_1.writeFileSync)(this.cacheFilePath, newContent, 'utf-8');
     }
 }
 exports.DepInfo = DepInfo;

package/dist/esbuildHandlers/autoCssModules.d.ts

@@ -0,0 +1,2 @@
+import { IEsbuildLoaderHandlerParams } from '../types';
+export declare function autoCssModulesHandler(opts: IEsbuildLoaderHandlerParams): string;

package/dist/esbuildHandlers/autoCssModules.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoCssModulesHandler = void 0;
+const utils_1 = require("@umijs/utils");
+const CSS_MODULES_QUERY = '?modules';
+const QUERY_LENGTH = CSS_MODULES_QUERY.length;
+function autoCssModulesHandler(opts) {
+    let { code } = opts;
+    let offset = 0;
+    opts.imports.forEach((i) => {
+        if (i.d < 0 && (0, utils_1.isStyleFile)({ filename: i.n })) {
+            // import x from './index.less'
+            //   => import x from '
+            const importSegment = code.substring(i.ss + offset, i.s + offset);
+            // is css module
+            if (~importSegment.indexOf(' from')) {
+                code = `${code.substring(0, i.e + offset)}${CSS_MODULES_QUERY}${code.substring(i.e + offset)}`;
+                offset += QUERY_LENGTH;
+            }
+        }
+    });
+    return code;
+}
+exports.autoCssModulesHandler = autoCssModulesHandler;

package/dist/index.d.ts

@@ -1,2 +1,4 @@
 export * from './constants';
+export * from './esbuildHandlers/autoCssModules';
+export { esbuildLoader } from './loader/esbuild';
 export * from './mfsu';

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,5 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.esbuildLoader = void 0;
 __exportStar(require("./constants"), exports);
+__exportStar(require("./esbuildHandlers/autoCssModules"), exports);
+// for independent use `esbuild-loader`
+var esbuild_1 = require("./loader/esbuild");
+Object.defineProperty(exports, "esbuildLoader", { enumerable: true, get: function () { return esbuild_1.esbuildLoader; } });
 __exportStar(require("./mfsu"), exports);

package/dist/loader/esbuild.d.ts

@@ -0,0 +1,5 @@
+import type { LoaderContext } from 'webpack';
+import type { IEsbuildLoaderOpts } from '../types';
+declare function esbuildTranspiler(this: LoaderContext<IEsbuildLoaderOpts>, source: string): Promise<void>;
+export default esbuildTranspiler;
+export declare const esbuildLoader: string;

package/dist/loader/esbuild.js

@@ -0,0 +1,54 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.esbuildLoader = void 0;
+const es_module_lexer_1 = require("@umijs/bundler-utils/compiled/es-module-lexer");
+const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
+const path_1 = require("path");
+function esbuildTranspiler(source) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const done = this.async();
+        const options = this.getOptions();
+        const { handler = [], implementation } = options, otherOptions = __rest(options, ["handler", "implementation"]);
+        const transform = (implementation === null || implementation === void 0 ? void 0 : implementation.transform) || esbuild_1.transform;
+        const filePath = this.resourcePath;
+        const ext = (0, path_1.extname)(filePath).slice(1);
+        const transformOptions = Object.assign(Object.assign({}, otherOptions), { target: (_a = options.target) !== null && _a !== void 0 ? _a : 'es2015', loader: ext !== null && ext !== void 0 ? ext : 'js', sourcemap: this.sourceMap, sourcefile: filePath });
+        try {
+            let { code, map } = yield transform(source, transformOptions);
+            if (handler.length) {
+                yield es_module_lexer_1.init;
+                handler.forEach((handle) => {
+                    const [imports, exports] = (0, es_module_lexer_1.parse)(code);
+                    code = handle({ code, imports, exports, filePath });
+                });
+            }
+            done(null, code, map && JSON.parse(map));
+        }
+        catch (error) {
+            done(error);
+        }
+    });
+}
+exports.default = esbuildTranspiler;
+exports.esbuildLoader = __filename;

package/dist/mfsu.d.ts

@@ -1,6 +1,5 @@
-import type { NextFunction, Request, Response } from 'express';
+import type { NextFunction, Request, Response } from '@umijs/bundler-utils/compiled/express';
 import webpack, { Configuration } from 'webpack';
-import autoExport from './babelPlugins/autoExport';
 import awaitImport from './babelPlugins/awaitImport/awaitImport';
 import { DepBuilder } from './depBuilder/depBuilder';
 import { DepInfo } from './depInfo';
@@ -10,6 +9,7 @@ interface IOpts {
     excludeNodeNatives?: boolean;
     exportAllMembers?: Record<string, string[]>;
     getCacheDependency?: Function;
+    onMFSUProgress?: Function;
     mfName?: string;
     mode?: Mode;
     tmpBase?: string;
@@ -26,6 +26,9 @@ export declare class MFSU {
     depInfo: DepInfo;
     depBuilder: DepBuilder;
     depConfig: Configuration | null;
+    buildDepsAgain: boolean;
+    progress: any;
+    onProgress: Function;
     constructor(opts: IOpts);
     asyncImport(content: string): string;
     setWebpackConfig(opts: {
@@ -35,7 +38,7 @@ export declare class MFSU {
     buildDeps(): Promise<void>;
     getMiddlewares(): ((req: Request, res: Response, next: NextFunction) => void)[];
     private getAwaitImportCollectOpts;
-    getBabelPlugins(): (typeof autoExport | ({
+    getBabelPlugins(): ({
         onTransformDeps: () => void;
         onCollect: ({ file, data, }: {
             file: string;
@@ -53,7 +56,7 @@ export declare class MFSU {
         remoteName: string | undefined;
         alias: Record<string, string>;
         externals: (Function | Record<string, string>)[];
-    } | typeof awaitImport)[])[];
+    } | typeof awaitImport)[][];
     getEsbuildLoaderHandler(): any[];
 }
 export {};

package/dist/mfsu.js

@@ -21,30 +21,34 @@ const path_1 = require("path");
 const mrmime_1 = require("../compiled/mrmime");
 // @ts-ignore
 const webpack_virtual_modules_1 = __importDefault(require("../compiled/webpack-virtual-modules"));
-const autoExport_1 = __importDefault(require("./babelPlugins/autoExport"));
 const awaitImport_1 = __importDefault(require("./babelPlugins/awaitImport/awaitImport"));
 const getRealPath_1 = require("./babelPlugins/awaitImport/getRealPath");
 const constants_1 = require("./constants");
 const dep_1 = require("./dep/dep");
 const depBuilder_1 = require("./depBuilder/depBuilder");
 const depInfo_1 = require("./depInfo");
-const autoExport_2 = __importDefault(require("./esbuildHandlers/autoExport"));
 const awaitImport_2 = __importDefault(require("./esbuildHandlers/awaitImport"));
 const types_1 = require("./types");
 const makeArray_1 = require("./utils/makeArray");
 const buildDepPlugin_1 = require("./webpackPlugins/buildDepPlugin");
-const writeCachePlugin_1 = require("./webpackPlugins/writeCachePlugin");
 class MFSU {
     constructor(opts) {
         this.alias = {};
         this.externals = [];
         this.depConfig = null;
+        this.buildDepsAgain = false;
+        this.progress = { done: false };
         this.opts = opts;
         this.opts.mfName = this.opts.mfName || constants_1.DEFAULT_MF_NAME;
         this.opts.tmpBase =
             this.opts.tmpBase || (0, path_1.join)(process.cwd(), constants_1.DEFAULT_TMP_DIR_NAME);
         this.opts.mode = this.opts.mode || types_1.Mode.development;
         this.opts.getCacheDependency = this.opts.getCacheDependency || (() => ({}));
+        this.onProgress = (progress) => {
+            var _a, _b;
+            this.progress = Object.assign(Object.assign({}, this.progress), progress);
+            (_b = (_a = this.opts).onMFSUProgress) === null || _b === void 0 ? void 0 : _b.call(_a, this.progress);
+        };
         this.opts.cwd = this.opts.cwd || process.cwd();
         this.depInfo = new depInfo_1.DepInfo({ mfsu: this });
         this.depBuilder = new depBuilder_1.DepBuilder({ mfsu: this });
@@ -53,7 +57,7 @@ class MFSU {
     // swc don't support top-level await
     // ref: https://github.com/vercel/next.js/issues/31054
     asyncImport(content) {
-        return `await import('${content}');`;
+        return `await import('${(0, utils_1.winPath)(content)}');`;
         // return `(async () => await import('${content}'))();`;
     }
     setWebpackConfig(opts) {
@@ -162,16 +166,30 @@ promise new Promise(resolve => {
                 }),
                 new buildDepPlugin_1.BuildDepPlugin({
                     onCompileDone: () => {
-                        this.buildDeps().catch((e) => {
-                            utils_1.logger.error(e);
-                        });
+                        if (this.depBuilder.isBuilding) {
+                            this.buildDepsAgain = true;
+                        }
+                        else {
+                            this.buildDeps()
+                                .then(() => {
+                                this.onProgress({
+                                    done: true,
+                                });
+                            })
+                                .catch((e) => {
+                                utils_1.logger.error(e);
+                                this.onProgress({
+                                    done: true,
+                                });
+                            });
+                        }
                     },
                 }),
-                new writeCachePlugin_1.WriteCachePlugin({
-                    onWriteCache: utils_1.lodash.debounce(() => {
-                        this.depInfo.writeCache();
-                    }, 300),
-                }),
+                // new WriteCachePlugin({
+                //   onWriteCache: lodash.debounce(() => {
+                //     this.depInfo.writeCache();
+                //   }, 300),
+                // }),
             ]);
             // ensure topLevelAwait enabled
             utils_1.lodash.set(opts.config, 'experiments.topLevelAwait', true);
@@ -183,7 +201,8 @@ promise new Promise(resolve => {
     }
     buildDeps() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.depInfo.shouldBuild()) {
+            const shouldBuild = this.depInfo.shouldBuild();
+            if (!shouldBuild) {
                 utils_1.logger.info('MFSU skip buildDeps');
                 return;
             }
@@ -193,11 +212,20 @@ promise new Promise(resolve => {
                 cwd: this.opts.cwd,
                 mfsu: this,
             });
-            utils_1.logger.info('MFSU buildDeps');
+            utils_1.logger.info(`MFSU buildDeps since ${shouldBuild}`);
             utils_1.logger.debug(deps.map((dep) => dep.file).join(', '));
             yield this.depBuilder.build({
                 deps,
             });
+            // Write cache
+            this.depInfo.writeCache();
+            if (this.buildDepsAgain) {
+                utils_1.logger.info('MFSU buildDepsAgain');
+                this.buildDepsAgain = false;
+                this.buildDeps().catch((e) => {
+                    utils_1.logger.error(e);
+                });
+            }
         });
     }
     getMiddlewares() {
@@ -258,13 +286,12 @@ promise new Promise(resolve => {
         };
     }
     getBabelPlugins() {
-        return [autoExport_1.default, [awaitImport_1.default, this.getAwaitImportCollectOpts()]];
+        return [[awaitImport_1.default, this.getAwaitImportCollectOpts()]];
     }
     getEsbuildLoaderHandler() {
         const cache = new Map();
         const checkOpts = this.getAwaitImportCollectOpts();
         return [
-            autoExport_2.default,
             (0, awaitImport_2.default)({
                 cache,
                 opts: checkOpts,

package/dist/types.d.ts

@@ -1,4 +1,16 @@
+import type { ImportSpecifier } from '@umijs/bundler-utils/compiled/es-module-lexer';
+import type { TransformOptions } from '@umijs/bundler-utils/compiled/esbuild';
 export declare enum Mode {
     development = "development",
     production = "production"
 }
+export interface IEsbuildLoaderHandlerParams {
+    code: string;
+    filePath: string;
+    imports: readonly ImportSpecifier[];
+    exports: readonly string[];
+}
+export interface IEsbuildLoaderOpts extends Partial<TransformOptions> {
+    handler?: Array<(opts: IEsbuildLoaderHandlerParams) => string>;
+    implementation?: typeof import('@umijs/bundler-utils/compiled/esbuild');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.12",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -18,18 +18,18 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch"
+    "dev": "pnpm build -- --watch",
+    "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-rc.1",
-    "@umijs/bundler-utils": "4.0.0-rc.1",
-    "@umijs/utils": "4.0.0-rc.1"
+    "@umijs/bundler-esbuild": "4.0.0-rc.12",
+    "@umijs/bundler-utils": "4.0.0-rc.12",
+    "@umijs/utils": "4.0.0-rc.12",
+    "enhanced-resolve": "5.9.2"
   },
   "devDependencies": {
-    "@types/express": "4.17.13",
-    "enhanced-resolve": "5.8.3",
     "mrmime": "1.0.0",
-    "webpack": "5.64.4",
+    "webpack": "5.72.0",
     "webpack-virtual-modules": "0.4.3"
   },
   "publishConfig": {

package/dist/babelPlugins/autoExport.d.ts

@@ -1,7 +0,0 @@
-import * as Babel from '@umijs/bundler-utils/compiled/babel/core';
-import * as t from '@umijs/bundler-utils/compiled/babel/types';
-export default function (): {
-    visitor: {
-        Program(path: Babel.NodePath<t.Program>): void;
-    };
-};

package/dist/babelPlugins/autoExport.js

@@ -1,61 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
-function default_1() {
-    return {
-        visitor: {
-            Program(path) {
-                let hasExport = false;
-                path.node.body.forEach((node) => {
-                    if (
-                    // esm
-                    t.isExportNamedDeclaration(node) ||
-                        t.isExportDefaultDeclaration(node) ||
-                        t.isExportAllDeclaration(node) ||
-                        // cjs
-                        (t.isExpressionStatement(node) &&
-                            t.isAssignmentExpression(node.expression) &&
-                            t.isMemberExpression(node.expression.left) &&
-                            // exports.xxx =
-                            (t.isIdentifier(node.expression.left.object, {
-                                name: 'exports',
-                            }) ||
-                                // module.exports =
-                                (t.isIdentifier(node.expression.left.object, {
-                                    name: 'module',
-                                }) &&
-                                    t.isIdentifier(node.expression.left.property, {
-                                        name: 'exports',
-                                    }))))) {
-                        hasExport = true;
-                    }
-                });
-                if (!hasExport) {
-                    path.node.body.push(t.exportNamedDeclaration(t.variableDeclaration('const', [
-                        t.variableDeclarator(t.identifier('__mfsu'), t.numericLiteral(1)),
-                    ])));
-                }
-            },
-        },
-    };
-}
-exports.default = default_1;

package/dist/esbuildHandlers/autoExport.d.ts

@@ -1,6 +0,0 @@
-interface IOpts {
-    exports: string[];
-    code: string;
-}
-export default function autoExportHandler(opts: IOpts): string;
-export {};

package/dist/esbuildHandlers/autoExport.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function autoExportHandler(opts) {
-    if (!opts.exports.length) {
-        return `${opts.code};\nexport const __mfsu = 1;`;
-    }
-    return opts.code;
-}
-exports.default = autoExportHandler;