fix(bundler-mako): experimental config should be merged deeply

[sorrycc]

ref #1578

Summary by CodeRabbit

• 新功能
  • 重新组织了配置对象的结构，以提高可读性和一致性。

[coderabbitai]

Walkthrough

此次更改涉及对 packages/bundler-mako/index.js 文件中 getMakoConfig 函数的修改。主要调整了返回的配置对象的结构，将 sass 属性和 mako 的展开运算符移至 analyze 属性之后，并更新了 experimental 对象以包含 mako.experimental 的展开。这些更改旨在提高配置对象的组织性和一致性。

Changes

文件路径	更改摘要
packages/bundler-mako/index.js	修改 getMakoConfig 函数，重构返回的配置对象结构，调整 sass 和 mako 属性的位置，并更新 experimental 对象。

Possibly related PRs

• fix(bundler-mako): analyze don't work in umi #1387: 修改 getMakoConfig 函数，向解构的 opts.config 添加 analyze，与主 PR 的配置对象结构更改直接相关。
• feat: pass umi config mako #1394: 涉及对 getMakoConfig 函数的更改，具体添加对 analyze 和 mako 配置键的支持，与主 PR 的结构调整一致。
• fix(bundler-mako): config mako.plugins should work #1400: 修改 getMakoConfig 函数，添加对 mako.plugins 的支持，表明与主 PR 中的配置管理相关。
• fix(bundler-mako): assignment failure when plugins are undefined #1402: 处理 makoConfig.plugins 的更改，与主 PR 中讨论的整体配置管理相关。
• fix: merge mako config #1578: 修改 getMakoConfig 函数，将 makoConfig 与 mako 对象合并，直接补充了主 PR 中的配置处理更改。
• Revert "fix: merge mako config" #1589: 还原 getMakoConfig 函数中将 mako 对象合并到 makoConfig 的操作，直接与主 PR 中的配置对象结构更改相关。

🐰 在草地上跳跃欢快，
配置重整真是妙，
sass 和 mako 位置变，
组织清晰如春晓。
兔子欢呼声阵阵，
新结构真好笑！
🐇

---

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>, please review it.
  • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @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.

[coderabbitai]

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)

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

639-648: 配置对象结构优化，但可以进一步改进

这些更改改进了配置对象的组织结构，使其更加清晰和一致。将mako对象的展开移到其他属性之后是一个好的做法，因为它允许覆盖默认值。同样，合并mako.experimental与默认的实验性设置也很合理。

然而，我建议进一步优化代码结构，以提高可读性：

考虑将experimental对象的定义提取到getMakoConfig函数的顶部，这样可以使主要的返回语句更简洁：

function getMakoConfig(opts) {
  // ... 现有代码 ...

+ const experimentalConfig = {
+   webpackSyntaxValidate: [],
+   requireContext: true,
+   detectCircularDependence: {
+     ignores: ['node_modules', '\\.umi'],
+     graphviz: false,
+   },
+   ...mako.experimental,
+ };

  const makoConfig = {
    // ... 其他配置 ...
    sass: sassLoader,
    ...mako,
-   experimental: {
-     webpackSyntaxValidate: [],
-     requireContext: true,
-     detectCircularDependence: {
-       ignores: ['node_modules', '\\.umi'],
-       graphviz: false,
-     },
-     ...mako.experimental,
-   },
+   experimental: experimentalConfig,
  };

  return makoConfig;
}

这种方法可以使主要的配置对象更加简洁，同时保持实验性配置的灵活性。

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 9a4c4d8 and 550a536.

📒 Files selected for processing (1)

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

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 61.95%. Comparing base (9a4c4d8) to head (550a536).
Report is 1 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #1617   +/-   ##
=======================================
  Coverage   61.95%   61.95%           
=======================================
  Files         128      128           
  Lines       15415    15415           
=======================================
  Hits         9550     9550           
  Misses       5865     5865           

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