Skip to content

Commit 1db3462

Browse files
aladdin-addmysticatea
authored andcommitted
Chore: rm superfluous argument & fix perf-multifiles-targets (#11834)
1 parent c57a4a4 commit 1db3462

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Makefile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ target.gensite = function(prereleaseVersion) {
761761

762762
// 11. Generate rule listing page
763763
echo("> Generating the rule listing (Step 11)");
764-
generateRuleIndexPage(process.cwd());
764+
generateRuleIndexPage();
765765

766766
// 12. Delete temporary directory
767767
echo("> Removing the temporary directory (Step 12)");
@@ -1088,7 +1088,7 @@ target.perf = function() {
10881088
// Count test target files.
10891089
const count = glob.sync(
10901090
process.platform === "win32"
1091-
? PERF_MULTIFILES_TARGETS.slice(2).replace("\\", "/")
1091+
? PERF_MULTIFILES_TARGETS.slice(2).replace(/\\/gu, "/")
10921092
: PERF_MULTIFILES_TARGETS
10931093
).length;
10941094

lib/cli-engine/config-array/config-array.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ function mergeRuleConfigs(target, source) {
231231
* @returns {ExtractedConfig} The extracted config.
232232
*/
233233
function createConfig(instance, indices) {
234-
const slots = internalSlotsMap.get(instance);
235234
const config = new ExtractedConfig();
236235

237236
// Merge elements.
@@ -256,7 +255,7 @@ function createConfig(instance, indices) {
256255
mergeWithoutOverwrite(config.globals, element.globals);
257256
mergeWithoutOverwrite(config.parserOptions, element.parserOptions);
258257
mergeWithoutOverwrite(config.settings, element.settings);
259-
mergePlugins(config.plugins, element.plugins, slots);
258+
mergePlugins(config.plugins, element.plugins);
260259
mergeRuleConfigs(config.rules, element.rules);
261260
}
262261

0 commit comments

Comments
 (0)