fix: merge mako config

[hualigushi]

Summary by CodeRabbit

• 新功能
  • 更新了配置获取功能，允许更全面的配置选项，通过合并 makoConfig 和 mako 对象来增强功能。

[coderabbitai]

Walkthrough

此次更改涉及 packages/bundler-mako/index.js 文件中的 getMakoConfig 函数。函数的返回语句已从直接返回 makoConfig 对象修改为返回通过 lodash.merge 合并 makoConfig 和 mako 对象的结果。此更改确保了 mako 的属性能够整合到 makoConfig 中，从而提供更全面的配置选项。

Changes

文件	更改摘要
packages/bundler-mako/index.js	修改 getMakoConfig 函数，返回 lodash.merge(makoConfig, mako)，而非 makoConfig。

Possibly related PRs

• fix(bundler-mako): analyze don't work in umi #1387: 此PR修改了 getMakoConfig 函数，直接与主要PR的更改相关。
• feat: pass umi config mako #1394: 此PR涉及对 getMakoConfig 函数的更改，特别是添加对 mako 配置键的支持，符合主要PR的修改。
• fix(bundler-mako): config mako.plugins should work #1400: 此PR对 packages/bundler-mako/index.js 的更改影响了 mako.plugins 的处理，可能与主要PR的整体配置处理相关。
• fix: When hmr=none,mako does not take effect #1552: 此PR修改了 packages/bundler-mako/index.js 中的 dev 函数，相关于主要PR中的 makoConfig 对象的配置方面。

Poem

在兔子窝里欢声笑，
配置合并真妙妙。
Mako 与 Config 手牵手，
选项丰富乐逍遥。
兔子跳跃庆新生，
编程世界更精彩！ 🐇✨

---

Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 58864c9 and 3c7cf00.

Files selected for processing (1)

• packages/bundler-mako/index.js (1 hunks)

Files skipped from review as they are similar to previous changes (1)

• packages/bundler-mako/index.js

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[sorrycc]

修改的背景是？

[hualigushi]

config.ts 配置
mako: {
experimental: {
webpackSyntaxValidate: ['opensumi'],
},
},
build 时会显示

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 62.04%. Comparing base (4897e32) to head (3c7cf00).
Report is 7 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1578      +/-   ##
==========================================
+ Coverage   62.03%   62.04%   +0.01%     
==========================================
  Files         127      127              
  Lines       15353    15354       +1     
==========================================
+ Hits         9524     9527       +3     
+ Misses       5829     5827       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.