Chore: rm superfluous argument & fix perf-multifiles-targets (#11834)

eslint · Jun 18, 2019 · 1db3462 · 1db3462
1 parent c57a4a4
commit 1db3462
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Makefile.js b/Makefile.js
@@ -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)");
@@ -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;
 

diff --git a/lib/cli-engine/config-array/config-array.js b/lib/cli-engine/config-array/config-array.js
@@ -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.
@@ -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);
     }