Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
753 changes: 364 additions & 389 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@
"@webpack-contrib/defaults": "^6.3.0",
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.5.2",
"babel-jest": "^26.6.1",
"cross-env": "^7.0.2",
"css-loader": "^5.0.0",
"del": "^6.0.0",
"del-cli": "^3.0.1",
"es-check": "^5.1.1",
"eslint": "^7.11.0",
"eslint-config-prettier": "^6.13.0",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.14.0",
"eslint-plugin-import": "^2.22.1",
"file-loader": "^6.1.1",
"husky": "^4.3.0",
"jest": "^26.5.2",
"jest": "^26.6.1",
"jsdom": "^16.4.0",
"lint-staged": "^10.4.0",
"memfs": "^3.0.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.1.2",
"standard-version": "^9.0.0",
"webpack": "^5.1.3",
"webpack": "^5.3.0",
"webpack-cli": "^4.1.0",
"webpack-dev-server": "^3.7.2"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _styleC_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);



Expand All @@ -13,8 +14,25 @@ __webpack_require__.r(__webpack_exports__);
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

__webpack_require__.r(__webpack_exports__);
// extracted by mini-css-extract-plugin


/***/ }),
/* 2 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _styleD_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);



/***/ }),
/* 3 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

__webpack_require__.r(__webpack_exports__);
// extracted by mini-css-extract-plugin


/***/ })
/******/ ]);
Expand Down Expand Up @@ -75,7 +93,7 @@ __webpack_require__.r(__webpack_exports__);
/******/
/******/ var deferredModules = [
/******/ [0],
/******/ [1]
/******/ [2]
/******/ ];
/******/ // no chunk on demand loading
/******/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,45 @@
(self["webpackChunk"] = self["webpackChunk"] || []).push([[1],[
/* 0 */,
/* 1 */,
/* 2 */
/* 2 */,
/* 3 */,
/* 4 */
/***/ ((__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);



/***/ }),
/* 3 */
/* 5 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
// extracted by mini-css-extract-plugin


/***/ }),
/* 6 */
/***/ ((__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);



/***/ }),
/* 7 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
// extracted by mini-css-extract-plugin


/***/ })
],
0,[[3,0],[2,0]]]);
0,[[6,0],[4,0]]]);
9 changes: 9 additions & 0 deletions test/cases/dependOn/expected/webpack-5/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,18 @@
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _styleB_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);



/***/ }),
/* 1 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

__webpack_require__.r(__webpack_exports__);
// extracted by mini-css-extract-plugin


/***/ })
/******/ ]);
/************************************************************************/
Expand Down
15 changes: 13 additions & 2 deletions test/cases/dependOn/expected/webpack-5/entry1.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
(self["webpackChunk"] = self["webpackChunk"] || []).push([[1],[
/* 0 */,
/* 1 */
/* 1 */,
/* 2 */
/***/ ((__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);



/***/ }),
/* 3 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
// extracted by mini-css-extract-plugin


/***/ })
],
0,[[1,0]]]);
0,[[2,0]]]);
12 changes: 12 additions & 0 deletions test/cases/es-module-concatenation/expected/webpack-5/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,20 @@
/* 0 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

// ESM COMPAT FLAG
__webpack_require__.r(__webpack_exports__);

// CONCATENATED MODULE: ./a.css
// extracted by mini-css-extract-plugin

// CONCATENATED MODULE: ./b.css
// extracted by mini-css-extract-plugin

// CONCATENATED MODULE: ./c.css
// extracted by mini-css-extract-plugin

// CONCATENATED MODULE: ./index.js




Expand Down
5 changes: 4 additions & 1 deletion test/manual/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ makeButton('.lazy-button2', () => import('./lazy2.css'));
makeButton('.lazy-module-button', () =>
import('./lazy.module.css').then((module) => {
console.log(module);
document.querySelector('.lazy-css-module').classList.add(module.style);
document
.querySelector('.lazy-css-module')
// eslint-disable-next-line no-underscore-dangle
.classList.add(module.__esModule ? module.default.style : module.style);
})
);

Expand Down
7 changes: 5 additions & 2 deletions test/manual/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const Self = require('../../');
const ENABLE_HMR =
typeof process.env.ENABLE_HMR !== 'undefined'
? Boolean(process.env.ENABLE_HMR)
: false;
: true;

const ENABLE_ES_MODULE =
typeof process.env.ES_MODULE !== 'undefined'
? Boolean(process.env.ES_MODULE)
: false;
: true;

module.exports = {
mode: 'development',
Expand Down Expand Up @@ -39,6 +39,9 @@ module.exports = {
use: [
{
loader: Self.loader,
options: {
esModule: ENABLE_ES_MODULE,
},
},
{
loader: 'css-loader',
Expand Down