@umijs/mfsu 4.0.0-canary.20220323.1 → 4.0.0-canary.20220412.2

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* () {

package/dist/depBuilder/depBuilder.js

@@ -151,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/mfsu.d.ts

@@ -1,6 +1,5 @@
 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;
@@ -27,6 +27,8 @@ export declare class MFSU {
     depBuilder: DepBuilder;
     depConfig: Configuration | null;
     buildDepsAgain: boolean;
+    progress: any;
+    onProgress: Function;
     constructor(opts: IOpts);
     asyncImport(content: string): string;
     setWebpackConfig(opts: {
@@ -36,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;
@@ -54,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,14 +21,12 @@ 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");
@@ -39,12 +37,18 @@ class MFSU {
         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 });
@@ -166,8 +170,17 @@ promise new Promise(resolve => {
                             this.buildDepsAgain = true;
                         }
                         else {
-                            this.buildDeps().catch((e) => {
+                            this.buildDeps()
+                                .then(() => {
+                                this.onProgress({
+                                    done: true,
+                                });
+                            })
+                                .catch((e) => {
                                 utils_1.logger.error(e);
+                                this.onProgress({
+                                    done: true,
+                                });
                             });
                         }
                     },
@@ -273,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-canary.20220323.1",
+  "version": "4.0.0-canary.20220412.2",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -22,14 +22,14 @@
     "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-canary.20220323.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220323.1",
-    "@umijs/utils": "4.0.0-canary.20220323.1",
+    "@umijs/bundler-esbuild": "4.0.0-canary.20220412.2",
+    "@umijs/bundler-utils": "4.0.0-canary.20220412.2",
+    "@umijs/utils": "4.0.0-canary.20220412.2",
     "enhanced-resolve": "5.9.2"
   },
   "devDependencies": {
     "mrmime": "1.0.0",
-    "webpack": "5.70.0",
+    "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,65 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-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;