feat opt-in to transitive only side effects (webpack@5) (#599)

webpack-contrib · Oct 7, 2020 · 5fafdf8 · 5fafdf8
1 parent ef4bd79
commit 5fafdf8
Show file tree

Hide file tree

Showing 19 changed files with 384 additions and 132 deletions.
diff --git a/src/CssDependency.js b/src/CssDependency.js
@@ -20,6 +20,11 @@ class CssDependency extends webpack.Dependency {
     return `css-module-${this.identifier}-${this.identifierIndex}`;
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  getModuleEvaluationSideEffectsState() {
+    return webpack.ModuleGraphConnection.TRANSITIVE_ONLY;
+  }
+
   serialize(context) {
     const { write } = context;
 

diff --git a/test/TestCases.test.js b/test/TestCases.test.js
@@ -47,19 +47,23 @@ function compareDirectory(actual, expected) {
       const content = fs.readFileSync(path.resolve(expected, file), 'utf8');
       let actualContent;
 
-      try {
-        actualContent = fs.readFileSync(path.resolve(actual, file), 'utf8');
-      } catch (error) {
-        // eslint-disable-next-line no-console
-        console.log(error);
+      if (/^MISSING/.test(content)) {
+        expect(fs.existsSync(path.resolve(actual, file))).toBe(false);
+      } else {
+        try {
+          actualContent = fs.readFileSync(path.resolve(actual, file), 'utf8');
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.log(error);
 
-        const dir = fs.readdirSync(actual);
+          const dir = fs.readdirSync(actual);
 
-        // eslint-disable-next-line no-console
-        console.log({ [actual]: dir });
-      }
+          // eslint-disable-next-line no-console
+          console.log({ [actual]: dir });
+        }
 
-      expect(actualContent).toEqual(content);
+        expect(actualContent).toEqual(content);
+      }
     }
   }
 }
@@ -119,6 +123,10 @@ describe('TestCases', () => {
             done(err);
             return;
           }
+          if (stats.hasErrors()) {
+            done(new Error(stats.toString()));
+            return;
+          }
 
           done();
 

diff --git a/test/cases/dependOn-multiple-files-per-entry/expected/webpack-5/common.js b/test/cases/dependOn-multiple-files-per-entry/expected/webpack-5/common.js
@@ -1,37 +1,20 @@
 /******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ([
 /* 0 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _styleC_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var _styleC_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_styleC_css__WEBPACK_IMPORTED_MODULE_0__);
 
 
 
 /***/ }),
 /* 1 */
-/***/ (() => {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-/* 2 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _styleD_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
-/* harmony import */ var _styleD_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_styleD_css__WEBPACK_IMPORTED_MODULE_0__);
-
 
 
-/***/ }),
-/* 3 */
-/***/ (() => {
-
-// extracted by mini-css-extract-plugin
 
 /***/ })
 /******/ 	]);
@@ -63,30 +46,6 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 	__webpack_require__.m = __webpack_modules__;
 /******/ 	
 /************************************************************************/
-/******/ 	/* webpack/runtime/compat get default export */
-/******/ 	(() => {
-/******/ 		// getDefaultExport function for compatibility with non-harmony modules
-/******/ 		__webpack_require__.n = (module) => {
-/******/ 			var getter = module && module.__esModule ?
-/******/ 				() => module['default'] :
-/******/ 				() => module;
-/******/ 			__webpack_require__.d(getter, { a: getter });
-/******/ 			return getter;
-/******/ 		};
-/******/ 	})();
-/******/ 	
-/******/ 	/* webpack/runtime/define property getters */
-/******/ 	(() => {
-/******/ 		// define getter functions for harmony exports
-/******/ 		__webpack_require__.d = (exports, definition) => {
-/******/ 			for(var key in definition) {
-/******/ 				if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
-/******/ 					Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
-/******/ 				}
-/******/ 			}
-/******/ 		};
-/******/ 	})();
-/******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
 /******/ 	(() => {
 /******/ 		__webpack_require__.o = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop)
@@ -116,7 +75,7 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 		
 /******/ 		var deferredModules = [
 /******/ 			[0],
-/******/ 			[2]
+/******/ 			[1]
 /******/ 		];
 /******/ 		// no chunk on demand loading
 /******/ 		

diff --git a/test/cases/dependOn-multiple-files-per-entry/expected/webpack-5/entry1.js b/test/cases/dependOn-multiple-files-per-entry/expected/webpack-5/entry1.js
@@ -1,41 +1,23 @@
 (self["webpackChunk"] = self["webpackChunk"] || []).push([[1],[
 /* 0 */,
 /* 1 */,
-/* 2 */,
-/* 3 */,
-/* 4 */
+/* 2 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _styleB_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(5);
-/* harmony import */ var _styleB_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_styleB_css__WEBPACK_IMPORTED_MODULE_0__);
 
 
 
 /***/ }),
-/* 5 */
-/***/ (() => {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-/* 6 */
+/* 3 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _styleA_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7);
-/* harmony import */ var _styleA_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_styleA_css__WEBPACK_IMPORTED_MODULE_0__);
 
 
 
-/***/ }),
-/* 7 */
-/***/ (() => {
-
-// extracted by mini-css-extract-plugin
-
 /***/ })
 ],
-0,[[6,0],[4,0]]]);
+0,[[3,0],[2,0]]]);
diff --git a/test/cases/dependOn/expected/webpack-5/common.js b/test/cases/dependOn/expected/webpack-5/common.js
@@ -1,21 +1,13 @@
 /******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ([
 /* 0 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _styleB_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
-/* harmony import */ var _styleB_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_styleB_css__WEBPACK_IMPORTED_MODULE_0__);
 
 
 
-/***/ }),
-/* 1 */
-/***/ (() => {
-
-// extracted by mini-css-extract-plugin
-
 /***/ })
 /******/ 	]);
 /************************************************************************/
@@ -46,30 +38,6 @@ __webpack_require__.r(__webpack_exports__);
 /******/ 	__webpack_require__.m = __webpack_modules__;
 /******/ 	
 /************************************************************************/
-/******/ 	/* webpack/runtime/compat get default export */
-/******/ 	(() => {
-/******/ 		// getDefaultExport function for compatibility with non-harmony modules
-/******/ 		__webpack_require__.n = (module) => {
-/******/ 			var getter = module && module.__esModule ?
-/******/ 				() => module['default'] :
-/******/ 				() => module;
-/******/ 			__webpack_require__.d(getter, { a: getter });
-/******/ 			return getter;
-/******/ 		};
-/******/ 	})();
-/******/ 	
-/******/ 	/* webpack/runtime/define property getters */
-/******/ 	(() => {
-/******/ 		// define getter functions for harmony exports
-/******/ 		__webpack_require__.d = (exports, definition) => {
-/******/ 			for(var key in definition) {
-/******/ 				if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
-/******/ 					Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
-/******/ 				}
-/******/ 			}
-/******/ 		};
-/******/ 	})();
-/******/ 	
 /******/ 	/* webpack/runtime/hasOwnProperty shorthand */
 /******/ 	(() => {
 /******/ 		__webpack_require__.o = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop)

diff --git a/test/cases/dependOn/expected/webpack-5/entry1.js b/test/cases/dependOn/expected/webpack-5/entry1.js
@@ -1,22 +1,13 @@
 (self["webpackChunk"] = self["webpackChunk"] || []).push([[1],[
 /* 0 */,
-/* 1 */,
-/* 2 */
+/* 1 */
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _styleA_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
-/* harmony import */ var _styleA_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_styleA_css__WEBPACK_IMPORTED_MODULE_0__);
 
 
 
-/***/ }),
-/* 3 */
-/***/ (() => {
-
-// extracted by mini-css-extract-plugin
-
 /***/ })
 ],
-0,[[2,0]]]);
+0,[[1,0]]]);
diff --git a/test/cases/es-module-concatenation-modules/a.css b/test/cases/es-module-concatenation-modules/a.css
@@ -0,0 +1,3 @@
+.a {
+  background: red;
+}
diff --git a/test/cases/es-module-concatenation-modules/b.css b/test/cases/es-module-concatenation-modules/b.css
@@ -0,0 +1,3 @@
+.b {
+  background: green;
+}
diff --git a/test/cases/es-module-concatenation-modules/c.css b/test/cases/es-module-concatenation-modules/c.css
@@ -0,0 +1,3 @@
+.c {
+  background: blue;
+}
diff --git a/test/cases/es-module-concatenation-modules/expected/webpack-4/main.css b/test/cases/es-module-concatenation-modules/expected/webpack-4/main.css
@@ -0,0 +1,12 @@
+.foo__a {
+  background: red;
+}
+
+.foo__b {
+  background: green;
+}
+
+.foo__c {
+  background: blue;
+}
+