Skip to content
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

Jump to bottom

Fix compatibility with webpack 5 #698

Merged
merged 20 commits into from
Feb 15, 2021
Merged

Fix compatibility with webpack 5 #698

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7f6c5c5
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
4462c46
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
f4e361d
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
f2c95d1
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
ea6da87
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
b29c747
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
661bfd9
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
29b8752
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
7969c6d
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
9c8e5f7
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
3c59843
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
bbe10a1
fix: compatibility with webpack v5
alexander-akait Feb 9, 2021
b756e1f
test: fix
alexander-akait Feb 9, 2021
57511b2
fix: webpack 5 support
alexander-akait Feb 9, 2021
7505989
fix: webpack 5 support
alexander-akait Feb 9, 2021
0dc9b69
fix: webpack 5 support
alexander-akait Feb 9, 2021
98fedfa
fix: webpack 5 support
alexander-akait Feb 9, 2021
f261b0c
fix: webpack 5 support
alexander-akait Feb 14, 2021
cf882d2
fix: webpack 5 support
alexander-akait Feb 15, 2021
08f8e31
test: fix
alexander-akait Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
test: fix
  • Loading branch information
@alexander-akait
alexander-akait committed Feb 15, 2021
commit 08f8e3105def1be8b56fb6f7cad033cb25a40d6d
239 changes: 135 additions & 104 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"webpack-sources": "^1.1.0"
},
"devDependencies": {
"@babel/cli": "^7.12.13",
"@babel/core": "^7.12.13",
"@babel/preset-env": "^7.12.13",
"@babel/cli": "^7.12.16",
"@babel/core": "^7.12.16",
"@babel/preset-env": "^7.12.16",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@webpack-contrib/defaults": "^6.3.0",
Expand All @@ -59,11 +59,11 @@
"babel-jest": "^26.6.3",
"bootstrap": "^4.6.0",
"cross-env": "^7.0.3",
"css-loader": "^5.0.1",
"css-loader": "^5.0.2",
"del": "^6.0.0",
"del-cli": "^3.0.1",
"es-check": "^5.2.0",
"eslint": "^7.19.0",
"eslint": "^7.20.0",
"eslint-config-prettier": "^7.2.0",
"eslint-plugin-import": "^2.22.1",
"file-loader": "^6.2.0",
Expand All @@ -75,7 +75,7 @@
"npm-run-all": "^4.1.5",
"prettier": "^2.2.1",
"standard-version": "^9.1.0",
"webpack": "^5.21.2",
"webpack": "^5.22.0",
"webpack-cli": "^4.5.0",
"webpack-dev-server": "^3.7.2"
},
Expand Down
0 ...cted/webpack-5/0.df29c3e015e275d25a20.css → ...cted/webpack-5/0.f4055680253d27bc029e.css
View file
Open in desktop
File renamed without changes.
0 ...pected/webpack-5/df29c3e015e275d25a20.css → ...pected/webpack-5/f4055680253d27bc029e.css
View file
Open in desktop
File renamed without changes.
31 changes: 14 additions & 17 deletions test/cases/chunkFilename-fullhash/expected/webpack-5/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
/******/ (() => { // webpackBootstrap
/******/ "use strict";
/******/ var __webpack_modules__ = ([
/* 0 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

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


/* eslint-disable-next-line no-unused-expressions */
__webpack_require__.e(/* import() | async */ 0).then(__webpack_require__.bind(__webpack_require__, 2));


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

Expand Down Expand Up @@ -83,7 +72,7 @@ __webpack_require__.r(__webpack_exports__);
/******/
/******/ /* webpack/runtime/getFullHash */
/******/ (() => {
/******/ __webpack_require__.h = () => ("df29c3e015e275d25a20")
/******/ __webpack_require__.h = () => ("f4055680253d27bc029e")
/******/ })();
/******/
/******/ /* webpack/runtime/global */
Expand Down Expand Up @@ -349,9 +338,17 @@ __webpack_require__.r(__webpack_exports__);
/******/ })();
/******/
/************************************************************************/
/******/ // startup
/******/ // Load entry module
/******/ __webpack_require__(0);
/******/ // This entry module used 'exports' so it can't be inlined
var __webpack_exports__ = {};
// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
(() => {
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _style_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);


/* eslint-disable-next-line no-unused-expressions */
__webpack_require__.e(/* import() | async */ 0).then(__webpack_require__.bind(__webpack_require__, 2));

})();

/******/ })()
;
4 changes: 3 additions & 1 deletion test/cases/dependOn-multiple-files-per-entry/expected/webpack-5/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ __webpack_require__.r(__webpack_exports__);
/******/ })();
/******/
/************************************************************************/
/******/
/******/ // run startup
/******/ __webpack_require__.x();
/******/ var __webpack_exports__ = __webpack_require__.x();
/******/
/******/ })()
;
4 changes: 3 additions & 1 deletion test/cases/dependOn/expected/webpack-5/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ __webpack_require__.r(__webpack_exports__);
/******/ })();
/******/
/************************************************************************/
/******/
/******/ // run startup
/******/ __webpack_require__.x();
/******/ var __webpack_exports__ = __webpack_require__.x();
/******/
/******/ })()
;
99 changes: 34 additions & 65 deletions test/cases/es-module-concatenation-modules/expected/webpack-5/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,39 @@
/******/ (() => { // webpackBootstrap
/******/ "use strict";
/******/ var __webpack_modules__ = ([
/* 0 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

/******/ // The require scope
/******/ var __webpack_require__ = {};
/******/
/************************************************************************/
/******/ /* 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))
/******/ })();
/******/
/******/ /* webpack/runtime/make namespace object */
/******/ (() => {
/******/ // define __esModule on exports
/******/ __webpack_require__.r = (exports) => {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/ })();
/******/
/************************************************************************/
var __webpack_exports__ = {};
// ESM COMPAT FLAG
__webpack_require__.r(__webpack_exports__);

Expand Down Expand Up @@ -59,66 +89,5 @@ const c = "foo__c";
// eslint-disable-next-line no-console
console.log(index_namespaceObject);


/***/ })
/******/ ]);
/************************************************************************/
/******/ // The module cache
/******/ var __webpack_module_cache__ = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/ // Check if module is in cache
/******/ if(__webpack_module_cache__[moduleId]) {
/******/ return __webpack_module_cache__[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = __webpack_module_cache__[moduleId] = {
/******/ // no module.id needed
/******/ // no module.loaded needed
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/************************************************************************/
/******/ /* 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))
/******/ })();
/******/
/******/ /* webpack/runtime/make namespace object */
/******/ (() => {
/******/ // define __esModule on exports
/******/ __webpack_require__.r = (exports) => {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/ })();
/******/
/************************************************************************/
/******/ // startup
/******/ // Load entry module
/******/ __webpack_require__(0);
/******/ // This entry module used 'exports' so it can't be inlined
/******/ })()
;
65 changes: 17 additions & 48 deletions test/cases/es-module-concatenation/expected/webpack-5/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
/******/ (() => { // webpackBootstrap
/******/ "use strict";
/******/ var __webpack_modules__ = ([
/* 0 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

/******/ // The require scope
/******/ var __webpack_require__ = {};
/******/
/************************************************************************/
/******/ /* webpack/runtime/make namespace object */
/******/ (() => {
/******/ // define __esModule on exports
/******/ __webpack_require__.r = (exports) => {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/ })();
/******/
/************************************************************************/
var __webpack_exports__ = {};
// ESM COMPAT FLAG
__webpack_require__.r(__webpack_exports__);

Expand All @@ -21,49 +34,5 @@ __webpack_require__.r(__webpack_exports__);




/***/ })
/******/ ]);
/************************************************************************/
/******/ // The module cache
/******/ var __webpack_module_cache__ = {};
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/ // Check if module is in cache
/******/ if(__webpack_module_cache__[moduleId]) {
/******/ return __webpack_module_cache__[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = __webpack_module_cache__[moduleId] = {
/******/ // no module.id needed
/******/ // no module.loaded needed
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/************************************************************************/
/******/ /* webpack/runtime/make namespace object */
/******/ (() => {
/******/ // define __esModule on exports
/******/ __webpack_require__.r = (exports) => {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/ })();
/******/
/************************************************************************/
/******/ // startup
/******/ // Load entry module
/******/ __webpack_require__(0);
/******/ // This entry module used 'exports' so it can't be inlined
/******/ })()
;
29 changes: 13 additions & 16 deletions test/cases/es-named-export/expected/webpack-5/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
/******/ (() => { // webpackBootstrap
/******/ "use strict";
/******/ var __webpack_modules__ = ([
/* 0 */
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

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


// eslint-disable-next-line no-console
console.log({ css: _style_css__WEBPACK_IMPORTED_MODULE_0__.default, aClass: _style_css__WEBPACK_IMPORTED_MODULE_0__.aClass, bClass: _style_css__WEBPACK_IMPORTED_MODULE_0__.bClass, cClass: _style_css__WEBPACK_IMPORTED_MODULE_0__.cClass });


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

Expand Down Expand Up @@ -83,9 +72,17 @@ const cClass = "foo__style__cClass";
/******/ })();
/******/
/************************************************************************/
/******/ // startup
/******/ // Load entry module
/******/ __webpack_require__(0);
/******/ // This entry module used 'exports' so it can't be inlined
var __webpack_exports__ = {};
// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
(() => {
__webpack_require__.r(__webpack_exports__);
/* harmony import */ var _style_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);


// eslint-disable-next-line no-console
console.log({ css: _style_css__WEBPACK_IMPORTED_MODULE_0__.default, aClass: _style_css__WEBPACK_IMPORTED_MODULE_0__.aClass, bClass: _style_css__WEBPACK_IMPORTED_MODULE_0__.bClass, cClass: _style_css__WEBPACK_IMPORTED_MODULE_0__.cClass });

})();

/******/ })()
;
6 changes: 4 additions & 2 deletions test/cases/hmr/expected/webpack-5/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1402,9 +1402,11 @@ module.exports = function (urlString) {
/******/ })();
/******/
/************************************************************************/
/******/
/******/ // module cache are used so entry inlining is disabled
/******/ // startup
/******/ // Load entry module
/******/ __webpack_require__(0);
/******/ // Load entry module and return exports
/******/ var __webpack_exports__ = __webpack_require__(0);
/******/
/******/ })()
;
1 change: 1 addition & 0 deletions test/cases/insert-function/expected/webpack-5/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@
/******/ })();
/******/
/************************************************************************/
var __webpack_exports__ = {};
/* eslint-env browser */

// eslint-disable-next-line
Expand Down
1 change: 1 addition & 0 deletions test/cases/insert-string/expected/webpack-5/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@
/******/ })();
/******/
/************************************************************************/
var __webpack_exports__ = {};
/* eslint-env browser */

// eslint-disable-next-line
Expand Down
1 change: 1 addition & 0 deletions test/cases/insert-undefined/expected/webpack-5/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@
/******/ })();
/******/
/************************************************************************/
var __webpack_exports__ = {};
/* eslint-env browser */

// eslint-disable-next-line
Expand Down
4 changes: 3 additions & 1 deletion test/cases/runtime/expected/webpack-5/runtime~main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,9 @@
/******/ })();
/******/
/************************************************************************/
/******/
/******/ // run startup
/******/ __webpack_require__.x();
/******/ var __webpack_exports__ = __webpack_require__.x();
/******/
/******/ })()
;