perf: fix (#774)

webpack-contrib · Jun 28, 2021 · 6e1bb67 · 6e1bb67
1 parent 5551fbd
commit 6e1bb67
Show file tree

Hide file tree

Showing 33 changed files with 60 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.js b/src/index.js
@@ -58,11 +58,9 @@ class MiniCssExtractPlugin {
         this.content = content;
         this.media = media;
         this.sourceMap = sourceMap;
-        this.buildInfo = {
-          assets,
-          assetsInfo,
-        };
-        this.buildMeta = {};
+        this.assets = assets;
+        this.assetsInfo = assetsInfo;
+        this._needBuild = true;
       }
 
       // no source() so webpack 4 doesn't do add stuff to the bundle
@@ -103,34 +101,60 @@ class MiniCssExtractPlugin {
       }
 
       updateCacheModule(module) {
-        this.content = module.content;
-        this.media = module.media;
-        this.sourceMap = module.sourceMap;
+        if (
+          this.content !== module.content ||
+          this.media !== module.media ||
+          this.sourceMap !== module.sourceMap ||
+          this.assets !== module.assets ||
+          this.assetsInfo !== module.assetsInfo
+        ) {
+          this._needBuild = true;
+
+          this.content = module.content;
+          this.media = module.media;
+          this.sourceMap = module.sourceMap;
+          this.assets = module.assets;
+          this.assetsInfo = module.assetsInfo;
+        }
       }
 
       // eslint-disable-next-line class-methods-use-this
       needRebuild() {
-        return true;
+        return this._needBuild;
       }
 
       // eslint-disable-next-line class-methods-use-this
       needBuild(context, callback) {
-        callback(null, false);
+        callback(null, this._needBuild);
       }
 
       build(options, compilation, resolver, fileSystem, callback) {
-        this.buildInfo = {};
+        this.buildInfo = {
+          assets: this.assets,
+          assetsInfo: this.assetsInfo,
+          cacheable: true,
+          hash: this._computeHash(compilation.outputOptions.hashFunction),
+        };
         this.buildMeta = {};
+        this._needBuild = false;
 
         callback();
       }
 
-      updateHash(hash, context) {
-        super.updateHash(hash, context);
+      _computeHash(hashFunction) {
+        const hash = webpack.util.createHash(hashFunction);
 
         hash.update(this.content);
         hash.update(this.media || '');
-        hash.update(this.sourceMap ? JSON.stringify(this.sourceMap) : '');
+        hash.update(this.sourceMap || '');
+
+        return hash.digest('hex');
+      }
+
+      updateHash(hash, context) {
+        super.updateHash(hash, context);
+
+        hash.update(this.buildInfo.hash);
       }
 
       serialize(context) {
@@ -142,12 +166,17 @@ class MiniCssExtractPlugin {
         write(this.content);
         write(this.media);
         write(this.sourceMap);
-        write(this.buildInfo);
+        write(this.assets);
+        write(this.assetsInfo);
+
+        write(this._needBuild);
 
         super.serialize(context);
       }
 
       deserialize(context) {
+        this._needBuild = context.read();
+
         super.deserialize(context);
       }
     }
@@ -176,7 +205,8 @@ class MiniCssExtractPlugin {
             const content = read();
             const media = read();
             const sourceMap = read();
-            const { assets, assetsInfo } = read();
+            const assets = read();
+            const assetsInfo = read();
 
             const dep = new CssModule({
               context: contextModule,
@@ -364,7 +394,7 @@ class MiniCssExtractPlugin {
     if (this.options.experimentalUseImportModule) {
       if (!compiler.options.experiments) {
         throw new Error(
-          'experimentalUseImportModule is only support for webpack >= 5.32.0'
+          'experimentalUseImportModule is only support for webpack >= 5.33.2'
         );
       }
       if (typeof compiler.options.experiments.executeModule === 'undefined') {
@@ -613,8 +643,14 @@ class MiniCssExtractPlugin {
             : webpack.util.createHash;
           const hash = createHash(hashFunction);
 
-          for (const m of modules) {
-            m.updateHash(hash, { chunkGraph });
+          if (isWebpack4) {
+            for (const m of modules) {
+              m.updateHash(hash);
+            }
+          } else {
+            for (const m of modules) {
+              hash.update(chunkGraph.getModuleHash(m, chunk.runtime));
+            }
           }
 
           // eslint-disable-next-line no-param-reassign

diff --git a/...5-importModule/0.619e4b98882ea3a2aba3.css → ...5-importModule/0.a0b77e3a9967a95b3ac2.css b/...5-importModule/0.619e4b98882ea3a2aba3.css → ...5-importModule/0.a0b77e3a9967a95b3ac2.css
diff --git a/...k-5-importModule/619e4b98882ea3a2aba3.css → ...k-5-importModule/a0b77e3a9967a95b3ac2.css b/...k-5-importModule/619e4b98882ea3a2aba3.css → ...k-5-importModule/a0b77e3a9967a95b3ac2.css
diff --git a/test/cases/chunkFilename-fullhash/expected/webpack-5-importModule/main.js b/test/cases/chunkFilename-fullhash/expected/webpack-5-importModule/main.js
@@ -73,7 +73,7 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	(() => {
-/******/ 		__webpack_require__.h = () => ("619e4b98882ea3a2aba3")
+/******/ 		__webpack_require__.h = () => ("a0b77e3a9967a95b3ac2")
 /******/ 	})();
 /******/ 	
 /******/ 	/* webpack/runtime/global */

diff --git a/...cted/webpack-5/0.962555dd7355e6c261df.css → ...cted/webpack-5/0.f8dea56ca966b9c551f2.css b/...cted/webpack-5/0.962555dd7355e6c261df.css → ...cted/webpack-5/0.f8dea56ca966b9c551f2.css
diff --git a/...pected/webpack-5/962555dd7355e6c261df.css → ...pected/webpack-5/f8dea56ca966b9c551f2.css b/...pected/webpack-5/962555dd7355e6c261df.css → ...pected/webpack-5/f8dea56ca966b9c551f2.css
diff --git a/test/cases/chunkFilename-fullhash/expected/webpack-5/main.js b/test/cases/chunkFilename-fullhash/expected/webpack-5/main.js
@@ -73,7 +73,7 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	(() => {
-/******/ 		__webpack_require__.h = () => ("962555dd7355e6c261df")
+/******/ 		__webpack_require__.h = () => ("f8dea56ca966b9c551f2")
 /******/ 	})();
 /******/ 	
 /******/ 	/* webpack/runtime/global */

diff --git a/...mport/expected/1.a2e2caac15fbc316194f.css → ...mport/expected/1.88fb74fe1cb22093f204.css b/...mport/expected/1.a2e2caac15fbc316194f.css → ...mport/expected/1.88fb74fe1cb22093f204.css
diff --git a/...mport/expected/2.b93278edf8733a516ab1.css → ...mport/expected/2.52b14831e64cae07fa20.css b/...mport/expected/2.b93278edf8733a516ab1.css → ...mport/expected/2.52b14831e64cae07fa20.css
diff --git a/...pected/webpack-4/96236f7f51b351aabd20.css → ...pected/webpack-4/45abc72feb203941b169.css b/...pected/webpack-4/96236f7f51b351aabd20.css → ...pected/webpack-4/45abc72feb203941b169.css
diff --git a/...pected/webpack-4/f22bc5a793a5a86ad253.css → ...pected/webpack-4/94cfefd2079cb855c465.css b/...pected/webpack-4/f22bc5a793a5a86ad253.css → ...pected/webpack-4/94cfefd2079cb855c465.css
diff --git a/...k-5-importModule/15a667c7583f9b9ec41d.css → ...k-5-importModule/1cd4a7654bac4107104f.css b/...k-5-importModule/15a667c7583f9b9ec41d.css → ...k-5-importModule/1cd4a7654bac4107104f.css
diff --git a/...k-5-importModule/ffa19619c12a79d133f4.css → ...k-5-importModule/788f5dc856f2e114b45c.css b/...k-5-importModule/ffa19619c12a79d133f4.css → ...k-5-importModule/788f5dc856f2e114b45c.css
diff --git a/...pected/webpack-5/15a667c7583f9b9ec41d.css → ...pected/webpack-5/1cd4a7654bac4107104f.css b/...pected/webpack-5/15a667c7583f9b9ec41d.css → ...pected/webpack-5/1cd4a7654bac4107104f.css
diff --git a/...pected/webpack-5/ffa19619c12a79d133f4.css → ...pected/webpack-5/788f5dc856f2e114b45c.css b/...pected/webpack-5/ffa19619c12a79d133f4.css → ...pected/webpack-5/788f5dc856f2e114b45c.css
diff --git a/...webpack-4/1.main.c4d90d38e7a606ae4d4c.css → ...webpack-4/1.main.45423f56597309256073.css b/...webpack-4/1.main.c4d90d38e7a606ae4d4c.css → ...webpack-4/1.main.45423f56597309256073.css
diff --git a/...webpack-4/2.main.64d1032b1547f22458a7.css → ...webpack-4/2.main.950eec8c261fd54102ea.css b/...webpack-4/2.main.64d1032b1547f22458a7.css → ...webpack-4/2.main.950eec8c261fd54102ea.css
diff --git a/...ortModule/1.main.a7263f8f763dcf4051bc.css → ...ortModule/1.main.a45a4571ab5cece12cf0.css b/...ortModule/1.main.a7263f8f763dcf4051bc.css → ...ortModule/1.main.a45a4571ab5cece12cf0.css
diff --git a/...ortModule/2.main.a85c9b6a9dce223262b9.css → ...ortModule/2.main.c282a646790b09956021.css b/...ortModule/2.main.a85c9b6a9dce223262b9.css → ...ortModule/2.main.c282a646790b09956021.css
diff --git a/...webpack-5/1.main.a7263f8f763dcf4051bc.css → ...webpack-5/1.main.a45a4571ab5cece12cf0.css b/...webpack-5/1.main.a7263f8f763dcf4051bc.css → ...webpack-5/1.main.a45a4571ab5cece12cf0.css
diff --git a/...webpack-5/2.main.a85c9b6a9dce223262b9.css → ...webpack-5/2.main.c282a646790b09956021.css b/...webpack-5/2.main.a85c9b6a9dce223262b9.css → ...webpack-5/2.main.c282a646790b09956021.css
diff --git a/...ebpack-4/style.30d1e86f422f446d669b.1.css → ...ebpack-4/style.05ce3c307a634dcd5169.1.css b/...ebpack-4/style.30d1e86f422f446d669b.1.css → ...ebpack-4/style.05ce3c307a634dcd5169.1.css
diff --git a/...ebpack-4/style.b80413d497a74d66cee9.2.css → ...ebpack-4/style.c9487d3c46193641a005.2.css b/...ebpack-4/style.b80413d497a74d66cee9.2.css → ...ebpack-4/style.c9487d3c46193641a005.2.css
diff --git a/...rtModule/style.334e3250146c69e0e055.2.css → ...rtModule/style.00aa669429946cee3d20.2.css b/...rtModule/style.334e3250146c69e0e055.2.css → ...rtModule/style.00aa669429946cee3d20.2.css
diff --git a/...rtModule/style.229314c8bccc7c31e2f3.1.css → ...rtModule/style.17f5571b796a525cec79.1.css b/...rtModule/style.229314c8bccc7c31e2f3.1.css → ...rtModule/style.17f5571b796a525cec79.1.css
diff --git a/...ebpack-5/style.94f8540194627e143931.2.css → ...ebpack-5/style.3e1ac9a6569d80b3d351.2.css b/...ebpack-5/style.94f8540194627e143931.2.css → ...ebpack-5/style.3e1ac9a6569d80b3d351.2.css
diff --git a/...ebpack-5/style.e9af1cbcacecfbc5d911.1.css → ...ebpack-5/style.678e24a6a30ce54e924b.1.css b/...ebpack-5/style.e9af1cbcacecfbc5d911.1.css → ...ebpack-5/style.678e24a6a30ce54e924b.1.css
diff --git a/...d/webpack-4/main.c4d90d38e7a606ae4d4c.css → ...d/webpack-4/main.45423f56597309256073.css b/...d/webpack-4/main.c4d90d38e7a606ae4d4c.css → ...d/webpack-4/main.45423f56597309256073.css
diff --git a/...mportModule/main.a7263f8f763dcf4051bc.css → ...mportModule/main.a45a4571ab5cece12cf0.css b/...mportModule/main.a7263f8f763dcf4051bc.css → ...mportModule/main.a45a4571ab5cece12cf0.css
diff --git a/test/cases/runtime/expected/webpack-5-importModule/runtime~main.js b/test/cases/runtime/expected/webpack-5-importModule/runtime~main.js
@@ -130,7 +130,7 @@
 /******/ 		// This function allow to reference all chunks
 /******/ 		__webpack_require__.miniCssF = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "" + "main" + "." + "a7263f8f763dcf4051bc" + ".css";
+/******/ 			return "" + "main" + "." + "a45a4571ab5cece12cf0" + ".css";
 /******/ 		};
 /******/ 	})();
 /******/ 	

diff --git a/...d/webpack-5/main.a7263f8f763dcf4051bc.css → ...d/webpack-5/main.a45a4571ab5cece12cf0.css b/...d/webpack-5/main.a7263f8f763dcf4051bc.css → ...d/webpack-5/main.a45a4571ab5cece12cf0.css
diff --git a/test/cases/runtime/expected/webpack-5/runtime~main.js b/test/cases/runtime/expected/webpack-5/runtime~main.js
@@ -130,7 +130,7 @@
 /******/ 		// This function allow to reference all chunks
 /******/ 		__webpack_require__.miniCssF = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "" + "main" + "." + "a7263f8f763dcf4051bc" + ".css";
+/******/ 			return "" + "main" + "." + "a45a4571ab5cece12cf0" + ".css";
 /******/ 		};
 /******/ 	})();
 /******/