Skip to content

[pull] main from webpack:main #163

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

Merged
pull merged 3 commits into from
Feb 5, 2025
Merged

[pull] main from webpack:main #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
131d02f
(fix) Use module ids for final render order
dmichon-msft Feb 4, 2025
40c2a5f
(test) add case for sort by module ids
dmichon-msft Feb 5, 2025
4815712
fix: use module ids for final render order
alexander-akait Feb 5, 2025
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
4 changes: 2 additions & 2 deletions lib/asset/AssetModulesPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const {
ASSET_MODULE_TYPE_SOURCE
} = require("../ModuleTypeConstants");
const { cleverMerge } = require("../util/cleverMerge");
const { compareModulesByIdentifier } = require("../util/comparators");
const { compareModulesByIdOrIdentifier } = require("../util/comparators");
const createSchemaValidation = require("../util/create-schema-validation");
const memoize = require("../util/memoize");

Expand Down Expand Up @@ -189,7 +189,7 @@ class AssetModulesPlugin {
const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType(
chunk,
ASSET_MODULE_TYPE,
compareModulesByIdentifier
compareModulesByIdOrIdentifier(chunkGraph)
);
if (modules) {
for (const module of modules) {
Expand Down
15 changes: 11 additions & 4 deletions lib/css/CssModulesPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const CssSelfLocalIdentifierDependency = require("../dependencies/CssSelfLocalId
const CssUrlDependency = require("../dependencies/CssUrlDependency");
const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
const { compareModulesByIdentifier } = require("../util/comparators");
const { compareModulesByIdOrIdentifier } = require("../util/comparators");
const createSchemaValidation = require("../util/create-schema-validation");
const createHash = require("../util/createHash");
const { getUndoPath } = require("../util/identifier");
Expand Down Expand Up @@ -598,6 +598,10 @@ class CssModulesPlugin {
if (modulesByChunkGroup.length === 1)
return modulesByChunkGroup[0].list.reverse();

const boundCompareModulesByIdOrIdentifier = compareModulesByIdOrIdentifier(
compilation.chunkGraph
);

/**
* @param {{ list: Module[] }} a a
* @param {{ list: Module[] }} b b
Expand All @@ -608,7 +612,10 @@ class CssModulesPlugin {
return b.length === 0 ? 0 : 1;
}
if (b.length === 0) return -1;
return compareModulesByIdentifier(a[a.length - 1], b[b.length - 1]);
return boundCompareModulesByIdOrIdentifier(
a[a.length - 1],
b[b.length - 1]
);
};

modulesByChunkGroup.sort(compareModuleLists);
Expand Down Expand Up @@ -690,7 +697,7 @@ class CssModulesPlugin {
chunkGraph.getOrderedChunkModulesIterableBySourceType(
chunk,
"css-import",
compareModulesByIdentifier
compareModulesByIdOrIdentifier(chunkGraph)
)
),
compilation
Expand All @@ -702,7 +709,7 @@ class CssModulesPlugin {
chunkGraph.getOrderedChunkModulesIterableBySourceType(
chunk,
"css",
compareModulesByIdentifier
compareModulesByIdOrIdentifier(chunkGraph)
)
),
compilation
Expand Down
6 changes: 3 additions & 3 deletions lib/javascript/JavascriptModulesPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
const Template = require("../Template");
const { last, someInIterable } = require("../util/IterableHelpers");
const StringXor = require("../util/StringXor");
const { compareModulesByIdentifier } = require("../util/comparators");
const { compareModulesByIdOrIdentifier } = require("../util/comparators");
const {
getPathInAst,
getAllReferences,
Expand Down Expand Up @@ -678,7 +678,7 @@ class JavascriptModulesPlugin {
const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType(
chunk,
"javascript",
compareModulesByIdentifier
compareModulesByIdOrIdentifier(chunkGraph)
);
const allModules = modules ? Array.from(modules) : [];
let strictHeader;
Expand Down Expand Up @@ -757,7 +757,7 @@ class JavascriptModulesPlugin {
chunkGraph.getOrderedChunkModulesIterableBySourceType(
chunk,
"javascript",
compareModulesByIdentifier
compareModulesByIdOrIdentifier(chunkGraph)
) || []
);

Expand Down
4 changes: 2 additions & 2 deletions lib/wasm-async/AsyncWebAssemblyModulesPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Generator = require("../Generator");
const { tryRunOrWebpackError } = require("../HookWebpackError");
const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
const { compareModulesByIdentifier } = require("../util/comparators");
const { compareModulesByIdOrIdentifier } = require("../util/comparators");
const memoize = require("../util/memoize");

/** @typedef {import("webpack-sources").Source} Source */
Expand Down Expand Up @@ -146,7 +146,7 @@ class AsyncWebAssemblyModulesPlugin {

for (const module of chunkGraph.getOrderedChunkModulesIterable(
chunk,
compareModulesByIdentifier
compareModulesByIdOrIdentifier(chunkGraph)
)) {
if (module.type === WEBASSEMBLY_MODULE_TYPE_ASYNC) {
const filenameTemplate =
Expand Down
4 changes: 2 additions & 2 deletions lib/wasm-sync/WebAssemblyModulesPlugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Generator = require("../Generator");
const { WEBASSEMBLY_MODULE_TYPE_SYNC } = require("../ModuleTypeConstants");
const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
const { compareModulesByIdentifier } = require("../util/comparators");
const { compareModulesByIdOrIdentifier } = require("../util/comparators");
const memoize = require("../util/memoize");
const WebAssemblyInInitialChunkError = require("./WebAssemblyInInitialChunkError");

Expand Down Expand Up @@ -89,7 +89,7 @@ class WebAssemblyModulesPlugin {

for (const module of chunkGraph.getOrderedChunkModulesIterable(
chunk,
compareModulesByIdentifier
compareModulesByIdOrIdentifier(chunkGraph)
)) {
if (module.type === WEBASSEMBLY_MODULE_TYPE_SYNC) {
const filenameTemplate =
Expand Down
1 change: 1 addition & 0 deletions test/configCases/optimization/issue-19184/files/file1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = module.id;
1 change: 1 addition & 0 deletions test/configCases/optimization/issue-19184/files/file2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = module.id;
1 change: 1 addition & 0 deletions test/configCases/optimization/issue-19184/files/file3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = module.id;
1 change: 1 addition & 0 deletions test/configCases/optimization/issue-19184/files/file4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = module.id;
1 change: 1 addition & 0 deletions test/configCases/optimization/issue-19184/files/file5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = module.id;
10 changes: 10 additions & 0 deletions test/configCases/optimization/issue-19184/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
it("should have module ids defined in sorted order", function() {
for (var i = 1; i <= 5; i++) {
var unusedModuleId = require("./files/file" + i + ".js");
}

const moduleIds = Object.keys(__webpack_modules__);

const sortedIds = moduleIds.slice().sort();
expect(moduleIds).toEqual(sortedIds);
});
1 change: 1 addition & 0 deletions test/configCases/optimization/issue-19184/warnings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = [[/hashed/, /deprecated/]];
6 changes: 6 additions & 0 deletions test/configCases/optimization/issue-19184/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/** @type {import("../../../../types").Configuration} */
module.exports = {
optimization: {
moduleIds: "hashed"
}
};
Loading