Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
improve merging of resolve and parsing options
by rules and via loader API Arrays overwrite by default, but can reference old value with "..."
- Loading branch information
Showing
17 changed files
with
143 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
/* | ||
MIT License http://www.opensource.org/licenses/mit-license.php | ||
Author Tobias Koppers @sokra | ||
*/ | ||
|
||
"use strict"; | ||
|
||
const mergeCache = new WeakMap(); | ||
|
||
/** | ||
* Merges two given objects and caches the result to avoid computation if same objects passed as arguments again. | ||
* @example | ||
* // performs cleverMerge(first, second), stores the result in WeakMap and returns result | ||
* cachedCleverMerge({a: 1}, {a: 2}) | ||
* {a: 2} | ||
* // when same arguments passed, gets the result from WeakMap and returns it. | ||
* cachedCleverMerge({a: 1}, {a: 2}) | ||
* {a: 2} | ||
* @param {object} first first object | ||
* @param {object} second second object | ||
* @returns {object} merged object of first and second object | ||
*/ | ||
const cachedCleverMerge = (first, second) => { | ||
let innerCache = mergeCache.get(first); | ||
if (innerCache === undefined) { | ||
innerCache = new WeakMap(); | ||
mergeCache.set(first, innerCache); | ||
} | ||
const prevMerge = innerCache.get(second); | ||
if (prevMerge !== undefined) return prevMerge; | ||
const newMerge = cleverMerge(first, second); | ||
innerCache.set(second, newMerge); | ||
return newMerge; | ||
}; | ||
|
||
/** | ||
* Merges two objects. Objects are not deeply merged. | ||
* TODO webpack 5: merge objects deeply clever. | ||
* Arrays might reference the old value with "..." | ||
* @param {object} first first object | ||
* @param {object} second second object | ||
* @returns {object} merged object of first and second object | ||
*/ | ||
const cleverMerge = (first, second) => { | ||
const newObject = Object.assign({}, first); | ||
for (const key of Object.keys(second)) { | ||
if (!(key in newObject)) { | ||
newObject[key] = second[key]; | ||
continue; | ||
} | ||
const secondValue = second[key]; | ||
if (!Array.isArray(secondValue)) { | ||
newObject[key] = secondValue; | ||
continue; | ||
} | ||
const firstValue = newObject[key]; | ||
if (Array.isArray(firstValue)) { | ||
const newArray = []; | ||
for (const item of secondValue) { | ||
if (item === "...") { | ||
for (const item of firstValue) { | ||
newArray.push(item); | ||
} | ||
} else { | ||
newArray.push(item); | ||
} | ||
} | ||
newObject[key] = newArray; | ||
} else { | ||
newObject[key] = secondValue; | ||
} | ||
} | ||
return newObject; | ||
}; | ||
|
||
exports.cachedCleverMerge = cachedCleverMerge; | ||
exports.cleverMerge = cleverMerge; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
module.exports = require("./wrong"); | ||
module.exports = require("./wrong") + require("./normal") + require("./wrong2"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
module.exports = require("./wrong"); | ||
module.exports = require("./wrong") + require("./normal") + require("./wrong2"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
module.exports = require("./wrong") + require("./normal") + require("./wrong2"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
it("should allow to set custom resolving rules", function() { | ||
var a = require("./a"); | ||
expect(a).toBe("ok"); | ||
expect(a).toBe("ok-normal-wrong2"); | ||
var b = require("./b"); | ||
expect(b).toBe("wrong"); | ||
expect(b).toBe("ok-normal-wrong2-yes"); | ||
var c = require("./c"); | ||
expect(c).toBe("wrong-normal-ok2"); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
module.exports = "-normal-"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
module.exports = "ok-ok"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
module.exports = "ok2"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
module.exports = "ok2-yes"; |
23 changes: 22 additions & 1 deletion
23
test/configCases/rule-set/resolve-options/webpack.config.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
module.exports = "wrong2"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
module.exports = "wrong2-yes"; |