Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Jun 18, 2019
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b621c3
Chore: rm superfluous argument & fix perf-multifiles-targets
aladdin-add Jun 14, 2019
a82b9a9
Update Makefile.js
aladdin-add Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.js
View file
Open in desktop
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, "/")
aladdin-add marked this conversation as resolved.
Show resolved Hide resolved
: PERF_MULTIFILES_TARGETS
).length;

Expand Down
3 changes: 1 addition & 2 deletions lib/cli-engine/config-array/config-array.js
View file
Open in desktop
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