From 6b621c3920bfdcb1d43b529e02f105fa567c33d7 Mon Sep 17 00:00:00 2001 From: "weiran.zsd" Date: Fri, 14 Jun 2019 14:27:16 +0800 Subject: [PATCH 1/2] Chore: rm superfluous argument & fix perf-multifiles-targets --- Makefile.js | 4 ++-- lib/cli-engine/config-array/config-array.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.js b/Makefile.js index b0b54a9a991..fa93af4b8d2 100644 --- 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 index d85fc94bf14..5c7aaa33400 100644 --- 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); } From a82b9a92277f9c5b8171ad7b021e7aff2b08a820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=9A=E8=B0=94=E7=9A=84=E7=8C=AB?= Date: Mon, 17 Jun 2019 19:03:32 +0800 Subject: [PATCH 2/2] Update Makefile.js --- Makefile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.js b/Makefile.js index fa93af4b8d2..e70390ee092 100644 --- a/Makefile.js +++ b/Makefile.js @@ -1088,7 +1088,7 @@ target.perf = function() { // Count test target files. const count = glob.sync( process.platform === "win32" - ? PERF_MULTIFILES_TARGETS.slice(2).replace(/\/\//gu, "/") + ? PERF_MULTIFILES_TARGETS.slice(2).replace(/\\/gu, "/") : PERF_MULTIFILES_TARGETS ).length;