Skip to content

Commit e3ec454

Browse files
irudoyirudoy
committed
fix: remove empty modules
1 parent 392c4ae commit e3ec454

File tree

16 files changed

+263
-16
lines changed

16 files changed

+263
-16
lines changed

‎src/index.js

+30
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,36 @@ class MiniCssExtractPlugin {
432432
return source;
433433
}
434434
);
435+
436+
compilation.hooks.optimizeChunks.tap(pluginName, (chunks) => {
437+
for (const chunk of chunks) {
438+
chunk.modulesIterable.forEach((module) => {
439+
// eslint-disable-next-line no-param-reassign
440+
module.dependencies = module.dependencies.filter((dep) => {
441+
const hasCssDep =
442+
dep.module &&
443+
dep.module.dependencies.find(
444+
(d) => d.module && d.module.type === MODULE_TYPE
445+
);
446+
447+
if (hasCssDep) {
448+
dep.disconnect();
449+
return false;
450+
}
451+
452+
return true;
453+
});
454+
455+
if (
456+
module.type === MODULE_TYPE &&
457+
module.issuer &&
458+
module.issuer.buildMeta.extracted
459+
) {
460+
chunk.removeModule(module.issuer);
461+
}
462+
});
463+
}
464+
});
435465
});
436466
}
437467

‎src/loader.js

+16-6
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,23 @@ export function pitch(request) {
182182
}
183183

184184
let resultSource = `// extracted by ${pluginName}`;
185-
const result = locals
186-
? `\nmodule.exports = ${JSON.stringify(locals)};`
187-
: '';
185+
let extracted = true;
188186

189-
resultSource += options.hmr
190-
? hotLoader(result, { context: this.context, options, locals })
191-
: result;
187+
if (locals) {
188+
resultSource += `\nmodule.exports = ${JSON.stringify(locals)};`;
189+
extracted = false;
190+
}
191+
192+
if (options.hmr) {
193+
resultSource = hotLoader(resultSource, {
194+
context: this.context,
195+
options,
196+
locals,
197+
});
198+
extracted = false;
199+
}
200+
201+
this._module.buildMeta = { ...this._module.buildMeta, extracted };
192202

193203
return callback(null, resultSource);
194204
});

‎test/cases/js-hash/expected/style.35ee3780b5b76904cef5.css renamed to ‎test/cases/js-hash/expected/style.4155dc407bba0bd8abe3.css

File renamed without changes.

‎test/cases/js-hash/expected/style.ca7d26e87c697b1c7039.css renamed to ‎test/cases/js-hash/expected/style.e4f6b09c8cb9de6b25af.css

File renamed without changes.

‎test/cases/nested/expected/main.js

+110
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
/******/ (function(modules) { // webpackBootstrap
2+
/******/ // The module cache
3+
/******/ var installedModules = {};
4+
/******/
5+
/******/ // The require function
6+
/******/ function __webpack_require__(moduleId) {
7+
/******/
8+
/******/ // Check if module is in cache
9+
/******/ if(installedModules[moduleId]) {
10+
/******/ return installedModules[moduleId].exports;
11+
/******/ }
12+
/******/ // Create a new module (and put it into the cache)
13+
/******/ var module = installedModules[moduleId] = {
14+
/******/ i: moduleId,
15+
/******/ l: false,
16+
/******/ exports: {}
17+
/******/ };
18+
/******/
19+
/******/ // Execute the module function
20+
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
21+
/******/
22+
/******/ // Flag the module as loaded
23+
/******/ module.l = true;
24+
/******/
25+
/******/ // Return the exports of the module
26+
/******/ return module.exports;
27+
/******/ }
28+
/******/
29+
/******/
30+
/******/ // expose the modules object (__webpack_modules__)
31+
/******/ __webpack_require__.m = modules;
32+
/******/
33+
/******/ // expose the module cache
34+
/******/ __webpack_require__.c = installedModules;
35+
/******/
36+
/******/ // define getter function for harmony exports
37+
/******/ __webpack_require__.d = function(exports, name, getter) {
38+
/******/ if(!__webpack_require__.o(exports, name)) {
39+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
40+
/******/ }
41+
/******/ };
42+
/******/
43+
/******/ // define __esModule on exports
44+
/******/ __webpack_require__.r = function(exports) {
45+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
46+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
47+
/******/ }
48+
/******/ Object.defineProperty(exports, '__esModule', { value: true });
49+
/******/ };
50+
/******/
51+
/******/ // create a fake namespace object
52+
/******/ // mode & 1: value is a module id, require it
53+
/******/ // mode & 2: merge all properties of value into the ns
54+
/******/ // mode & 4: return value when already ns object
55+
/******/ // mode & 8|1: behave like require
56+
/******/ __webpack_require__.t = function(value, mode) {
57+
/******/ if(mode & 1) value = __webpack_require__(value);
58+
/******/ if(mode & 8) return value;
59+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
60+
/******/ var ns = Object.create(null);
61+
/******/ __webpack_require__.r(ns);
62+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
63+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
64+
/******/ return ns;
65+
/******/ };
66+
/******/
67+
/******/ // getDefaultExport function for compatibility with non-harmony modules
68+
/******/ __webpack_require__.n = function(module) {
69+
/******/ var getter = module && module.__esModule ?
70+
/******/ function getDefault() { return module['default']; } :
71+
/******/ function getModuleExports() { return module; };
72+
/******/ __webpack_require__.d(getter, 'a', getter);
73+
/******/ return getter;
74+
/******/ };
75+
/******/
76+
/******/ // Object.prototype.hasOwnProperty.call
77+
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
78+
/******/
79+
/******/ // __webpack_public_path__
80+
/******/ __webpack_require__.p = "";
81+
/******/
82+
/******/
83+
/******/ // Load entry module and return exports
84+
/******/ return __webpack_require__(__webpack_require__.s = 0);
85+
/******/ })
86+
/************************************************************************/
87+
/******/ ([
88+
/* 0 */
89+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
90+
91+
"use strict";
92+
__webpack_require__.r(__webpack_exports__);
93+
/* harmony import */ var _component__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
94+
95+
96+
97+
98+
99+
/***/ }),
100+
/* 1 */,
101+
/* 2 */
102+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
103+
104+
"use strict";
105+
__webpack_require__.r(__webpack_exports__);
106+
107+
108+
109+
/***/ })
110+
/******/ ]);

‎test/cases/shared-import/expected/1.css renamed to ‎test/cases/shared-import/expected/0.css

File renamed without changes.

‎test/cases/simple-async-source-map/expected/0.css

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/simple-async-source-map/expected/0.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/simple-async-source-map/expected/1.css

-4
This file was deleted.

‎test/cases/simple-async-source-map/expected/1.css.map

-1
This file was deleted.

‎test/cases/simple-async-source-map/expected/2.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/simple-async-source-map/expected/2.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/cases/simple-async/expected/0.css

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.async { background: blue; }
2+

‎test/cases/simple-async/expected/1.css

-2
This file was deleted.

‎test/cases/simple-async/expected/2.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
.async { background: blue; }
1+
.in-async { background: green; }
22

‎test/cases/simple/expected/main.js

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
/******/ (function(modules) { // webpackBootstrap
2+
/******/ // The module cache
3+
/******/ var installedModules = {};
4+
/******/
5+
/******/ // The require function
6+
/******/ function __webpack_require__(moduleId) {
7+
/******/
8+
/******/ // Check if module is in cache
9+
/******/ if(installedModules[moduleId]) {
10+
/******/ return installedModules[moduleId].exports;
11+
/******/ }
12+
/******/ // Create a new module (and put it into the cache)
13+
/******/ var module = installedModules[moduleId] = {
14+
/******/ i: moduleId,
15+
/******/ l: false,
16+
/******/ exports: {}
17+
/******/ };
18+
/******/
19+
/******/ // Execute the module function
20+
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
21+
/******/
22+
/******/ // Flag the module as loaded
23+
/******/ module.l = true;
24+
/******/
25+
/******/ // Return the exports of the module
26+
/******/ return module.exports;
27+
/******/ }
28+
/******/
29+
/******/
30+
/******/ // expose the modules object (__webpack_modules__)
31+
/******/ __webpack_require__.m = modules;
32+
/******/
33+
/******/ // expose the module cache
34+
/******/ __webpack_require__.c = installedModules;
35+
/******/
36+
/******/ // define getter function for harmony exports
37+
/******/ __webpack_require__.d = function(exports, name, getter) {
38+
/******/ if(!__webpack_require__.o(exports, name)) {
39+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
40+
/******/ }
41+
/******/ };
42+
/******/
43+
/******/ // define __esModule on exports
44+
/******/ __webpack_require__.r = function(exports) {
45+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
46+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
47+
/******/ }
48+
/******/ Object.defineProperty(exports, '__esModule', { value: true });
49+
/******/ };
50+
/******/
51+
/******/ // create a fake namespace object
52+
/******/ // mode & 1: value is a module id, require it
53+
/******/ // mode & 2: merge all properties of value into the ns
54+
/******/ // mode & 4: return value when already ns object
55+
/******/ // mode & 8|1: behave like require
56+
/******/ __webpack_require__.t = function(value, mode) {
57+
/******/ if(mode & 1) value = __webpack_require__(value);
58+
/******/ if(mode & 8) return value;
59+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
60+
/******/ var ns = Object.create(null);
61+
/******/ __webpack_require__.r(ns);
62+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
63+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
64+
/******/ return ns;
65+
/******/ };
66+
/******/
67+
/******/ // getDefaultExport function for compatibility with non-harmony modules
68+
/******/ __webpack_require__.n = function(module) {
69+
/******/ var getter = module && module.__esModule ?
70+
/******/ function getDefault() { return module['default']; } :
71+
/******/ function getModuleExports() { return module; };
72+
/******/ __webpack_require__.d(getter, 'a', getter);
73+
/******/ return getter;
74+
/******/ };
75+
/******/
76+
/******/ // Object.prototype.hasOwnProperty.call
77+
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
78+
/******/
79+
/******/ // __webpack_public_path__
80+
/******/ __webpack_require__.p = "";
81+
/******/
82+
/******/
83+
/******/ // Load entry module and return exports
84+
/******/ return __webpack_require__(__webpack_require__.s = 0);
85+
/******/ })
86+
/************************************************************************/
87+
/******/ ([
88+
/* 0 */
89+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
90+
91+
"use strict";
92+
__webpack_require__.r(__webpack_exports__);
93+
94+
95+
96+
/***/ })
97+
/******/ ]);

0 commit comments

Comments
 (0)