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

package/dist/babelPlugins/awaitImport/checkMatch.js

@@ -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

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;
             }
         });
     }

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

@@ -26,6 +26,7 @@ export declare class MFSU {
     depInfo: DepInfo;
     depBuilder: DepBuilder;
     depConfig: Configuration | null;
+    buildDepsAgain: boolean;
     constructor(opts: IOpts);
     asyncImport(content: string): string;
     setWebpackConfig(opts: {

package/dist/mfsu.js

@@ -33,12 +33,12 @@ 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.opts = opts;
         this.opts.mfName = this.opts.mfName || constants_1.DEFAULT_MF_NAME;
         this.opts.tmpBase =
@@ -162,16 +162,21 @@ 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().catch((e) => {
+                                utils_1.logger.error(e);
+                            });
+                        }
                     },
                 }),
-                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 +188,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 +199,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() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/mfsu",
-  "version": "4.0.0-canary.20220317.1",
+  "version": "4.0.0-canary.20220323.1",
   "description": "@umijs/mfsu",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/mfsu#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -22,9 +22,9 @@
     "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@umijs/bundler-esbuild": "4.0.0-canary.20220317.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220317.1",
-    "@umijs/utils": "4.0.0-canary.20220317.1",
+    "@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",
     "enhanced-resolve": "5.9.2"
   },
   "devDependencies": {