Skip to content

Commit

Permalink
fix: identifier for CssModule (#677)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexander-akait
alexander-akait authored Jan 13, 2021
1 parent 359c00f commit 117a97a
Show file tree
Hide file tree
Showing 22 changed files with 1,090 additions and 1,570 deletions.
2,412 changes: 971 additions & 1,441 deletions package-lock.json
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,35 +48,35 @@
"webpack-sources": "^1.1.0"
},
"devDependencies": {
"@babel/cli": "^7.12.1",
"@babel/core": "^7.12.3",
"@babel/preset-env": "^7.12.1",
"@babel/cli": "^7.12.10",
"@babel/core": "^7.12.10",
"@babel/preset-env": "^7.12.11",
"@commitlint/cli": "^11.0.0",
"@commitlint/config-conventional": "^11.0.0",
"@webpack-contrib/defaults": "^6.3.0",
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.6.3",
"bootstrap": "^4.5.3",
"cross-env": "^7.0.2",
"cross-env": "^7.0.3",
"css-loader": "^5.0.1",
"del": "^6.0.0",
"del-cli": "^3.0.1",
"es-check": "^5.1.2",
"eslint": "^7.13.0",
"eslint-config-prettier": "^6.15.0",
"es-check": "^5.2.0",
"eslint": "^7.17.0",
"eslint-config-prettier": "^7.1.0",
"eslint-plugin-import": "^2.22.1",
"file-loader": "^6.2.0",
"husky": "^4.3.0",
"husky": "^4.3.7",
"jest": "^26.6.3",
"jsdom": "^16.4.0",
"lint-staged": "^10.4.0",
"lint-staged": "^10.5.3",
"memfs": "^3.0.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.1.2",
"standard-version": "^9.0.0",
"prettier": "^2.2.1",
"standard-version": "^9.1.0",
"webpack": "^5.9.0",
"webpack-cli": "^4.2.0",
"webpack-cli": "^4.3.1",
"webpack-dev-server": "^3.7.2"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion src/CssModule.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class CssModule extends webpack.Module {
}

identifier() {
return `css ${this._identifier} ${this._identifierIndex}`;
return `css|${this._identifier}|${this._identifierIndex}`;
}

readableIdentifier(requestShortener) {
Expand Down
4 changes: 1 addition & 3 deletions test/cases/asset-modules/test.filter.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const webpack = require('webpack');

module.exports = () => {
return webpack.version[0] !== '4';
};
module.exports = () => webpack.version[0] !== '4';
0 ...pected/webpack-5/0f36361d4b50faed4928.css → ...pected/webpack-5/7cb1c141341f756e4bad.css
View file
File renamed without changes.
0 ...pected/webpack-5/35dbeb8e6cb82c82c80c.css → ...pected/webpack-5/8c6ccc7bf17a4be06b2c.css
View file
File renamed without changes.
0 ...webpack-5/1.main.6521a335718b303aa5f2.css → ...webpack-5/1.main.a3f451f9bc6595c1e658.css
View file
File renamed without changes.
0 ...webpack-5/2.main.7a77891ac7cc86d3d7b7.css → ...webpack-5/2.main.927452a5d0a6ce7dbea3.css
View file
File renamed without changes.
73 changes: 35 additions & 38 deletions test/cases/dependOn-multiple-files-per-entry/expected/webpack-5/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ __webpack_require__.r(__webpack_exports__);
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = __webpack_modules__;
/******/
/******/ // the startup function
/******/ // It's empty as some runtime module handles the default behavior
/******/ __webpack_require__.x = x => {}
/************************************************************************/
/******/ /* webpack/runtime/hasOwnProperty shorthand */
/******/ (() => {
Expand Down Expand Up @@ -105,43 +108,10 @@ __webpack_require__.r(__webpack_exports__);
/******/
/******/ // no HMR manifest
/******/
/******/ var checkDeferredModules = () => {
/******/
/******/ };
/******/ function checkDeferredModulesImpl() {
/******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i];
/******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ }
/******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ }
/******/ }
/******/ if(deferredModules.length === 0) {
/******/ __webpack_require__.x();
/******/ __webpack_require__.x = () => {
/******/
/******/ }
/******/ }
/******/ return result;
/******/ }
/******/ __webpack_require__.x = () => {
/******/ // reset startup function so it can be called again when more startup code is added
/******/ __webpack_require__.x = () => {
/******/
/******/ }
/******/ chunkLoadingGlobal = chunkLoadingGlobal.slice();
/******/ for(var i = 0; i < chunkLoadingGlobal.length; i++) webpackJsonpCallback(chunkLoadingGlobal[i]);
/******/ return (checkDeferredModules = checkDeferredModulesImpl)();
/******/ };
/******/ var checkDeferredModules = x => {};
/******/
/******/ // install a JSONP callback for chunk loading
/******/ var webpackJsonpCallback = (data) => {
/******/ var webpackJsonpCallback = (parentChunkLoadingFunction, data) => {
/******/ var [chunkIds, moreModules, runtime, executeModules] = data;
/******/ // add "moreModules" to the modules object,
/******/ // then flag all "chunkIds" as loaded and fire callback
Expand All @@ -159,7 +129,7 @@ __webpack_require__.r(__webpack_exports__);
/******/ }
/******/ }
/******/ if(runtime) runtime(__webpack_require__);
/******/ parentChunkLoadingFunction(data);
/******/ if(parentChunkLoadingFunction) parentChunkLoadingFunction(data);
/******/ while(resolves.length) {
/******/ resolves.shift()();
/******/ }
Expand All @@ -172,8 +142,35 @@ __webpack_require__.r(__webpack_exports__);
/******/ }
/******/
/******/ var chunkLoadingGlobal = self["webpackChunk"] = self["webpackChunk"] || [];
/******/ var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);
/******/ chunkLoadingGlobal.push = webpackJsonpCallback;
/******/ chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0));
/******/ chunkLoadingGlobal.push = webpackJsonpCallback.bind(null, chunkLoadingGlobal.push.bind(chunkLoadingGlobal));
/******/
/******/ function checkDeferredModulesImpl() {
/******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i];
/******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ }
/******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ }
/******/ }
/******/ if(deferredModules.length === 0) {
/******/ __webpack_require__.x();
/******/ __webpack_require__.x = x => {};
/******/ }
/******/ return result;
/******/ }
/******/ var startup = __webpack_require__.x;
/******/ __webpack_require__.x = () => {
/******/ // reset startup function so it can be called again when more startup code is added
/******/ __webpack_require__.x = startup || (x => {});
/******/ return (checkDeferredModules = checkDeferredModulesImpl)();
/******/ };
/******/ })();
/******/
/************************************************************************/
Expand Down
4 changes: 1 addition & 3 deletions test/cases/dependOn-multiple-files-per-entry/test.filter.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const webpack = require('webpack');

module.exports = () => {
return webpack.version[0] !== '4';
};
module.exports = () => webpack.version[0] !== '4';
73 changes: 35 additions & 38 deletions test/cases/dependOn/expected/webpack-5/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ __webpack_require__.r(__webpack_exports__);
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = __webpack_modules__;
/******/
/******/ // the startup function
/******/ // It's empty as some runtime module handles the default behavior
/******/ __webpack_require__.x = x => {}
/************************************************************************/
/******/ /* webpack/runtime/hasOwnProperty shorthand */
/******/ (() => {
Expand Down Expand Up @@ -87,43 +90,10 @@ __webpack_require__.r(__webpack_exports__);
/******/
/******/ // no HMR manifest
/******/
/******/ var checkDeferredModules = () => {
/******/
/******/ };
/******/ function checkDeferredModulesImpl() {
/******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i];
/******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ }
/******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ }
/******/ }
/******/ if(deferredModules.length === 0) {
/******/ __webpack_require__.x();
/******/ __webpack_require__.x = () => {
/******/
/******/ }
/******/ }
/******/ return result;
/******/ }
/******/ __webpack_require__.x = () => {
/******/ // reset startup function so it can be called again when more startup code is added
/******/ __webpack_require__.x = () => {
/******/
/******/ }
/******/ chunkLoadingGlobal = chunkLoadingGlobal.slice();
/******/ for(var i = 0; i < chunkLoadingGlobal.length; i++) webpackJsonpCallback(chunkLoadingGlobal[i]);
/******/ return (checkDeferredModules = checkDeferredModulesImpl)();
/******/ };
/******/ var checkDeferredModules = x => {};
/******/
/******/ // install a JSONP callback for chunk loading
/******/ var webpackJsonpCallback = (data) => {
/******/ var webpackJsonpCallback = (parentChunkLoadingFunction, data) => {
/******/ var [chunkIds, moreModules, runtime, executeModules] = data;
/******/ // add "moreModules" to the modules object,
/******/ // then flag all "chunkIds" as loaded and fire callback
Expand All @@ -141,7 +111,7 @@ __webpack_require__.r(__webpack_exports__);
/******/ }
/******/ }
/******/ if(runtime) runtime(__webpack_require__);
/******/ parentChunkLoadingFunction(data);
/******/ if(parentChunkLoadingFunction) parentChunkLoadingFunction(data);
/******/ while(resolves.length) {
/******/ resolves.shift()();
/******/ }
Expand All @@ -154,8 +124,35 @@ __webpack_require__.r(__webpack_exports__);
/******/ }
/******/
/******/ var chunkLoadingGlobal = self["webpackChunk"] = self["webpackChunk"] || [];
/******/ var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);
/******/ chunkLoadingGlobal.push = webpackJsonpCallback;
/******/ chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0));
/******/ chunkLoadingGlobal.push = webpackJsonpCallback.bind(null, chunkLoadingGlobal.push.bind(chunkLoadingGlobal));
/******/
/******/ function checkDeferredModulesImpl() {
/******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i];
/******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ }
/******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ }
/******/ }
/******/ if(deferredModules.length === 0) {
/******/ __webpack_require__.x();
/******/ __webpack_require__.x = x => {};
/******/ }
/******/ return result;
/******/ }
/******/ var startup = __webpack_require__.x;
/******/ __webpack_require__.x = () => {
/******/ // reset startup function so it can be called again when more startup code is added
/******/ __webpack_require__.x = startup || (x => {});
/******/ return (checkDeferredModules = checkDeferredModulesImpl)();
/******/ };
/******/ })();
/******/
/************************************************************************/
Expand Down
4 changes: 1 addition & 3 deletions test/cases/dependOn/test.filter.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const webpack = require('webpack');

module.exports = () => {
return webpack.version[0] !== '4';
};
module.exports = () => webpack.version[0] !== '4';
4 changes: 3 additions & 1 deletion test/cases/hmr/expected/webpack-5/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ module.exports = function (urlString) {
/******/ var inProgress = {};
/******/ // data-webpack is not used as build has no uniqueName
/******/ // loadScript function to load a script via script tag
/******/ __webpack_require__.l = (url, done, key) => {
/******/ __webpack_require__.l = (url, done, key, chunkId) => {
/******/ if(inProgress[url]) { inProgress[url].push(done); return; }
/******/ var script, needAttach;
/******/ if(key !== undefined) {
Expand Down Expand Up @@ -1389,6 +1389,8 @@ module.exports = function (urlString) {
/******/ // no deferred startup
/******/
/******/ // no jsonp function
/******/
/******/ // no deferred startup
/******/ })();
/******/
/************************************************************************/
Expand Down
14 changes: 8 additions & 6 deletions test/cases/insert-function/expected/webpack-5/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
/******/ var inProgress = {};
/******/ // data-webpack is not used as build has no uniqueName
/******/ // loadScript function to load a script via script tag
/******/ __webpack_require__.l = (url, done, key) => {
/******/ __webpack_require__.l = (url, done, key, chunkId) => {
/******/ if(inProgress[url]) { inProgress[url].push(done); return; }
/******/ var script, needAttach;
/******/ if(key !== undefined) {
Expand Down Expand Up @@ -280,7 +280,7 @@
/******/ }
/******/ }
/******/ };
/******/ __webpack_require__.l(url, loadingEnded, "chunk-" + chunkId);
/******/ __webpack_require__.l(url, loadingEnded, "chunk-" + chunkId, chunkId);
/******/ } else installedChunks[chunkId] = 0;
/******/ }
/******/ }
Expand All @@ -297,7 +297,7 @@
/******/ // no deferred startup
/******/
/******/ // install a JSONP callback for chunk loading
/******/ var webpackJsonpCallback = (data) => {
/******/ var webpackJsonpCallback = (parentChunkLoadingFunction, data) => {
/******/ var [chunkIds, moreModules, runtime] = data;
/******/ // add "moreModules" to the modules object,
/******/ // then flag all "chunkIds" as loaded and fire callback
Expand All @@ -315,16 +315,18 @@
/******/ }
/******/ }
/******/ if(runtime) runtime(__webpack_require__);
/******/ parentChunkLoadingFunction(data);
/******/ if(parentChunkLoadingFunction) parentChunkLoadingFunction(data);
/******/ while(resolves.length) {
/******/ resolves.shift()();
/******/ }
/******/
/******/ }
/******/
/******/ var chunkLoadingGlobal = self["webpackChunk"] = self["webpackChunk"] || [];
/******/ var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);
/******/ chunkLoadingGlobal.push = webpackJsonpCallback;
/******/ chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0));
/******/ chunkLoadingGlobal.push = webpackJsonpCallback.bind(null, chunkLoadingGlobal.push.bind(chunkLoadingGlobal));
/******/
/******/ // no deferred startup
/******/ })();
/******/
/************************************************************************/
Expand Down
14 changes: 8 additions & 6 deletions test/cases/insert-string/expected/webpack-5/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
/******/ var inProgress = {};
/******/ // data-webpack is not used as build has no uniqueName
/******/ // loadScript function to load a script via script tag
/******/ __webpack_require__.l = (url, done, key) => {
/******/ __webpack_require__.l = (url, done, key, chunkId) => {
/******/ if(inProgress[url]) { inProgress[url].push(done); return; }
/******/ var script, needAttach;
/******/ if(key !== undefined) {
Expand Down Expand Up @@ -275,7 +275,7 @@
/******/ }
/******/ }
/******/ };
/******/ __webpack_require__.l(url, loadingEnded, "chunk-" + chunkId);
/******/ __webpack_require__.l(url, loadingEnded, "chunk-" + chunkId, chunkId);
/******/ } else installedChunks[chunkId] = 0;
/******/ }
/******/ }
Expand All @@ -292,7 +292,7 @@
/******/ // no deferred startup
/******/
/******/ // install a JSONP callback for chunk loading
/******/ var webpackJsonpCallback = (data) => {
/******/ var webpackJsonpCallback = (parentChunkLoadingFunction, data) => {
/******/ var [chunkIds, moreModules, runtime] = data;
/******/ // add "moreModules" to the modules object,
/******/ // then flag all "chunkIds" as loaded and fire callback
Expand All @@ -310,16 +310,18 @@
/******/ }
/******/ }
/******/ if(runtime) runtime(__webpack_require__);
/******/ parentChunkLoadingFunction(data);
/******/ if(parentChunkLoadingFunction) parentChunkLoadingFunction(data);
/******/ while(resolves.length) {
/******/ resolves.shift()();
/******/ }
/******/
/******/ }
/******/
/******/ var chunkLoadingGlobal = self["webpackChunk"] = self["webpackChunk"] || [];
/******/ var parentChunkLoadingFunction = chunkLoadingGlobal.push.bind(chunkLoadingGlobal);
/******/ chunkLoadingGlobal.push = webpackJsonpCallback;
/******/ chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null, 0));
/******/ chunkLoadingGlobal.push = webpackJsonpCallback.bind(null, chunkLoadingGlobal.push.bind(chunkLoadingGlobal));
/******/
/******/ // no deferred startup
/******/ })();
/******/
/************************************************************************/
Expand Down
Loading

0 comments on commit 117a97a

Please sign in to comment.