Skip to content

Remove empty modules #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Remove empty modules #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
84782d4
fix: remove empty modules
irudoy Apr 10, 2019
36c1456
fix: use `for of` instead of `forEach` for `modulesIterable`
irudoy May 31, 2019
55c959a
fix: add cjs test case
irudoy May 31, 2019
218a135
test: add manual stress test
irudoy Jun 3, 2019
bec4a2b
fix: avoid using issuer
irudoy Jun 3, 2019
1a26dca
fix: skip cjs when removing empty modules, refactor
irudoy Jul 31, 2019
ba37daa
fix: add test/stress to .prettierignore
irudoy Jul 31, 2019
634784e
fix: css formatting
irudoy Jul 31, 2019
ee6be12
fix: improve SetMap
irudoy Oct 3, 2019
c70f4e3
fix: check CommonJS
irudoy Oct 3, 2019
396cba7
fix: add allowlist for supported dependencies
irudoy Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ trim_trailing_whitespace = true
[*.md]
insert_final_newline = true
trim_trailing_whitespace = false

[test/cases/**]
insert_final_newline = false
2 changes: 2 additions & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
/test/fixtures
/test/cases/*/expected
/test/js
/test/stress/dist
/test/stress/src/tmp
2 changes: 2 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
/test/fixtures
/test/cases/*/expected
/test/js
/test/stress/dist
/test/stress/src/tmp
CHANGELOG.md
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"test:watch": "cross-env NODE_ENV=test jest --watch",
"test:coverage": "cross-env NODE_ENV=test jest --collectCoverageFrom=\"src/**/*.js\" --coverage",
"test:manual": "npm run build && webpack-dev-server test/manual/src/index.js --open --config test/manual/webpack.config.js",
"test:stress": "node --max-old-space-size=8192 test/stress/build.js",
"pretest": "npm run lint",
"test": "cross-env NODE_ENV=test npm run test:coverage",
"defaults": "webpack-defaults"
Expand Down
63 changes: 63 additions & 0 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,24 @@ const REGEXP_NAME = /\[name\]/i;
const REGEXP_PLACEHOLDERS = /\[(name|id|chunkhash)\]/g;
const DEFAULT_FILENAME = '[name].css';

const EMPTY_MODULES_CLEANUP_DEP_TYPES = new Set([
'harmony side effect evaluation',
'import()',
'single entry',
]);

class SetMap extends Map {
add(key, value) {
const set = this.get(key);
// eslint-disable-next-line no-undefined
if (set === undefined) {
super.set(key, new Set([value]));
} else {
set.add(value);
}
}
}

class CssDependencyTemplate {
apply() {}
}
Expand Down Expand Up @@ -390,6 +408,51 @@ class MiniCssExtractPlugin {
return source;
}
);

compilation.hooks.optimizeChunks.tap(pluginName, (chunks) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be done earlier, maybe in finishModules. Otherwise unneeded things are done for these removed modules, i. e. added to chunks, assigned ids, etc.

const toRemoveMap = new SetMap();

for (const chunk of chunks) {
for (const module of chunk.modulesIterable) {
if (module.type === MODULE_TYPE) {
for (const cssModuleReason of module.reasons) {
let hasUnsupportedDependency = false;

for (const reason of cssModuleReason.module.reasons) {
if (
EMPTY_MODULES_CLEANUP_DEP_TYPES.has(reason.dependency.type)
) {
toRemoveMap.add(
reason.module || cssModuleReason.module,
reason.dependency
);
} else {
hasUnsupportedDependency = true;
}
}

if (
!hasUnsupportedDependency &&
cssModuleReason.module &&
cssModuleReason.module.buildMeta.extracted
) {
chunk.removeModule(cssModuleReason.module);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be unneeded when using finishModules hook.

}
}
}
}
}

for (const [module, set] of toRemoveMap) {
module.dependencies = module.dependencies.filter((d) => {
if (set.has(d)) {
d.disconnect();
return false;
}
return true;
});
}
});
});
}

Expand Down
5 changes: 5 additions & 0 deletions src/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,11 @@ export function pitch(request) {
? hotLoader(result, { context: this.context, options, locals })
: result;

this._module.buildMeta = {
...this._module.buildMeta,
extracted: !locals && !options.hmr,
};

return callback(null, resultSource);
});
}
Expand Down
0 .../cases/chunkFilename/expected/1.async.css → .../cases/chunkFilename/expected/0.async.css
View file
Open in desktop
File renamed without changes.
0 ...name-without-template/expected/1.main.css → ...name-without-template/expected/0.main.css
View file
Open in desktop
File renamed without changes.
110 changes: 110 additions & 0 deletions test/cases/nested/expected/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
/******/ }
/******/ };
/******/
/******/ // define __esModule on exports
/******/ __webpack_require__.r = function(exports) {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/
/******/ // create a fake namespace object
/******/ // mode & 1: value is a module id, require it
/******/ // mode & 2: merge all properties of value into the ns
/******/ // mode & 4: return value when already ns object
/******/ // mode & 8|1: behave like require
/******/ __webpack_require__.t = function(value, mode) {
/******/ if(mode & 1) value = __webpack_require__(value);
/******/ if(mode & 8) return value;
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
/******/ var ns = Object.create(null);
/******/ __webpack_require__.r(ns);
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
/******/ return ns;
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 0);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {

"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _component__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);





/***/ }),
/* 1 */,
/* 2 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {

"use strict";
__webpack_require__.r(__webpack_exports__);



/***/ })
/******/ ]);
0 test/cases/shared-import/expected/1.css → test/cases/shared-import/expected/0.css
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions test/cases/simple-async-source-map/expected/0.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions test/cases/simple-async-source-map/expected/0.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions test/cases/simple-async-source-map/expected/1.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/cases/simple-async-source-map/expected/1.css.map
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions test/cases/simple-async-source-map/expected/2.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/cases/simple-async-source-map/expected/2.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions test/cases/simple-async/expected/0.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.async {
background: blue;
}

4 changes: 0 additions & 4 deletions test/cases/simple-async/expected/1.css
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions test/cases/simple-async/expected/2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.async {
background: blue;
.in-async {
background: green;
}

4 changes: 4 additions & 0 deletions test/cases/simple-require/expected/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
body {
background: red;
}

101 changes: 101 additions & 0 deletions test/cases/simple-require/expected/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
/******/ }
/******/ };
/******/
/******/ // define __esModule on exports
/******/ __webpack_require__.r = function(exports) {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/
/******/ // create a fake namespace object
/******/ // mode & 1: value is a module id, require it
/******/ // mode & 2: merge all properties of value into the ns
/******/ // mode & 4: return value when already ns object
/******/ // mode & 8|1: behave like require
/******/ __webpack_require__.t = function(value, mode) {
/******/ if(mode & 1) value = __webpack_require__(value);
/******/ if(mode & 8) return value;
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
/******/ var ns = Object.create(null);
/******/ __webpack_require__.r(ns);
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
/******/ return ns;
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "";
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 0);
/******/ })
/************************************************************************/
/******/ ([
/* 0 */
/***/ (function(module, exports, __webpack_require__) {

__webpack_require__(1);


/***/ }),
/* 1 */
/***/ (function(module, exports, __webpack_require__) {

// extracted by mini-css-extract-plugin

/***/ })
/******/ ]);
1 change: 1 addition & 0 deletions test/cases/simple-require/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('./style.css');
3 changes: 3 additions & 0 deletions test/cases/simple-require/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
body {
background: red;
}
Loading