root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Improve performance of hashRegExp lookup"

This commit is contained in:
Ryan Wilson-Perkin 2023-03-10 10:04:26 -05:00 committed by GitHub
parent c989143379
commit 52b1b0e4ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lib/optimize/RealContentHashPlugin.js
View File

@ -178,43 +178,10 @@ class RealContentHashPlugin {
} }
} }
if (hashToAssets.size === 0) return; if (hashToAssets.size === 0) return;
const hashRegExps = Array.from(hashToAssets.keys(), quoteMeta).map( const hashRegExp = new RegExp(
hash => new RegExp(hash, "g") Array.from(hashToAssets.keys(), quoteMeta).join("|"),
"g"
); );
/**
* @param {string} str string to be matched against all hashRegExps
* @returns {string[] | null} matches found
*/
const hashMatch = str => {
/** @type {string[]} */
const results = [];
for (const hashRegExp of hashRegExps) {
const matches = str.match(hashRegExp);
if (matches) {
matches.forEach(match => results.push(match));
}
}
if (results.length) {
return results;
} else {
return null;
}
};
/**
* @param {string} str string to be replaced with all hashRegExps
* @param {function(string): string} fn replacement function to use when a hash is found
* @returns {string} replaced content
*/
const hashReplace = (str, fn) => {
let result = str;
for (const hashRegExp of hashRegExps) {
result = result.replace(hashRegExp, fn);
}
return result;
};
await Promise.all( await Promise.all(
assetsWithInfo.map(async asset => { assetsWithInfo.map(async asset => {
const { name, source, content, hashes } = asset; const { name, source, content, hashes } = asset;
@ -231,7 +198,7 @@ class RealContentHashPlugin {
await cacheAnalyse.providePromise(name, etag, () => { await cacheAnalyse.providePromise(name, etag, () => {
const referencedHashes = new Set(); const referencedHashes = new Set();
let ownHashes = new Set(); let ownHashes = new Set();
const inContent = hashMatch(content); const inContent = content.match(hashRegExp);
if (inContent) { if (inContent) {
for (const hash of inContent) { for (const hash of inContent) {
if (hashes.has(hash)) { if (hashes.has(hash)) {
@ -331,7 +298,7 @@ ${referencingAssets
identifier, identifier,
etag, etag,
() => { () => {
const newContent = hashReplace(asset.content, hash => const newContent = asset.content.replace(hashRegExp, hash =>
hashToNewHash.get(hash) hashToNewHash.get(hash)
); );
return new RawSource(newContent); return new RawSource(newContent);
@ -356,12 +323,15 @@ ${referencingAssets
identifier, identifier,
etag, etag,
() => { () => {
const newContent = hashReplace(asset.content, hash => { const newContent = asset.content.replace(
if (asset.ownHashes.has(hash)) { hashRegExp,
return ""; hash => {
if (asset.ownHashes.has(hash)) {
return "";
}
return hashToNewHash.get(hash);
} }
return hashToNewHash.get(hash); );
});
return new RawSource(newContent); return new RawSource(newContent);
} }
); );
@ -407,7 +377,7 @@ ${referencingAssets
await Promise.all( await Promise.all(
assetsWithInfo.map(async asset => { assetsWithInfo.map(async asset => {
await computeNewContent(asset); await computeNewContent(asset);
const newName = hashReplace(asset.name, hash => const newName = asset.name.replace(hashRegExp, hash =>
hashToNewHash.get(hash) hashToNewHash.get(hash)
); );