@umijs/mfsu 4.0.0-beta.16 → 4.0.0-beta.17

package/dist/depBuilder/depBuilder.js

@@ -98,6 +98,7 @@ class DepBuilder {
     writeMFFiles(opts) {
         return __awaiter(this, void 0, void 0, function* () {
             const tmpBase = this.opts.mfsu.opts.tmpBase;
+            utils_1.fsExtra.mkdirpSync(tmpBase);
             // expose files
             for (const dep of opts.deps) {
                 const content = yield dep.buildExposeContent();

package/dist/depInfo.js

@@ -27,6 +27,7 @@ class DepInfo {
     }
     loadCache() {
         if ((0, fs_1.existsSync)(this.cacheFilePath)) {
+            utils_1.logger.info('MFSU restore cache');
             const { cacheDependency, moduleGraph } = JSON.parse((0, fs_1.readFileSync)(this.cacheFilePath, 'utf-8'));
             this.cacheDependency = cacheDependency;
             this.moduleGraph.restore(moduleGraph);
@@ -34,6 +35,7 @@ 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({
             cacheDependency: this.cacheDependency,
             moduleGraph: this.moduleGraph.toJSON(),

package/dist/mfsu.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MFSU = void 0;
 const bundler_utils_1 = require("@umijs/bundler-utils");
 const utils_1 = require("@umijs/utils");
+const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
 const mrmime_1 = require("../compiled/mrmime");
@@ -66,13 +67,29 @@ class MFSU {
             // entry
             const entry = {};
             const virtualModules = {};
-            for (const key of Object.keys(opts.config.entry)) {
+            // ensure entry object type
+            const entryObject = utils_1.lodash.isString(opts.config.entry)
+                ? { default: [opts.config.entry] }
+                : opts.config.entry;
+            (0, assert_1.default)(utils_1.lodash.isPlainObject(entryObject), `webpack config 'entry' value must be a string or an object.`);
+            for (const key of Object.keys(entryObject)) {
                 const virtualPath = `./mfsu-virtual-entry/${key}.js`;
                 const virtualContent = [];
                 let index = 1;
                 let hasDefaultExport = false;
-                // @ts-ignore
-                for (const entry of opts.config.entry[key]) {
+                const entryFiles = utils_1.lodash.isArray(entryObject[key])
+                    ? entryObject[key]
+                    : [entryObject[key]];
+                for (let entry of entryFiles) {
+                    // ensure entry is a file
+                    if ((0, fs_1.statSync)(entry).isDirectory()) {
+                        const realEntry = (0, utils_1.tryPaths)([
+                            (0, path_1.join)(entry, 'index.tsx'),
+                            (0, path_1.join)(entry, 'index.ts'),
+                        ]);
+                        (0, assert_1.default)(realEntry, `entry file not found, please configure the specific entry path. (e.g. 'src/index.tsx')`);
+                        entry = realEntry;
+                    }
                     const content = (0, fs_1.readFileSync)(entry, 'utf-8');
                     const [_imports, exports] = yield (0, bundler_utils_1.parseModule)({ content, path: entry });
                     if (exports.length) {
@@ -149,11 +166,13 @@ promise new Promise(resolve => {
                     },
                 }),
                 new writeCachePlugin_1.WriteCachePlugin({
-                    onWriteCache: () => {
+                    onWriteCache: utils_1.lodash.debounce(() => {
                         this.depInfo.writeCache();
-                    },
+                    }, 300),
                 }),
             ]);
+            // ensure topLevelAwait enabled
+            utils_1.lodash.set(opts.config, 'experiments.topLevelAwait', true);
             /**
              * depConfig
              */
@@ -162,14 +181,18 @@ promise new Promise(resolve => {
     }
     buildDeps() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.depInfo.shouldBuild())
+            if (!this.depInfo.shouldBuild()) {
+                utils_1.logger.info('MFSU skip buildDeps');
                 return;
+            }
             this.depInfo.snapshot();
             const deps = dep_1.Dep.buildDeps({
                 deps: this.depInfo.moduleGraph.depSnapshotModules,
                 cwd: this.opts.cwd,
                 mfsu: this,
             });
+            utils_1.logger.info('MFSU buildDeps');
+            utils_1.logger.debug(deps.map((dep) => dep.file).join(', '));
             yield this.depBuilder.build({
                 deps,
             });

package/dist/moduleGraph.d.ts

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

package/dist/moduleGraph.js

@@ -38,8 +38,10 @@ class ModuleGraph {
             }
             if (info.isRoot)
                 mod.isRoot = true;
-            if (importer)
+            if (importer) {
                 mod.importers.add(importer);
+                importer.importedModules.add(mod);
+            }
             mod.isDependency = isDependency;
             if (info.version !== undefined) {
                 mod.version = info.version;
@@ -73,6 +75,7 @@ class ModuleGraph {
                 importedModules: Array.from(value.importedModules).map((item) => item.file),
             };
             if (value.isRoot) {
+                fileModules[key].isRoot = true;
                 roots.push(key);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-beta.16",
+  "version": "4.0.0-beta.17",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -21,9 +21,9 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-beta.16",
-    "@umijs/bundler-utils": "4.0.0-beta.16",
-    "@umijs/utils": "4.0.0-beta.16"
+    "@umijs/bundler-esbuild": "4.0.0-beta.17",
+    "@umijs/bundler-utils": "4.0.0-beta.17",
+    "@umijs/utils": "4.0.0-beta.17"
   },
   "devDependencies": {
     "@types/express": "4.17.13",