Skip to content

Commit

Permalink
Chore: rm superfluous argument & fix perf-multifiles-targets (#11834)
Browse files Browse the repository at this point in the history
  • Loading branch information
aladdin-add authored and mysticatea committed Jun 18, 2019
1 parent c57a4a4 commit 1db3462
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile.js
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ target.gensite = function(prereleaseVersion) {

// 11. Generate rule listing page
echo("> Generating the rule listing (Step 11)");
generateRuleIndexPage(process.cwd());
generateRuleIndexPage();

// 12. Delete temporary directory
echo("> Removing the temporary directory (Step 12)");
Expand Down Expand Up @@ -1088,7 +1088,7 @@ target.perf = function() {
// Count test target files.
const count = glob.sync(
process.platform === "win32"
? PERF_MULTIFILES_TARGETS.slice(2).replace("\\", "/")
? PERF_MULTIFILES_TARGETS.slice(2).replace(/\\/gu, "/")
: PERF_MULTIFILES_TARGETS
).length;

Expand Down
3 changes: 1 addition & 2 deletions lib/cli-engine/config-array/config-array.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ function mergeRuleConfigs(target, source) {
* @returns {ExtractedConfig} The extracted config.
*/
function createConfig(instance, indices) {
const slots = internalSlotsMap.get(instance);
const config = new ExtractedConfig();

// Merge elements.
Expand All @@ -256,7 +255,7 @@ function createConfig(instance, indices) {
mergeWithoutOverwrite(config.globals, element.globals);
mergeWithoutOverwrite(config.parserOptions, element.parserOptions);
mergeWithoutOverwrite(config.settings, element.settings);
mergePlugins(config.plugins, element.plugins, slots);
mergePlugins(config.plugins, element.plugins);
mergeRuleConfigs(config.rules, element.rules);
}

Expand Down

0 comments on commit 1db3462

Please sign in to comment.