Conversation
|
Warning Rate limit exceeded@Jinbao1001 has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 3 minutes and 45 seconds before requesting another review. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. 📒 Files selected for processing (1)
Walkthrough本次更改主要涉及多个 Changes
Possibly related PRs
Suggested reviewers
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? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
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)
Other keywords and placeholders
CodeRabbit Configuration File (
|
WalkthroughThis pull request introduces support for Rust native plugins in the project. It includes changes to the configuration files to accommodate Rust plugins, updates to the plugin system to load and manage these plugins, and modifications to the build process to integrate Rust components. The changes also involve replacing existing memory allocators with Changes
|
![petercat-assistant[bot]](https://avatars.githubusercontent.com/in/875736?s=60&v=4){kind=small}
| } | ||
|
|
||
| fn handler_create(input: TokenStream2) -> TokenStream2 { | ||
| let ast = parse2::<DeriveInput>(input).unwrap(); |
There was a problem hiding this comment.
The use of unwrap() can cause a panic if the input is not as expected. Consider handling the error more gracefully, perhaps by returning a Result or using expect() with a meaningful error message.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1691 +/- ##
==========================================
- Coverage 54.77% 54.58% -0.20%
==========================================
Files 181 180 -1
Lines 17981 17958 -23
==========================================
- Hits 9849 9802 -47
- Misses 8132 8156 +24 ☔ View full report in Codecov by Sentry. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 7
🧹 Outside diff range and nitpick comments (10)
crates/mako/src/ast.rs (1)
11-11: 建议为公开模块添加文档注释将
utils模块设置为公开访问符合插件系统的需求。不过，建议添加文档注释来说明：
- 该模块的用途
- 为什么需要公开访问
- 外部使用者应该注意的事项
建议添加如下文档注释：
+/// Utils module provides common utilities for AST manipulation. +/// This module is public to support native plugin integration. pub mod utils;packages/mako/src/rustPlugins/index.ts (3)
2-2: 函数参数类型可以更严格建议为插件选项定义更具体的接口类型，而不是使用
any。这样可以提供更好的类型安全性和代码提示。-export async function rustPluginResolver(plugins: Array<[string, any]>) { +interface PluginOptions { + // 根据实际需求定义选项接口 + [key: string]: unknown; +} +export async function rustPluginResolver(plugins: Array<[string, PluginOptions]>) {
6-10: 建议优化平台特定的导入逻辑当前的平台特定导入逻辑可以更简洁。可以使用统一的导入方式，减少代码重复。
- if (process.platform === 'win32') { - pluginPath = (await import(pathToFileURL(pluginPath).toString())).default; - } else { - pluginPath = await import(pluginPath).then((m) => m.default); - } + const importPath = process.platform === 'win32' + ? pathToFileURL(pluginPath).toString() + : pluginPath; + pluginPath = (await import(importPath)).default;
1-14: 建议添加 JSDoc 文档为了提高代码的可维护性和可读性，建议添加完整的 JSDoc 文档说明函数的用途、参数和返回值。
+/** + * 解析 Rust 原生插件列表 + * @param plugins - 插件配置数组，每个元素为 [插件名称, 插件选项] 的元组 + * @returns 解析后的插件路径和序列化选项数组 + * @throws {Error} 当插件解析或导入失败时抛出错误 + */ export async function rustPluginResolver(plugins: Array<[string, any]>) {Cargo.toml (1)
14-14: 建议固定依赖版本为了确保构建的一致性和可重现性，建议使用精确版本号。
-swc_malloc = "1.0.0" +swc_malloc = "=1.0.0"crates/mako/src/config/mako.config.default.json (1)
69-69: 配置更改看起来没有问题！在 experimental 部分添加
rustPlugins数组是合适的，这清楚地表明该功能仍处于实验阶段。默认值设置为空数组也是一个安全的选择。建议为这个新的配置项添加相关文档，说明其用途和使用方法。例如：
- 支持的插件格式
- 如何开发兼容的 Rust 插件
- 配置示例
packages/mako/src/binding.d.ts (1)
238-238: 建议完善类型定义和文档说明考虑以下几点改进建议：
any类型过于宽松，建议定义具体的插件配置接口以提供更好的类型安全性和开发体验- 缺少相关文档说明，建议添加 JSDoc 注释描述该特性的用途和配置方式
建议按照以下方式改进：
+ /** + * Rust 原生插件配置 + * @example + * rustPlugins: [ + * ['plugin-name', { config: 'value' }] + * ] + */ - rustPlugins?: Array<[string, any]>; + rustPlugins?: Array<[string, RustPluginConfig]>; + + /** Rust 插件配置接口 */ + interface RustPluginConfig { + // TODO: 根据实际需求定义具体配置项 + }packages/mako/binding.d.ts (1)
258-258: 建议：考虑为插件配置使用更具体的类型定义目前的类型定义
Array<[string, any]>中使用any可能过于宽松。建议：
- 为插件配置创建一个专门的接口，以提供更好的类型安全性和开发体验
- 考虑添加相关的类型文档，说明每个配置项的用途
示例改进：
interface RustPluginConfig { // 根据实际需求定义配置项 enabled?: boolean; options?: Record<string, unknown>; } // 然后更新类型定义 rustPlugins?: Array<[string, RustPluginConfig]>;crates/mako/src/config.rs (1)
235-255: 建议增强错误处理机制当前实现在处理实验性配置时可以更加健壮：
- 解析 JSON 时的错误处理可以更详细
- 建议添加对实验性配置内容的验证
建议按如下方式改进：
let result: Result<Value, serde_json::Error> = serde_json::from_str(default_config); -if let Ok(config) = result { +match result { + Ok(config) => { if let Some(experimental) = config.get("experimental") { + // 验证实验性配置的结构 + if !experimental.is_object() { + log::warn!("experimental 配置必须是一个对象"); + return c; + } overrides_json = Some( serde_json::to_string(&json!({ "experimental": experimental })) .unwrap(), ); } + } + Err(e) => { + log::warn!("解析默认配置失败: {}", e); + } };crates/mako_plugin_macro/src/lib.rs (1)
37-47: 改进参数名称匹配的精确度目前，代码判断参数名是否包含 "context"，这可能导致匹配到包含 "context" 的其他参数名，产生误判。建议将判断条件改为参数名等于 "context"，以提高匹配精确度，避免误判。
应用以下代码修改：
- i.ident.to_string().contains("context") + i.ident == "context"
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
⛔ Files ignored due to path filters (1)
Cargo.lockis excluded by!**/*.lock
📒 Files selected for processing (18)
Cargo.toml(1 hunks)crates/binding/Cargo.toml(1 hunks)crates/binding/src/lib.rs(2 hunks)crates/mako/Cargo.toml(5 hunks)crates/mako/src/ast.rs(1 hunks)crates/mako/src/compiler.rs(4 hunks)crates/mako/src/config.rs(3 hunks)crates/mako/src/config/experimental.rs(2 hunks)crates/mako/src/config/mako.config.default.json(1 hunks)crates/mako/src/lib.rs(2 hunks)crates/mako/src/main.rs(1 hunks)crates/mako_plugin_macro/Cargo.toml(1 hunks)crates/mako_plugin_macro/src/lib.rs(1 hunks)packages/bundler-mako/index.js(1 hunks)packages/mako/binding.d.ts(1 hunks)packages/mako/src/binding.d.ts(1 hunks)packages/mako/src/index.ts(2 hunks)packages/mako/src/rustPlugins/index.ts(1 hunks)
✅ Files skipped from review due to trivial changes (1)
- crates/mako_plugin_macro/Cargo.toml
🔇 Additional comments (24)
crates/mako/src/ast.rs (1)
11-11: 验证模块可见性的一致性
需要确认其他模块的可见性设置是否合理。目前大部分模块仍然是 pub(crate)，我们应该验证是否有其他模块也需要支持插件系统。
✅ Verification successful
Based on the search results, I can now generate the final response since I have enough information about the module visibility patterns in the codebase:
模块可见性设置合理，无需更改
当前的可见性设置是合理的:
utils模块设为pub是正确的，因为它包含了插件系统所需的公共工具- 其他大多数子模块保持
pub(crate)是合适的，因为它们是内部实现细节 - 整体架构遵循了清晰的可见性分层:
- 插件系统相关的模块(
plugin.rs、plugins/*)都是pub - 内部实现模块都是
pub(crate) - 工具类模块根据用途选择性地暴露
- 插件系统相关的模块(
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 描述：检查 crates/mako 目录下所有的模块声明，以确保可见性设置的一致性
# 搜索所有的模块声明
rg "^pub(\(crate\))?\s+mod\s+" "crates/mako/src/"
# 搜索可能的插件相关代码，以确定哪些模块可能需要公开
rg -i "plugin|native" "crates/mako/src/"
Length of output: 33898
crates/binding/Cargo.toml (1)
18-18: 请验证 swc_malloc 在所有目标平台的兼容性和性能表现
从特定平台的内存分配器迁移到统一的 swc_malloc 是一个重要变更。建议：
- 在不同操作系统和架构上进行充分测试
- 评估对插件性能的潜在影响
- 确保内存分配策略的改变不会影响插件的稳定性
运行以下脚本检查项目中的目标平台支持：
✅ Verification successful
Let's analyze the workspace configuration and platform-specific code to better understand the memory allocator usage and platform support.
swc_malloc 的使用是安全且合适的
基于代码分析结果：
- swc_malloc 作为工作空间依赖被正确配置，版本为 1.0.0
- 项目中只有少量平台特定代码（仅针对 Windows 路径处理），说明内存分配器的改变不会影响跨平台兼容性
- swc_malloc 与 swc_core 一起被使用，这是标准的 SWC 工具链组合
- 内存分配器的变更仅限于必要的系统级组件
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 描述：检查项目中定义的目标平台和 swc_malloc 的兼容性
# 搜索 build.rs 和 Cargo.toml 中的目标平台配置
rg -g '*.{rs,toml}' 'target_os|target_arch'
# 检查 swc_malloc 的版本和支持平台
cargo tree -i swc_malloc
Length of output: 274
Script:
#!/bin/bash
# Check workspace dependencies and swc_malloc usage
rg -g 'Cargo.toml' 'swc_malloc'
# Check for any platform-specific code or configurations
rg -g '*.rs' 'cfg\(target_' -A 2 -B 2
# Look for build configurations
fd 'build.rs' --exec cat {}
# Search for any platform-specific allocator code
rg -g '*.rs' 'allocator|malloc' -A 2 -B 2
Length of output: 12387
packages/mako/src/rustPlugins/index.ts (1)
11-11:
验证插件路径的有效性
在将插件路径添加到结果数组之前，建议验证 pluginPath 的有效性。
+ if (typeof pluginPath !== 'string') {
+ throw new Error(`插件 "${plugin}" 导出的默认值必须是字符串类型的路径`);
+ }
resolved.push([pluginPath, JSON.stringify(options)]);crates/mako/src/config/experimental.rs (1)
21-21: 建议为新增的配置字段添加文档
rust_plugins 字段作为实验性功能的一部分，需要清晰的文档说明其用途和使用方式。
建议添加字段文档：
+ /// 实验性的 Rust 原生插件配置列表
pub rust_plugins: Vec<RustPlugin>,另外，建议验证默认配置文件中是否已添加此字段：
crates/mako/src/lib.rs (2)
23-24: 验证依赖重导出的必要性
直接重导出 swc_core 和 swc_malloc 可能会:
- 暴露过多实现细节
- 增加 API 的不稳定性
- 使版本管理变得复杂
建议:
- 考虑封装必要的功能而不是直接重导出
- 添加文档说明重导出的原因和使用场景
13-13: 请确认模块可见性更改的必要性
将 module 模块改为公开可能会破坏封装性。建议:
- 确认是否所有内容都需要公开
- 考虑只公开必要的子模块或接口
- 添加文档注释说明公开的原因和用途
✅ Verification successful
将 module 模块改为公开是必要的
从代码分析来看，module 模块确实需要公开，因为:
- 它包含了许多核心类型如
ModuleId、Dependency、ModuleAst等，这些类型被整个项目广泛使用 - 这些类型在插件系统和编译流程中都是必需的
- 代码中有大量合法的跨模块引用，表明这是有意为之的架构设计
建议:
- 为 module 模块添加文档注释，说明其作为公共 API 的用途
- 仔细审查模块中的每个公开项，确保它们都是必要的
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 检查 module 模块的使用情况
ast-grep --pattern 'use $$$module$$$'
Length of output: 47735
Script:
#!/bin/bash
# 检查 module 模块的导出和使用情况
fd -e rs -e toml . crates/mako/src/module/ -x cat {}
Length of output: 167
Script:
#!/bin/bash
# 检查 module 模块的定义和使用
rg "pub mod module" -A 5 crates/mako/src/lib.rs
rg "use (crate|super)::module" -t rust
Length of output: 6520
crates/mako/src/main.rs (2)
Line range hint 1-89: 建议完善插件系统架构设计
作为支持 Rust 原生插件的入口文件，建议考虑以下几点：
- 插件的生命周期管理
- 插件加载失败的错误处理机制
- 插件系统的初始化时机
需要我协助设计插件系统的架构文档或实现相关代码吗？
4-5: 验证内存分配器更改的影响
引入 swc_malloc 作为新的内存分配器替代了之前的平台特定配置。这个改动简化了内存管理策略，但需要确保在所有目标平台上都能正常工作。
✅ Verification successful
内存分配器配置变更已验证
引入 swc_malloc 作为外部依赖是合理的,因为:
- 项目同时依赖了
swc_malloc和tikv-jemallocator作为内存分配器 - 这些依赖在 Cargo.toml 中正确配置
- 在 main.rs 中通过
extern crate swc_malloc引入是标准做法
这个改动是对内存分配策略的优化,不会产生负面影响。
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 检查项目中所有与内存分配相关的配置
rg -l "GlobalAlloc|global_allocator"
# 检查是否还有其他文件引用了旧的分配器
rg "mimalloc-rust|tikv_jemallocator"
Length of output: 254467
Script:
#!/bin/bash
# Check for global allocator configurations
rg -l "global_allocator|GlobalAlloc" --type rust
# Check for memory allocator dependencies in Cargo.toml files
rg -l "mimalloc-rust|tikv-jemallocator" --type toml
# Check for swc_malloc usage
rg -l "swc_malloc" --type rust
Length of output: 230
Script:
#!/bin/bash
# Check the content of relevant files to understand the memory allocator configuration
rg -A 5 "swc_malloc" crates/mako/src/main.rs
cat Cargo.toml | grep -A 5 "mimalloc-rust\|tikv-jemallocator\|swc_malloc"
Length of output: 387
crates/mako/Cargo.toml (4)
Line range hint 51-62: 验证 SWC 核心功能的兼容性
新增的 ecma_plugin_transform 和 swc_common 特性是支持原生插件所必需的，但需要确保版本兼容性。
建议：
- 确保这些新特性与现有的转换流程兼容
- 考虑添加相关的集成测试来验证插件系统的正确性
87-87: 检查插件系统相关依赖的完整性
新增的依赖（libloading、proc-macro2、quote、syn）构成了插件系统的基础架构。
建议：
libloading用于动态加载插件，建议添加错误处理机制- 宏相关的依赖（
proc-macro2、quote、syn）建议考虑是否需要在特性标志后面 - 考虑添加插件系统的文档说明
运行以下脚本检查依赖使用情况：
#!/bin/bash
# 检查新增依赖的使用情况
rg "libloading::" -t rust
rg "proc_macro2::" -t rustAlso applies to: 97-97, 100-100, 108-108
29-29: 检查 swc_malloc 的工作空间依赖配置
引入 swc_malloc 作为新的内存分配器是一个重要的改动。这个改动需要确保在整个工作空间中的一致性。
运行以下脚本来验证工作空间配置：
✅ Verification successful
工作空间中 swc_malloc 依赖配置正确
在工作空间中 swc_malloc 的配置完全一致：
- 根
Cargo.toml定义了版本 1.0.0 crates/mako和crates/binding都正确使用了 workspace 继承
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 检查工作空间中的 swc_malloc 配置
rg "swc_malloc" -g "Cargo.toml"
Length of output: 192
66-66: 确认 swc_emotion 版本固定的原因
将 swc_emotion 版本固定为 =0.72.22 可能会限制未来的更新。
运行以下脚本检查版本兼容性：
✅ Verification successful
版本固定是合理的做法
从代码库分析来看，这个版本固定是合理的：
- 项目中同时固定了其他重要依赖的版本，如
oxc_resolver = "=1.7.0"，并且在注释中说明了具体原因 swc_emotion作为 SWC 生态系统的一部分，与其他 SWC 相关依赖（如swc_core、swc_error_reporters、swc_node_comments）版本需要保持兼容- 这种精确的版本控制有助于确保构建的稳定性和可重现性
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 检查 swc_emotion 的版本历史和兼容性问题
gh api graphql -f query='
{
repository(owner: "swc-project", name: "swc") {
releases(first: 5, orderBy: {field: CREATED_AT, direction: DESC}) {
nodes {
tagName
description
}
}
}
}
'
Length of output: 459
Script:
#!/bin/bash
# Check for any comments or documentation about version pinning
rg -g "*.{toml,md}" "swc_emotion.*0\.72\.22" -B 2 -A 2
# Check other dependencies versions in the same file
cat crates/mako/Cargo.toml
# Look for related dependencies
rg "swc.*=.*" -g "Cargo.toml"
Length of output: 4776
packages/mako/src/index.ts (2)
9-9: 导入语句正确添加！
新增的 rustPluginResolver 导入语句位置恰当，与现有代码风格保持一致。
47-51: 验证 Rust 插件与现有插件系统的集成
需要确认以下几点：
- Rust 插件是否需要在 watch 模式下进行特殊清理
- 是否需要在插件加载流程中添加特殊处理
运行以下脚本来验证插件系统的集成：
✅ Verification successful
Let me gather more information about the plugin system and watch mode handling.
Let me gather one final piece of information about the Rust plugin implementation.
Rust 插件系统集成验证结果
根据代码分析，Rust 插件系统已经具备完整的集成机制：
- 在 watch 模式下，插件系统通过
watch_changes钩子函数提供了标准的文件变更处理机制 - Rust 插件在编译器初始化时会被正确加载（见
crates/mako/src/compiler.rs） - 插件系统提供了统一的清理机制，不需要特殊处理
无需在插件加载流程中添加额外的特殊处理。现有的插件系统架构已经完全支持 Rust 插件的集成。
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 检查是否有其他文件引用了 rustPlugins
rg -l "rustPlugins"
# 检查插件系统相关的类型定义
ast-grep --pattern 'interface $_ {
$$$
plugins?: $_
$$$
}'
Length of output: 2223
Script:
#!/bin/bash
# 检查 watch 模式下的插件处理逻辑
rg -A 5 "watch.*mode"
# 检查插件系统的清理和卸载逻辑
rg -A 5 "(cleanup|unload|dispose).*plugin"
# 检查 Rust 插件的类型定义和接口
ast-grep --pattern 'type $_RustPlugin = {
$$$
}'
# 检查现有插件系统的加载逻辑
rg -A 10 "load.*plugin"
Length of output: 7509
Script:
#!/bin/bash
# 检查 Rust 插件的实现细节
rg -A 10 "rust_plugins" crates/
# 检查插件系统中的 watch 模式相关代码
rg -A 5 "fn watch" crates/
# 查看 Rust 插件的类型定义
ast-grep --pattern 'struct $_RustPlugin {
$$$
}'
Length of output: 4996
packages/mako/binding.d.ts (1)
258-258: 验证：确保实现与类型定义匹配
由于这是一个新的实验性功能，需要验证实现代码是否正确处理了这个类型定义。
✅ Verification successful
Let me check the implementation of rustPluginResolver to complete the verification.
类型定义与实现完全匹配，验证通过
rustPluginResolver 的实现完全符合类型定义：
- 接收的参数类型为
Array<[string, any]> - 返回的类型也是
Array<[string, any]> - 实现中正确处理了插件路径解析和选项序列化
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 描述：验证 rustPlugins 的实现是否符合类型定义
# 检查 rustPlugins 的使用情况
rg -A 5 "rustPlugins" --type ts
# 检查相关的插件加载逻辑
ast-grep --pattern 'function $_(params: BuildParams) {
$$$
}'
Length of output: 11722
Script:
#!/bin/bash
# Check rustPluginResolver implementation
rg -A 10 "rustPluginResolver" --type ts
# Check if there are any rust plugin related files
fd -e rs rust
Length of output: 2248
crates/binding/src/lib.rs (2)
158-158: 🛠️ Refactor suggestion
建议完善 Rust 插件的类型定义
rustPlugins 的类型定义过于宽松：
any类型不够严格，建议定义具体的插件配置接口- 缺少相关文档说明插件的使用方式
- 作为实验性功能，建议添加相关警告注释
建议修改为更严格的类型定义：
- rustPlugins?: Array<[string, any]>;
+ /**
+ * 实验性功能：Rust 原生插件支持
+ * @experimental 该功能仍在开发中，接口可能发生变化
+ */
+ rustPlugins?: Array<[string, RustPluginConfig]>;另外需要在相应位置添加 RustPluginConfig 接口定义。
#!/bin/bash
# 检查是否已实现插件加载逻辑
rg "rustPlugins?" --type rust3-4: 验证内存分配器的变更影响
引入 swc_malloc 作为新的内存分配器需要确保：
- 系统性能不会受到负面影响
- 与现有的内存管理机制兼容
- 在不同平台上都能正常工作
✅ Verification successful
内存分配器变更已正确集成
根据验证结果，swc_malloc 已在工作空间中正确配置：
- 在 workspace 依赖中定义了
swc_malloc = "1.0.0" - 多个关键 crate 都正确引入了
swc_malloc - 没有发现与旧的内存分配器（如 mimalloc）的冲突使用
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 检查是否有其他文件仍在使用旧的分配器
rg "mimalloc|jemalloc" --type rust
Length of output: 195
Script:
#!/bin/bash
# 检查全局分配器的配置
rg "#\[global_allocator\]" --type rust -A 2
# 检查 swc_malloc 的使用情况
rg "use.*swc_malloc|extern.*swc_malloc" --type rust
# 检查 Cargo.toml 中的依赖
fd Cargo.toml --exec cat {}
Length of output: 6770
crates/mako/src/config.rs (2)
69-69: 导入变更正确！
引入 json 宏是合理的，它用于后续构建实验性配置的 JSON 对象。
276-284: 验证配置覆盖行为
需要确保配置覆盖的优先级符合预期，特别是在处理实验性的 Rust 原生插件配置时。
✅ Verification successful
配置覆盖行为已正确实现
从代码分析结果来看，配置源的加载顺序是正确的：
- 默认配置（DEFAULT_CONFIG）
- 配置文件（abs_config_file）
- 命令行配置（cli_config）
- 覆盖配置（overrides）
测试用例充分验证了不同配置源的优先级，包括：
- 默认配置测试
- 命令行参数覆盖测试
- 配置文件验证测试
实验性的 Rust 插件配置也能通过这个机制正确处理。
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 描述：验证配置文件中的实验性配置覆盖行为
# 搜索包含 experimental 配置的测试用例
rg -l "experimental.*rust" test/config/
# 检查配置解析相关的测试代码
ast-grep --pattern 'fn test_$_() {
$$$
Config::new($_)
$$$
}'
Length of output: 164
Script:
#!/bin/bash
# 搜索配置文件中的实验性配置相关代码
rg -l "experimental.*rust" crates/mako/src/
# 检查配置解析相关的测试代码
rg -l "test.*config" crates/mako/src/
# 查找配置相关的测试文件
fd "test.*config" crates/mako/src/
# 检查配置覆盖相关的测试代码
ast-grep --pattern 'fn test_$_() {
$$$
add_source($_)
$$$
}'
Length of output: 245
Script:
#!/bin/bash
# 检查 config.rs 中的测试用例
rg "fn test_.*config" -A 10 crates/mako/src/config.rs
# 检查 compiler.rs 中的实验性 Rust 配置使用
rg "experimental.*rust" -A 5 crates/mako/src/compiler.rs
# 检查配置覆盖的实现
rg "add_source" -A 5 crates/mako/src/config.rs
Length of output: 2950
crates/mako/src/compiler.rs (4)
9-9: 导入 libloading 库
添加 libloading::Library 的导入以支持动态加载 Rust 插件，这是必要的操作。
224-224: 将 config 参数设为可变
在 Compiler::new 方法中，将 config 参数设为可变（mut config: Config），以便在初始化编译器时修改配置。这是合理的，确保在方法内部可以适当调整配置。
244-253: 重复的安全性提醒：使用 unsafe 块加载插件
之前关于使用 unsafe 块可能导致未定义行为的评论仍然适用。请确保动态加载的 Rust 插件是可信的，并对 _plugin_create 函数的调用进行安全性验证，添加必要的检查或限制以降低潜在风险。
271-271: 确认插件的加载顺序
在第 271 行，将 external_plugins 扩展到 plugins 列表中。请确认外部插件的加载顺序符合预期，确保它们在内置插件之前正确加载，以避免功能冲突。
packages/bundler-mako/index.js (1)
665-665: 添加了 rustPlugins 配置项
在 experimental 配置中新增了 rustPlugins 属性，为支持 Rust 插件提供了扩展点。
Comment on lines
4
to
11
| for (const [plugin, options] of plugins) { | ||
| let pluginPath = require.resolve(plugin); | ||
| if (process.platform === 'win32') { | ||
| pluginPath = (await import(pathToFileURL(pluginPath).toString())).default; | ||
| } else { | ||
| pluginPath = await import(pluginPath).then((m) => m.default); | ||
| } | ||
| resolved.push([pluginPath, JSON.stringify(options)]); |
There was a problem hiding this comment.
需要添加错误处理机制
当前实现缺少错误处理逻辑。插件解析和导入过程中可能会发生错误，建议添加 try-catch 块并提供有意义的错误信息。
for (const [plugin, options] of plugins) {
+ try {
let pluginPath = require.resolve(plugin);
if (process.platform === 'win32') {
pluginPath = (await import(pathToFileURL(pluginPath).toString())).default;
} else {
pluginPath = await import(pluginPath).then((m) => m.default);
}
resolved.push([pluginPath, JSON.stringify(options)]);
+ } catch (error) {
+ throw new Error(`插件 "${plugin}" 加载失败: ${error.message}`);
+ }
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| for (const [plugin, options] of plugins) { | |
| let pluginPath = require.resolve(plugin); | |
| if (process.platform === 'win32') { | |
| pluginPath = (await import(pathToFileURL(pluginPath).toString())).default; | |
| } else { | |
| pluginPath = await import(pluginPath).then((m) => m.default); | |
| } | |
| resolved.push([pluginPath, JSON.stringify(options)]); | |
| for (const [plugin, options] of plugins) { | |
| try { | |
| let pluginPath = require.resolve(plugin); | |
| if (process.platform === 'win32') { | |
| pluginPath = (await import(pathToFileURL(pluginPath).toString())).default; | |
| } else { | |
| pluginPath = await import(pluginPath).then((m) => m.default); | |
| } | |
| resolved.push([pluginPath, JSON.stringify(options)]); | |
| } catch (error) { | |
| throw new Error(`插件 "${plugin}" 加载失败: ${error.message}`); | |
| } | |
| } |
Comment on lines
5
to
9
| #[derive(Deserialize, Serialize, Debug, Clone)] | ||
| pub struct RustPlugin { | ||
| pub path: String, | ||
| pub options: String, | ||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
建议改进 RustPlugin 结构体的设计
当前实现存在以下需要改进的地方：
- 缺少结构体和字段的文档注释，建议添加以说明用途和预期值
options字段使用String类型可能过于简单，建议考虑使用更结构化的类型（如serde_json::Value）来支持更复杂的配置
建议按如下方式修改：
#[derive(Deserialize, Serialize, Debug, Clone)]
+/// 用于配置 Rust 原生插件的结构体
pub struct RustPlugin {
+ /// 插件的文件路径
pub path: String,
+ /// 插件的配置选项，支持 JSON 格式
- pub options: String,
+ pub options: serde_json::Value,
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| #[derive(Deserialize, Serialize, Debug, Clone)] | |
| pub struct RustPlugin { | |
| pub path: String, | |
| pub options: String, | |
| } | |
| #[derive(Deserialize, Serialize, Debug, Clone)] | |
| /// 用于配置 Rust 原生插件的结构体 | |
| pub struct RustPlugin { | |
| /// 插件的文件路径 | |
| pub path: String, | |
| /// 插件的配置选项，支持 JSON 格式 | |
| pub options: serde_json::Value, | |
| } |
Comment on lines
+47
to
+51
| const rustPlugins = params.config.experimental?.rustPlugins; | ||
| if (rustPlugins) { | ||
| params.config.experimental!.rustPlugins = | ||
| await rustPluginResolver(rustPlugins); | ||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
建议增强错误处理和类型安全性
当前实现有以下几点需要注意：
- 缺少对
rustPluginResolver执行失败的错误处理 - 直接修改
params.config.experimental可能导致类型不安全 - 建议添加日志记录以便于调试
建议按照以下方式重构：
const rustPlugins = params.config.experimental?.rustPlugins;
if (rustPlugins) {
+ try {
params.config.experimental!.rustPlugins =
await rustPluginResolver(rustPlugins);
+ console.log('Rust plugins successfully resolved');
+ } catch (error) {
+ console.error('Failed to resolve Rust plugins:', error);
+ throw new Error(`Rust plugin resolution failed: ${error.message}`);
+ }
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| const rustPlugins = params.config.experimental?.rustPlugins; | |
| if (rustPlugins) { | |
| params.config.experimental!.rustPlugins = | |
| await rustPluginResolver(rustPlugins); | |
| } | |
| const rustPlugins = params.config.experimental?.rustPlugins; | |
| if (rustPlugins) { | |
| try { | |
| params.config.experimental!.rustPlugins = | |
| await rustPluginResolver(rustPlugins); | |
| console.log('Rust plugins successfully resolved'); | |
| } catch (error) { | |
| console.error('Failed to resolve Rust plugins:', error); | |
| throw new Error(`Rust plugin resolution failed: ${error.message}`); | |
| } | |
| } |
Comment on lines
15
to
18
| #[no_mangle] | ||
| pub fn _plugin_create(option: std::string::String) -> std::sync::Arc<dyn Plugin> { | ||
| std::sync::Arc::new(#struct_name::new(option)) | ||
| } |
There was a problem hiding this comment.
缺少对 Plugin trait 的引用
代码中使用了 dyn Plugin，但当前作用域中未引入 Plugin trait，可能会导致编译错误。请考虑在文件顶部添加对 Plugin trait` 的引用。
应用以下代码修改：
+ use mako::plugin::Plugin;Committable suggestion skipped: line range outside the PR's diff.
xusd320
reviewed
Dec 16, 2024
xusd320
reviewed
Dec 16, 2024
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (4)
crates/mako/src/config.rs (1)
246-256: 建议优化错误处理和代码结构当前代码的嵌套结构较深，建议重构以提高可读性和维护性。
建议按照以下方式重构：
- let result: Result<Value, serde_json::Error> = serde_json::from_str(default_config); - if let Ok(config) = result { - if let Some(experimental) = config.get("experimental") { - overrides_json = Some( - serde_json::to_string(&json!({ - "experimental": experimental - })) - .unwrap(), - ); - } - }; + overrides_json = serde_json::from_str::<Value>(default_config) + .ok() + .and_then(|config| config.get("experimental")) + .map(|experimental| { + serde_json::to_string(&json!({ + "experimental": experimental + })) + .expect("Failed to serialize experimental config") + });crates/binding/src/lib.rs (1)
161-161: 建议改进类型定义以增强类型安全性当前
rustPlugins的类型定义使用了any，这可能导致运行时类型错误。建议定义一个更具体的接口来描述插件配置。建议修改为:
- rustPlugins?: Array<[string, any]>; + rustPlugins?: Array<[string, { + path: string; + options: Record<string, unknown>; + }]>;crates/mako/src/compiler.rs (2)
9-9: 确保 libloading 版本的安全性建议在
Cargo.toml中明确指定libloading的版本，以避免潜在的安全问题。
271-271: 建议调整插件加载顺序的处理方式当前实现中，外部插件被添加到内置插件之前，这可能导致某些依赖内置插件功能的外部插件无法正常工作。建议：
- 允许插件定义依赖关系
- 根据依赖关系对插件进行排序
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (9)
crates/binding/src/lib.rs(2 hunks)crates/mako/src/compiler.rs(3 hunks)crates/mako/src/config.rs(3 hunks)crates/mako/src/config/experimental.rs(2 hunks)crates/mako/src/config/mako.config.default.json(1 hunks)crates/mako_plugin_macro/src/lib.rs(1 hunks)packages/mako/binding.d.ts(1 hunks)packages/mako/src/binding.d.ts(1 hunks)packages/mako/src/rustPlugins/index.ts(1 hunks)
🚧 Files skipped from review as they are similar to previous changes (6)
- crates/mako/src/config/mako.config.default.json
- packages/mako/src/rustPlugins/index.ts
- packages/mako/binding.d.ts
- packages/mako/src/binding.d.ts
- crates/mako/src/config/experimental.rs
- crates/mako_plugin_macro/src/lib.rs
🔇 Additional comments (5)
crates/mako/src/config.rs (4)
69-69: 导入更改看起来没有问题！
引入 serde_json::json 宏是合理的，它为后续处理实验性配置提供了必要支持。
236-236: 变量声明合理！
overrides_json 的类型选择和命名都很恰当，使用 Option<String> 可以很好地处理可能存在的覆盖配置。
277-285: 配置覆盖逻辑实现合理！
使用 builder 模式来添加覆盖配置的实现清晰且符合最佳实践。
Line range hint 236-285: 请验证实验性功能的文档和兼容性
新增的实验性配置处理机制可能会影响现有的配置行为。
运行以下脚本来验证文档和测试覆盖：
✅ Verification successful
实验性功能配置已得到完整文档和测试支持
通过分析发现：
- 实验性功能已在中英文文档中详细说明（docs/config.zh-CN.md 和 docs/config.md）
- 所有实验性功能都有明确的类型定义和默认值配置
- 代码中有相应的测试用例和配置示例
- 实验性功能的变更都有完整的 CHANGELOG 记录
实验性功能包括：
- detectLoop：循环依赖检测
- requireContext：require.context 支持
- webpackSyntaxValidate：webpack 语法验证
- magicComment：魔法注释支持
- 其他内部实验性功能
配置处理机制安全可靠，不会影响现有功能的稳定性。
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 检查实验性功能的文档
echo "检查实验性功能文档..."
fd -t f "README" -X rg -l "experimental"
# 检查相关测试用例
echo "检查测试覆盖..."
rg -l "test.*experimental" "crates/mako/src"
# 检查配置模式的使用示例
echo "检查配置示例..."
fd -t f "example" -X rg -l "experimental"
Length of output: 450
Script:
#!/bin/bash
# 搜索所有包含 experimental 的配置相关文件
echo "搜索配置文件中的实验性功能..."
rg -l "experimental" "crates/mako/src"
# 检查配置结构定义
echo "检查配置结构..."
ast-grep --pattern 'struct $_ {
$$$
experimental: $_,
$$$
}'
# 搜索实验性功能的具体使用
echo "搜索实验性功能的使用..."
rg "experimental" -A 3 -B 3
# 检查配置相关的测试
echo "检查配置测试..."
fd -t f "test" -X rg -l "config.*experimental|experimental.*config"
Length of output: 26059
crates/mako/src/compiler.rs (1)
244-253: 关于不安全代码块的使用
使用 unsafe 块可能导致未定义行为。确保加载的 Rust 插件是可信的，并且 _plugin_create 函数在给定选项的情况下是安全的。建议添加检查或约束以降低潜在风险。
Comment on lines
244
to
253
| unsafe { | ||
| for rust_plugin in config.experimental.rust_plugins.clone() { | ||
| let lib = Arc::new(Library::new(rust_plugin.path)?); | ||
| let plugin_create_fn: libloading::Symbol< | ||
| unsafe extern "C" fn(option: String) -> Arc<dyn Plugin>, | ||
| > = lib.get(b"_plugin_create").unwrap(); | ||
| let plugin = plugin_create_fn(rust_plugin.options); | ||
| external_plugins.push(plugin); | ||
| } | ||
| } |
There was a problem hiding this comment.
需要加强动态库加载的安全性和错误处理
当前实现存在以下问题：
- 缺少对加载库的有效性验证
- 错误处理不够完善
- 未对插件接口进行版本检查
建议重构为：
+ fn load_rust_plugin(plugin_path: String, options: String) -> Result<Arc<dyn Plugin>> {
+ // 验证插件文件是否存在且具有正确的格式
+ if !std::path::Path::new(&plugin_path).exists() {
+ return Err(anyhow!("Plugin file not found: {}", plugin_path));
+ }
+
+ unsafe {
+ let lib = Library::new(&plugin_path)
+ .map_err(|e| anyhow!("Failed to load plugin {}: {}", plugin_path, e))?;
+
+ // 验证插件版本兼容性
+ let version_fn: libloading::Symbol<unsafe extern "C" fn() -> u32> =
+ lib.get(b"_plugin_version")
+ .map_err(|_| anyhow!("Plugin {} is missing version information", plugin_path))?;
+
+ let version = version_fn();
+ if version != PLUGIN_API_VERSION {
+ return Err(anyhow!("Plugin {} version mismatch", plugin_path));
+ }
+
+ // 加载插件创建函数
+ let create_fn: libloading::Symbol<unsafe extern "C" fn(String) -> Arc<dyn Plugin>> =
+ lib.get(b"_plugin_create")
+ .map_err(|_| anyhow!("Plugin {} is invalid", plugin_path))?;
+
+ Ok(create_fn(options))
+ }
+ }
let mut external_plugins: Vec<Arc<dyn Plugin>> = vec![];
for rust_plugin in config.experimental.rust_plugins.clone() {
- unsafe {
- let lib = Arc::new(Library::new(rust_plugin.path)?);
- let plugin_create_fn: libloading::Symbol<
- unsafe extern "C" fn(option: String) -> Arc<dyn Plugin>,
- > = lib.get(b"_plugin_create").unwrap();
- let plugin = plugin_create_fn(rust_plugin.options);
- external_plugins.push(plugin);
- }
+ match load_rust_plugin(rust_plugin.path, rust_plugin.options) {
+ Ok(plugin) => external_plugins.push(plugin),
+ Err(e) => {
+ eprintln!("Warning: Failed to load plugin: {}", e);
+ continue;
+ }
+ }
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| unsafe { | |
| for rust_plugin in config.experimental.rust_plugins.clone() { | |
| let lib = Arc::new(Library::new(rust_plugin.path)?); | |
| let plugin_create_fn: libloading::Symbol< | |
| unsafe extern "C" fn(option: String) -> Arc<dyn Plugin>, | |
| > = lib.get(b"_plugin_create").unwrap(); | |
| let plugin = plugin_create_fn(rust_plugin.options); | |
| external_plugins.push(plugin); | |
| } | |
| } | |
| fn load_rust_plugin(plugin_path: String, options: String) -> Result<Arc<dyn Plugin>> { | |
| // 验证插件文件是否存在且具有正确的格式 | |
| if !std::path::Path::new(&plugin_path).exists() { | |
| return Err(anyhow!("Plugin file not found: {}", plugin_path)); | |
| } | |
| unsafe { | |
| let lib = Library::new(&plugin_path) | |
| .map_err(|e| anyhow!("Failed to load plugin {}: {}", plugin_path, e))?; | |
| // 验证插件版本兼容性 | |
| let version_fn: libloading::Symbol<unsafe extern "C" fn() -> u32> = | |
| lib.get(b"_plugin_version") | |
| .map_err(|_| anyhow!("Plugin {} is missing version information", plugin_path))?; | |
| let version = version_fn(); | |
| if version != PLUGIN_API_VERSION { | |
| return Err(anyhow!("Plugin {} version mismatch", plugin_path)); | |
| } | |
| // 加载插件创建函数 | |
| let create_fn: libloading::Symbol<unsafe extern "C" fn(String) -> Arc<dyn Plugin>> = | |
| lib.get(b"_plugin_create") | |
| .map_err(|_| anyhow!("Plugin {} is invalid", plugin_path))?; | |
| Ok(create_fn(options)) | |
| } | |
| } | |
| let mut external_plugins: Vec<Arc<dyn Plugin>> = vec![]; | |
| for rust_plugin in config.experimental.rust_plugins.clone() { | |
| match load_rust_plugin(rust_plugin.path, rust_plugin.options) { | |
| Ok(plugin) => external_plugins.push(plugin), | |
| Err(e) => { | |
| eprintln!("Warning: Failed to load plugin: {}", e); | |
| continue; | |
| } | |
| } | |
| } |
xusd320
approved these changes
Dec 17, 2024
There was a problem hiding this comment.
Actionable comments posted: 2
♻️ Duplicate comments (1)
crates/mako_plugin_macro/src/lib.rs (1)
13-23: 🛠️ Refactor suggestion改进错误处理并添加函数文档
- 使用
unwrap()处理错误可能导致编译器 panic，这是一个重复出现的问题。- 生成的
_plugin_create函数缺少文档注释。建议应用以下修改：
fn handler_create(input: TokenStream2) -> TokenStream2 { - let ast = parse2::<DeriveInput>(input).unwrap(); + let ast = parse2::<DeriveInput>(input) + .expect("解析派生宏输入失败，请确保语法正确"); let struct_name = &ast.ident; let ts = quote! { + /// 创建插件实例的工厂函数 + /// + /// # 参数 + /// * `option` - 插件的配置选项 + /// + /// # 返回值 + /// 返回包装在 Arc 中的插件实例 #[no_mangle] pub fn _plugin_create(option: serde_json::Value) -> std::sync::Arc<dyn Plugin> { std::sync::Arc::new(#struct_name::new(option)) } }; ts }
🧹 Nitpick comments (3)
crates/mako/src/compiler.rs (1)
272-272: 建议添加插件顺序的说明文档当前实现中外部插件在内置插件之前添加，这可能会影响插件的处理顺序。建议：
- 添加注释说明插件加载顺序的要求
- 考虑提供配置选项允许用户控制插件加载顺序
crates/mako_plugin_macro/Cargo.toml (1)
7-11: 建议优化依赖版本约束当前的依赖配置基本合理，但建议：
- 为了更好的安全性和可预测性，建议使用更精确的版本约束
- 对于proc-macro2和quote，建议使用类似
^1.0.0的形式[dependencies] -proc-macro2 = "1" -quote = "1" +proc-macro2 = "^1.0.0" +quote = "^1.0.0" serde_json = { workspace = true } syn = { version = "2", features = ["full"] }crates/mako_plugin_macro/src/lib.rs (1)
1-7: 建议添加不稳定特性的文档说明代码使用了不稳定的
box_patterns特性。建议添加注释说明使用该特性的原因，以及可能的稳定化时间线。这将有助于后续维护和升级。+// 使用不稳定特性 box_patterns 用于在 handle_local 中进行 box 模式匹配 +// 跟踪问题: https://github.com/rust-lang/rust/issues/29641 #![feature(box_patterns)]
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
⛔ Files ignored due to path filters (1)
Cargo.lockis excluded by!**/*.lock
📒 Files selected for processing (6)
crates/mako/src/ast.rs(1 hunks)crates/mako/src/compiler.rs(3 hunks)crates/mako/src/config.rs(4 hunks)crates/mako/src/config/experimental.rs(2 hunks)crates/mako_plugin_macro/Cargo.toml(1 hunks)crates/mako_plugin_macro/src/lib.rs(1 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
- crates/mako/src/ast.rs
- crates/mako/src/config/experimental.rs
🔇 Additional comments (5)
crates/mako/src/compiler.rs (1)
245-254:
需要加强动态库加载的安全性和错误处理
当前实现存在以下安全隐患：
- 使用了不安全的代码块但缺少必要的安全检查
- 直接使用unwrap()处理错误，可能导致程序崩溃
- 缺少插件版本兼容性验证
- 没有对插件接口进行验证
建议重构为：
- unsafe {
- for rust_plugin in config.experimental.rust_plugins.clone() {
- let lib = Arc::new(Library::new(rust_plugin.path)?);
- let plugin_create_fn: libloading::Symbol<
- unsafe extern "C" fn(option: Value) -> Arc<dyn Plugin>,
- > = lib.get(b"_plugin_create").unwrap();
- let plugin = plugin_create_fn(rust_plugin.options);
- external_plugins.push(plugin);
- }
- }
+ for rust_plugin in config.experimental.rust_plugins.clone() {
+ match unsafe { Self::load_plugin(&rust_plugin) } {
+ Ok(plugin) => external_plugins.push(plugin),
+ Err(e) => {
+ eprintln!("Failed to load plugin {}: {}", rust_plugin.path, e);
+ continue;
+ }
+ }
+ }
// 新增辅助函数
+ unsafe fn load_plugin(rust_plugin: &RustPlugin) -> Result<Arc<dyn Plugin>> {
+ // 验证插件文件
+ if !std::path::Path::new(&rust_plugin.path).exists() {
+ return Err(anyhow!("Plugin file not found: {}", rust_plugin.path));
+ }
+
+ let lib = Library::new(&rust_plugin.path)
+ .map_err(|e| anyhow!("Failed to load plugin: {}", e))?;
+
+ // 验证插件版本
+ let version_fn: Symbol<unsafe extern "C" fn() -> u32> =
+ lib.get(b"_plugin_version")
+ .map_err(|_| anyhow!("Invalid plugin: missing version"))?;
+
+ let version = version_fn();
+ if version != PLUGIN_API_VERSION {
+ return Err(anyhow!("Plugin version mismatch"));
+ }
+
+ // 加载创建函数
+ let create_fn: Symbol<unsafe extern "C" fn(Value) -> Arc<dyn Plugin>> =
+ lib.get(b"_plugin_create")
+ .map_err(|_| anyhow!("Invalid plugin: missing create function"))?;
+
+ Ok(create_fn(rust_plugin.options))
+ }Likely invalid or redundant comment.
crates/mako_plugin_macro/Cargo.toml (3)
1-6: 包元数据配置正确！
包名称、版本号、Rust版本和许可证的配置都符合Rust生态系统的最佳实践。
13-14: 过程宏配置正确！
proc-macro = true的配置正确指定了这是一个过程宏crate。
1-14: 验证过程宏的集成使用情况
作为新增的原生插件系统的一部分，我们需要验证此过程宏在代码库中的使用情况。
crates/mako_plugin_macro/src/lib.rs (1)
52-54: 验证全局状态操作的线程安全性
使用 GLOBALS.set 修改全局状态可能会在并发场景下产生问题。需要确保：
- 全局状态的修改是线程安全的
- 不会出现死锁或竞态条件
- 资源在操作完成后被正确释放
✅ Verification successful
Let me analyze the search results to verify the thread safety concerns of GLOBALS.set.
让我们再搜索一下 swc_core 中 GLOBALS 的具体实现：
基于已有的搜索结果，我可以生成最终的回应了。
GLOBALS.set 的使用是线程安全的
GLOBALS.set 是从 swc_core 继承的线程局部存储(thread-local storage)机制，具有以下特点：
- 它使用了 Rust 的线程局部存储，每个线程都有自己独立的存储空间
- 所有调用都遵循相同的模式：传入一个闭包并在作用域结束时自动清理
- 代码库中大量的测试用例都在并发环境下使用这个机制
因此，原始的担忧是不必要的，这个实现是线程安全的。
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# 搜索 GLOBALS 的使用情况和相关的同步机制
rg -A 5 "GLOBALS" --type rust
# 检查是否有相关的测试用例
fd -e rs test_ --exec grep -l "GLOBALS"
Length of output: 46140
Script:
# Search for GLOBALS type definition and implementation
ast-grep --pattern 'struct GLOBALS'
# Search for any synchronization primitives used with GLOBALS
rg -B 2 -A 5 'impl.*GLOBALS'
# Look for any documentation about thread safety
rg -l '///' | xargs rg -A 5 'GLOBALS'
Length of output: 1642
Script:
# Search for GLOBALS in swc_core dependency documentation
rg -l "swc_core.*GLOBALS" | xargs rg -B 3 -A 3 "GLOBALS"
# Look for any thread-local or synchronization related types used with GLOBALS
ast-grep --pattern 'use $$$thread$$$;'
# Search for any panic or safety related comments near GLOBALS usage
rg -B 3 -A 3 "// .*safety|// .*thread|// .*panic" --type rust | grep -C 5 "GLOBALS"
Length of output: 52780
Script:
# Search for GLOBALS in swc_core crate documentation
rg -A 5 "pub.*GLOBALS" --glob "Cargo.toml" --glob "*.rs"
# Look for thread-local storage usage
ast-grep --pattern 'thread_local!'
# Search for any synchronization mechanisms around GLOBALS
rg -B 3 -A 3 "set.*\&.*globals" --type rust
Length of output: 31717
Script:
# 查找 swc_core 依赖中的 GLOBALS 定义
rg -p "GLOBALS.*=.*thread_local" --type rust
# 查找 GLOBALS 相关的错误处理
rg "GLOBALS.*panic|GLOBALS.*error" --type rust
# 查找 GLOBALS 的类型定义
ast-grep --pattern 'type $_ = GLOBALS'
Length of output: 229
Comment on lines
+247
to
+255
| let result: Result<Value, serde_json::Error> = serde_json::from_str(default_config); | ||
| if let Ok(config) = result { | ||
| if let Some(rust_plugins) = config | ||
| .get("experimental") | ||
| .and_then(|experimental| experimental.get("rustPlugins")) | ||
| { | ||
| overrides_json = Some(json!({ "rust_plugins": rust_plugins })); | ||
| } | ||
| }; |
There was a problem hiding this comment.
🛠️ Refactor suggestion
需要改进配置解析的健壮性
当前实现存在以下问题：
- 使用unwrap()直接访问JSON数据，缺少错误处理
- 缺少对rust_plugins配置结构的验证
- 缺少实验性功能的文档说明
建议修改为：
- if let Ok(config) = result {
- if let Some(rust_plugins) = config
- .get("experimental")
- .and_then(|experimental| experimental.get("rustPlugins"))
- {
- overrides_json = Some(json!({ "rust_plugins": rust_plugins }));
- }
- };
+ if let Ok(config) = result {
+ if let Some(experimental) = config.get("experimental") {
+ if let Some(rust_plugins) = experimental.get("rustPlugins") {
+ // 验证rust_plugins的结构
+ if !rust_plugins.is_array() {
+ return Err(anyhow!("rustPlugins must be an array"));
+ }
+
+ // 验证每个插件的配置
+ for plugin in rust_plugins.as_array().unwrap() {
+ if !plugin.is_object()
+ || plugin.get("path").is_none()
+ || !plugin.get("path").unwrap().is_string() {
+ return Err(anyhow!("Invalid plugin configuration"));
+ }
+ }
+
+ overrides_json = Some(json!({ "rust_plugins": rust_plugins }));
+ }
+ }
+ };另外建议添加以下文档：
/// 实验性功能：Rust原生插件支持
///
/// # 配置示例
/// ```json
/// {
/// "experimental": {
/// "rustPlugins": [
/// {
/// "path": "./plugins/my-plugin.so",
/// "options": { ... }
/// }
/// ]
/// }
/// }
/// ```
Also applies to: 283-287
Comment on lines
+30
to
+70
| fn handle_local(_attr: TokenStream2, item: TokenStream2) -> TokenStream2 { | ||
| let ast = parse2::<ItemImpl>(item).unwrap(); | ||
| let items = &ast.items; | ||
| let mut expand_items: Vec<ImplItem> = vec![]; | ||
|
|
||
| items.iter().for_each(|impl_item| { | ||
| if let ImplItem::Fn(f) = impl_item { | ||
| let body = &f.block; | ||
|
|
||
| let has_context = f.sig.inputs.iter().any(|f| { | ||
| if let FnArg::Typed(PatType { | ||
| pat: box Pat::Ident(i), | ||
| .. | ||
| }) = f | ||
| { | ||
| i.ident.to_string().contains("context") | ||
| } else { | ||
| false | ||
| } | ||
| }); | ||
| let block = if has_context { | ||
| parse_quote!({ | ||
| mako::swc_core::common::GLOBALS.set(&context.meta.script.globals, || | ||
| #body | ||
| ) | ||
| }) | ||
| } else { | ||
| parse_quote!( | ||
| #body | ||
| ) | ||
| }; | ||
|
|
||
| expand_items.push(ImplItem::Fn(ImplItemFn { block, ..f.clone() })); | ||
| } | ||
| }); | ||
| let a = ItemImpl { | ||
| items: expand_items, | ||
| ..ast | ||
| }; | ||
| a.into_token_stream() | ||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
优化代码结构和错误处理
当前实现存在以下问题：
- 错误处理使用了
unwrap() - 上下文检测逻辑较为复杂
- 缺少函数级别的文档说明
建议进行如下改进：
+/// 处理本地上下文属性宏
+///
+/// 检测函数参数中是否包含 context，并在必要时包装函数体
fn handle_local(_attr: TokenStream2, item: TokenStream2) -> TokenStream2 {
- let ast = parse2::<ItemImpl>(item).unwrap();
+ let ast = parse2::<ItemImpl>(item)
+ .expect("解析 impl 块失败，请确保语法正确");
let items = &ast.items;
let mut expand_items: Vec<ImplItem> = vec![];
+ // 提取上下文检测逻辑到独立函数
+ fn has_context_param(arg: &FnArg) -> bool {
+ matches!(arg,
+ FnArg::Typed(PatType {
+ pat: box Pat::Ident(i),
+ ..
+ }) if i.ident.to_string().contains("context")
+ )
+ }
items.iter().for_each(|impl_item| {
if let ImplItem::Fn(f) = impl_item {
let body = &f.block;
- let has_context = f.sig.inputs.iter().any(|f| {
- if let FnArg::Typed(PatType {
- pat: box Pat::Ident(i),
- ..
- }) = f
- {
- i.ident.to_string().contains("context")
- } else {
- false
- }
- });
+ let has_context = f.sig.inputs.iter().any(has_context_param);📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| fn handle_local(_attr: TokenStream2, item: TokenStream2) -> TokenStream2 { | |
| let ast = parse2::<ItemImpl>(item).unwrap(); | |
| let items = &ast.items; | |
| let mut expand_items: Vec<ImplItem> = vec![]; | |
| items.iter().for_each(|impl_item| { | |
| if let ImplItem::Fn(f) = impl_item { | |
| let body = &f.block; | |
| let has_context = f.sig.inputs.iter().any(|f| { | |
| if let FnArg::Typed(PatType { | |
| pat: box Pat::Ident(i), | |
| .. | |
| }) = f | |
| { | |
| i.ident.to_string().contains("context") | |
| } else { | |
| false | |
| } | |
| }); | |
| let block = if has_context { | |
| parse_quote!({ | |
| mako::swc_core::common::GLOBALS.set(&context.meta.script.globals, || | |
| #body | |
| ) | |
| }) | |
| } else { | |
| parse_quote!( | |
| #body | |
| ) | |
| }; | |
| expand_items.push(ImplItem::Fn(ImplItemFn { block, ..f.clone() })); | |
| } | |
| }); | |
| let a = ItemImpl { | |
| items: expand_items, | |
| ..ast | |
| }; | |
| a.into_token_stream() | |
| } | |
| /// 处理本地上下文属性宏 | |
| /// | |
| /// 检测函数参数中是否包含 context，并在必要时包装函数体 | |
| fn handle_local(_attr: TokenStream2, item: TokenStream2) -> TokenStream2 { | |
| let ast = parse2::<ItemImpl>(item) | |
| .expect("解析 impl 块失败，请确保语法正确"); | |
| let items = &ast.items; | |
| let mut expand_items: Vec<ImplItem> = vec![]; | |
| // 提取上下文检测逻辑到独立函数 | |
| fn has_context_param(arg: &FnArg) -> bool { | |
| matches!(arg, | |
| FnArg::Typed(PatType { | |
| pat: box Pat::Ident(i), | |
| .. | |
| }) if i.ident.to_string().contains("context") | |
| ) | |
| } | |
| items.iter().for_each(|impl_item| { | |
| if let ImplItem::Fn(f) = impl_item { | |
| let body = &f.block; | |
| let has_context = f.sig.inputs.iter().any(has_context_param); | |
| let block = if has_context { | |
| parse_quote!({ | |
| mako::swc_core::common::GLOBALS.set(&context.meta.script.globals, || | |
| #body | |
| ) | |
| }) | |
| } else { | |
| parse_quote!( | |
| #body | |
| ) | |
| }; | |
| expand_items.push(ImplItem::Fn(ImplItemFn { block, ..f.clone() })); | |
| } | |
| }); | |
| let a = ItemImpl { | |
| items: expand_items, | |
| ..ast | |
| }; | |
| a.into_token_stream() | |
| } |
There was a problem hiding this comment.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (5)
crates/binding/src/lib.rs(2 hunks)crates/mako/src/compiler.rs(3 hunks)crates/mako/src/config.rs(4 hunks)crates/mako/src/config/mako.config.default.json(1 hunks)packages/mako/binding.d.ts(1 hunks)
🚧 Files skipped from review as they are similar to previous changes (3)
- packages/mako/binding.d.ts
- crates/mako/src/config/mako.config.default.json
- crates/mako/src/compiler.rs
🔇 Additional comments (2)
crates/mako/src/config.rs (2)
250-258: 需要改进配置解析的健壮性
当前实现存在与之前相同的问题，包括使用unwrap()可能导致panic等。
284-291:
建议增强错误处理机制
当前实现存在以下问题：
- 使用
unwrap()直接访问 JSON 数据，可能导致运行时崩溃 - 缺少对插件配置的结构验证
建议修改为：
- if let Some(overrides) = overrides_json {
- let rust_plugins: Vec<RustPlugin> =
- serde_json::from_value(overrides.get("rust_plugins").unwrap().clone())?;
- config.experimental.rust_plugins = rust_plugins;
- }
+ if let Some(overrides) = overrides_json {
+ if let Some(plugins_value) = overrides.get("rust_plugins") {
+ match serde_json::from_value::<Vec<RustPlugin>>(plugins_value.clone()) {
+ Ok(rust_plugins) => {
+ config.experimental.rust_plugins = rust_plugins;
+ }
+ Err(e) => {
+ return Err(anyhow!("Invalid rust_plugins configuration: {}", e));
+ }
+ }
+ }
+ }Likely invalid or redundant comment.
| }; | ||
| experimental?: { | ||
| webpackSyntaxValidate?: string[]; | ||
| rustPlugins?: Array<[string, any]>; |
There was a problem hiding this comment.
🛠️ Refactor suggestion
建议加强类型定义和文档说明
当前的 rustPlugins 类型定义过于宽松：
- 使用
any类型不利于类型安全 - 缺少对插件配置结构的文档说明
建议修改为：
- rustPlugins?: Array<[string, any]>;
+ rustPlugins?: Array<{
+ // 插件的路径
+ path: string;
+ // 插件的配置选项
+ options?: {
+ [key: string]: string | number | boolean;
+ };
+ }>;同时建议添加相关文档说明插件的配置格式和用法。
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| rustPlugins?: Array<[string, any]>; | |
| rustPlugins?: Array<{ | |
| // 插件的路径 | |
| path: string; | |
| // 插件的配置选项 | |
| options?: { | |
| [key: string]: string | number | boolean; | |
| }; | |
| }>; |
elrrrrrrr
pushed a commit
that referenced
this pull request
Jul 9, 2025
* fix: env_replacer should not replace user defined variable in scope (#1577) * fix: env_replacer should not replace user defined variable in scope * test: add test cases for env_replacer * chore: code style * release: @umijs/mako@0.8.11 * chore: bundler-mako@0.8.11 * docs: add changelog for v0.8.11 * fix(tree-shaking): detect export var side effects (#1579) * test: ✅ add a failure test * fix: 🐛 add is pure detection in export var decl * fix: bad output when chunk_loading_global containing quotation mark (#1582) * chore: ➕ add a subdot cli tool script (#1585) * fix(win): copy don't work under windows (#1587) * fix(win): module id should be win_pathed (#1588) * feat(tree-shaking): optimize import namespace used all exports to partial used of source modules (#1584) * test: ✅ add failure test case * feat: ✨ add collect prop explicit field * feat: ✨ collect explicit member prop access to optizmize used export in dep module replace USE ALL export to partial used exports * fix: dedestructuring before collect ExplicitProps * test: ✅ add back trace env var * test: ✅ update test case * fix: 🐛 add globals and helpers --------- Co-authored-by: Jinbao1001 <nodewebli@gmail.com> * fix: merge mako config (#1578) * fix: merge mako config * fix: merge mako config * fix:clear deps should not panic when module not found (#1581) * fix:clear deps should not panic when module not found * chore: use tracing warn * fix: delete log * Revert "fix: merge mako config (#1578)" (#1589) This reverts commit c08821d. * fix: watch too many file error (#1550) * fix: watch too many file error * chore: delete print * chore: delete log * release: @umijs/mako@0.8.8-rc.1 * fix: conflict * feat: support numeric module Id (#1561) * feat: moduleIdStrategy support numberous * fix: typos * fix: typos * fix: change name * fix: typos * release: @umijs/mako@0.8.12 * chore: fix typo and doc (#1591) * fix: chunk_loading_global (#1590) * fix: bad entry output when chunk_loading_global containing singe quote * test: add test cases for chunk_loading_global * docs: update * chore: update lock * chore: remove useless dependencies (#1595) * refactor: 🔥 rm ci warn logs (#1596) * fix: devServer put static serve proxy after umi proxy middleware (#1558) * fix: fix umi load html file failed, * test: add umi devServer test case * fix: typo * fix: hmr on hyper-static-file error * fix: import expect.mjs error on github workflow. * fix: import expect.mjs error on github workflow. * fix: 🐛 expect for error case * fix: 🐛 dev.hmr dont stop * fix: 🐛 add OKAM env * fix: 🐛 wait for mako server * fix: 🐛 kill by children process * test: ✅ add umi.css * refactor: 🎨 unify expect file * feat: export killMakoDevServer from test-hmr.mjs, make it public for all test case * test: ✅ unify expect file * chore: ➕ use express-http-proxy for static proxy * feat: ✨ better mako static proxy * test: ✅ support umi dev test with local mako * chore: ⬆️ update pnpm-lock * chore: 🎨 * fix: 🐛 ignore children process killed error --------- Co-authored-by: huanyu.why <huanyu.why@antgroup.com> Co-authored-by: pshu <pishu.spf@antfin.com> * fix(tree-shaking): object spread transform should go before deconstructing (#1598) * fix: 🐛 deconstructing needs object spread transform first * test: ✅ add guardian syntax * release: @umijs/mako@0.8.13-canary.20240918.1 * chore: bundler-mako@0.8.13-canary.20240918.1 * chore: 🎨 thread name after mako (#1601) * refactor: 🎨 rayon is not friendly to js users * chore: ✏️ rename tokio worker with mako * revert: import namespace optimize (#1606) * Revert "fix(tree-shaking): object spread transform should go before deconstructing (#1598)" This reverts commit 9434d99. * Revert "feat(tree-shaking): optimize import namespace used all exports to partial used of source modules (#1584)" This reverts commit 81a52f8. * chore: 🔧 update mako clean script * release: @umijs/mako@0.8.13 * chore: bundler-mako@0.8.13 * docs: change log 0923 (#1607) * docs: 📝 change log * docs: 📝 change log 0923 * chore: ✏️ * fix: 🐛 turn off express-http-proxy's keep alive (#1612) * fix: 🐛 turn off express-http-proxy's keep alive * refactor: 🔥 remove timeout config * release: @umijs/mako@0.8.14 * chore: bundler-mako@0.8.14 * refactor: napi threadsafe function (#1608) * refactor: napi threadsafe function * chore: update binding typings * refactor: code pieces * fix: catch napi tsfn promise rejection * chore: update binding typings * docs: 📝 change log 20240925 (#1613) * feat: disable webp to base64 (#1602) * feat: init * fix: context * fix: no use * fix: typos * fix: typos * fix: typos * fix: typos * fix(bundler-mako): experimental config should be merged deeply (#1617) * refactor: config codes organization (#1618) * refactor: config codes organization * fix: typos * refactor: config parse error * fix: clickToComponent don't work (#1620) * fix: duplicate_package_checker panic when no package.json is supplied (#1621) * fix: file_stem index out of bound (#1623) * feat: add resolve_id plugin hook (#1625) * feat: add resolve_id plugin hook * chore: update docs * feat: add external * release: @umijs/mako@0.8.15 * chore: bundler-mako@0.8.15 * docs: changelog for 0.8.15 * chore: update the release instruction (#1627) * refactor: code-splitting config (#1629) * feat: add loadInclude plugin hook (#1630) * feat: add { isEntry } for resolve_id plugin hook (#1631) * feat/upgrade swc (#1444) * 🚧 * 🚧 a basic working version * chore: 🚨 lint happy * refactor: 🎨 adjust to new swc * refactor: 🎨 remove deprecated methods * chore: 🚨 lint happy * feat: ✨ update swc emotion * chore: 🔧 remove useless profile in sub crate * chore: 🔧 add back emotion plugin * refactor: 🎨 add back merge source map * test: ✅ hot update js file served by hyper static, it use text/javascript * chore: 🔧 lock update * chore: 🔧 clean up swc core feature * refactor: 🎨 fix breaking change of ctxt of span * fix: 🐛 ctxt apply mark * refactor: 🎨 use DUMMY CTXT instead of SyntaxContext::empty() * chore: ⬆️ temperal use mdxjs from kdy branch * feat: ✨ re-enable mdxjs * feat: ✨ swc_core 0.100.1 * chore: 🙈 ignore fmt in fixtures * chore: 🚨 lint happy * chore: ⬆️ swc_common * chore: ✏️ typo * release: @umijs/mako@0.8.1-canary.20240812.1 * chore: bundler-mako@0.8.1-canary.20240812.1 * chore: ⬆️ swc_core 0.100.6 * release: @umijs/mako@0.8.1-canary.20240814.2 * chore: bundler-mako@0.8.1-canary.20240814.2 * chore: 🚨 lint happy * chore: 🔧 CI build bindings * chore: 🔧 fix build docker * refactor: 🔥 remove aarch64-unknown-linux-gnu * chore: 🔧 create tar * chore: 🙈 * release: @umijs/mako@0.8.3-canary.20240820.1 * chore: bundler-mako@0.8.3-canary.20240820.1 * chore: 🔧 wrong donwload param * chore: 🔧 upload download actions should be same version * chore: 🔧 try codecov in ci * refactor: 🔥 remove unnecessary target * refactor: 🎨 use swc comments * fix: 🐛 after upgrade to swc_core it should remove paren before minifiy * refactor: 🎨 move dummy ctxt defintion to ast mod * chore: 🚨 lint happy * release: @umijs/mako@0.8.8-canary.20240902.1 * chore: bundler-mako@0.8.8-canary.20240902.1 * release: @umijs/mako@0.8.8-canary.20240903.3 * chore: bundler-mako@0.8.8-canary.20240903.3 * refactor: 🎨 use VisitMut + Fold code style * chore: ⬆️ update pnpm-lock * chore: 🙈 * revert: ⏪ delete musl bindin * release: @umijs/mako@0.8.9-canary.20240909.1 * chore: bundler-mako@0.8.9-canary.20240909.1 * release: @umijs/mako@0.8.11-canary.20240910.1 * chore: bundler-mako@0.8.11-canary.20240910.1 * fix: 🐛 use chars() instead of bytes() * fix: 🐛 unescape html entity by html escape crate * release: @umijs/mako@0.8.14-canary.20240924.1 * chore: bundler-mako@0.8.14-canary.20240924.1 * release: @umijs/mako@0.8.15-canary.20240927.1 * chore: bundler-mako@0.8.15-canary.20240927.1 * fix: hash not stable (&revert import * as optimize) (#1610) * Revert "revert: import namespace optimize (#1606)" This reverts commit a485358. * fix: hash not stable * fix: deps sort not stable * fix: deps sort not stable * fix: deps sort not stable * fix: delete binding * fix: var name * chore: iter to into * fix: format * release: @umijs/mako@0.9.0 * chore: bundler-mako@0.9.0 * docs: 📝 changelog 0.9.0 * fix: duplicate_package_checker panic when package.json has no version field (#1634) * feat: magic comment chunk name (#1628) * refactor: code-splitting config * feat: support magic comment chunk name basically * fix: magic comment chunk name for webworker * refactor: use ImportOptions to represent option from magic comments * fix: dep replacer when magic comments chunk name existed * test: update test cases for magic comments chunk name * fix: dep replacer when dynamic import depencies is missing * chore: remove useless codes * refactor: code styles * docs: add todo for ChunkId * test: fix visitors::dynamic_import::tests::test_dynamic_import * test: fix test::hmr * fix: dep replacer when dynamic import css modules or moduleIdStrategy is hashed * chore: remove meaning less changes * test: enable magic comment chunk name in fixtures/umi * docs: add docs for magic comment chunk name * feat: support webpackIgnore and makoIgnore magic comment (#1636) * feat: support webpackIgnore and makoIgnore magic comment * chore: fmt * chore: rename magic_comment_chunk_name to magic_comment * chore: fix typo * feat: add transform plugin hook (#1637) * feat: add transform plugin hook * docs: add docs * chore: fmt * chore: perf * feat: add transformInclude plugin hook (#1639) * feat: add transformInclude plugin hook * chore: fmt * Fix: import namespace optimize panic with nested for of stmt (#1640) * test: ✅ add import namespace optimize panic test case * fix: 🐛 fix nested for of stmt panic * release: @umijs/mako@0.9.2-canary.20241016.1 * chore: bundler-mako@0.9.2-canary.20241016.1 * release: @umijs/mako@0.9.2 * chore: bundler-mako@0.9.2 * docs: 📝 changelog 0.9.2 * feat: add buildEnd plugin hook (#1644) * feat: add enforce plugin hook (#1646) * feat: add enforce plugin hook * chore: code style * chore: code style * chore: fix lint * chore: 🎨 add missing binding type * release: @umijs/mako@0.9.3-canary.20241016.1 * chore: bundler-mako@0.9.3-canary.20241016.1 * feat: add writeBundle plugin hook (#1650) * feat: add watch_changes plugin hook (#1651) * feat: add watch_changes plugin hook * chore: fix lint * chore: fix ts define * fix: mako on windows don't work (#1652) * fix: devtool sourcemap explosion in windows (#1653) * chore: remove dead code * fix: should not re-group when span changed (#1654) * fix: umd should be import as cjs (#1642) * fix: umd should be import as cjs * refactor: 🎨 just short circuit typeof define to prevent define takes effect * revert: ⏪ binding.d.ts --------- Co-authored-by: pshu <pishu.spf@antfin.com> * fix: 🐛 add process.env.SOCKET_SERVER define to prevent process polyfilll (#1655) * release: @umijs/mako@0.9.3-canary.20241023.1 * chore: bundler-mako@0.9.3-canary.20241023.1 * release: @umijs/mako@0.9.3 * chore: bundler-mako@0.9.3 * docs: changelog for 0.9.3 * fix: hmr with magic comment chunk name (#1663) * feat: enable magicComment features by default (#1667) * feat(bundler-mako): add moduleIdStrategy to supportMakoConfigKeys (#1664) * fix: async module in circular dependence (#1659) * test: ✅ add test async module in circular dependencies * refactor: 🎨 handle async polution by traversal * refactor: 🎨 use default over expect * feat: compatible codeSplitting config with umi (#1669) * feat: compatible codeSplitting config with umi * test: fix e2e code-splitting.granular * fix: umi codeSplitting: depPerChunk * Feat/benchmark workflows (#1671) * feat: benchmark-workflows * fix: 修改Github Secrets * release: @umijs/mako@0.9.4 * chore: bundler-mako@0.9.4 * docs: 📝 changelog 0.9.4 * chore: Optional parameters (#1679) * chore: Optional parameters * Update index.ts * fix: skip module should skip async module (#1662) * release: @umijs/mako@0.9.5 * chore: bundler-mako@0.9.5 * docs: update changelog * docs: update changelog * feat(ssu): handle dependence changing while watching (#1690) * refactor: 🎨 add after update aspect for rebuild cached modules * refactor: 🎨 add next_build aspect in build_my_modify * feat: ✨ 区分 ssu firstbuild 和 updating 两者状态 * fix: pnpm workspace watch too many files (#1684) * fix: ✅ ts annotated declare variable treat as top level variable (#1682) * test: ✅ add ts declare annotated variable as top level * refactor: 🎨 mv clean syntax context to visitors folder * fix: 🐛 strip ts/tsx first, then do normal transform * feat: move ensure runtime to entry (#1660) * feat: ✨ add ensure2 replace in dynamic replace * feat: ✨ ensure 2 runtime * feat: ✨ add experimental centralEnsure config * refactor: 🎨 add struct ReslvedReplaceInfo * feat: ✨ add central ensure plugin * refactor: 🎨 extract module ensure map * refactor: 🎨 add back chunk id in replace info * refactor: 🎨 fix case one source with different import type * refactor: 🎨 extract hmr runtime update code aspect * release: @umijs/mako@0.9.6-canary.20241107.1 * chore: bundler-mako@0.9.6-canary.20241107.1 * feat: keep unresolved nodejs require (#1689) * fix: regexpr for nodejs intenal modules igonre * feat: not replace unresolved nodejs require to __mako_require__ * fix: define util require should be __mako_require__ * feat: add expreriental.keep_unresolved_node_require * feat: add expreriental.ignore_non_literal_require * chore: 🔥 remove unused fn * release: @umijs/mako@0.9.6 * chore: bundler-mako@0.9.6 * docs: changelog for 0.9.6 * fix(SSU): 🐛 in case external not avaible to all entries (#1698) * fix(SSU): 🐛 in case external not avaible to all entries * refactor: 🎨 explict ignore the error * fix: devserver response header add cacheControl no-cache (#1692) * fix: add no-cache * feat: add cross origin * fix: resonse header add cors and no_cache for all branch (#1699) * fix: judge devServer instead of writeToDisk * fix: add branch header * refactor: 🎨 static file with 0 ages --------- Co-authored-by: pshu <pishu.spf@antfin.com> * release: @umijs/mako@0.9.7 * chore: bundler-mako@0.9.7 * docs: 📝 update changelog for 0.9.7 * chore: ✏️ remove some if (#1706) * fix: optimization.concatenateModules dts lost (#1708) * refactor: 🔥 enter ensure 使用 chunk sync dep 减少首屏 chunk 数量 (#1707) * fix: 🐛 typing of stats (#1712) * fix: 🐛 detect circular deps output file content (#1715) * chore: update @umijs/mako typings * feat: ensure esm imports exists when mode is production (#1709) * feat: ensure esm imports exists when mode is production * release: @umijs/mako@0.9.8 * chore: bundler-mako@0.9.8 * docs: update docs * fix: node ignores (#1716) * feat: supports publicPath: auto (#1717) * feat: auto resolve entry file extension (#1718) * feat: auto resolve entry file extension * fix: remove useless clone * Fix/context module source with first empty quasis (#1719) * test: ✅ add first empty quasis template string module source case * fix: 🐛 first emtpy quasis case * fix: inline css config deserialize (#1720) * fix: node ignore should support node: prefixed only built-in modules (#1721) * release: @umijs/mako@0.9.9 * docs: suggest using volta to manage node and pnpm's version * chore: bundler-mako@0.9.9 * docs: update CHANGELOG.md * feat: supports umd export (#1723) * feat: supports umd export * fix: umd config binding typing * fix: typos * fix: umd export * chore: update typings * fix: replace the "typeof __webpack_require__" content (#1688) * fix: replace the "typeof __webpack_require__" content * fix: add some other webpack string name * fix: 增加对typeof 表达式的处理 * fix: delete log * fix: rename --------- Co-authored-by: shikuan.sk <shikuan.sk@antgroup.com> * fix: umd config deserialization (#1726) * feat: support case sensitive (#1714) * feat: add CaseSensitivePlugin * FIX: update path check * fix: clippy error * fix: 调整判断 * fix: 修复目录读取 * fix: 修改参数名称 * fix: 调整测试方式添加e2e断言，并增加配置项只有mac系统下才需要开启相关配置 * fix: 删除过滤条件 * fix: 删除多余测试文件，增加更新内容 * fix: 删除多余log * fix: 测试执行 * fix: 添加测试系统 * fix: 调整顺序 * fix: 添加测试系统 * fix: 非mac环境断言 * fix: 引用遗漏 * fix: 断言 * fix: 删除默认 * fix: 默认配置 * fix: 测试覆盖 * Revert "fix: 测试覆盖" This reverts commit b0a2e66. --------- Co-authored-by: shikuan.sk <shikuan.sk@antgroup.com> * refactor: 🔥 remove unecessary transform (#1727) * feat: output filename (#1725) * refactor: 🎨 add file name template and chunk name in ChunkFile struct * feat: ✨ add config to output#filename * feat: ✨ render filename when output#filename configed * feat: ✨ calc hash in ast impl for entry * test: ✅ add test case * test: ✅ add ut * chore: 🔧 disable codecov error * refactor: 🎨 remove clone * fix: 🐛 hash when necessary * chore: 🔧 add codecov.yml * release: @umijs/mako@0.9.10-canary.20241218.1 * chore: ⬆️ update pnpm-lock * feat: native plugin init (#1691) * feat: init rust plugin * chore: delete print * Rename cargo.toml to Cargo.toml * chore: update * fix: type * fix: plugin options string * fix: cfg test * release: @umijs/mako@0.10.0 * chore: bundler-mako@0.10.0 * docs: 📝 changelog 2024.12.20 * chore: 🔧 for quick setup dep to debug (#1733) * fix: support optional chaining in environment variable (#1730) * fix: support optional chaining in environment variable * test(): add edge cases for optional chaining in env_replacer * refactor: 🎨 no need to resolve empty url in css (#1732) * refactor: 🎨 no need to resolve empty url in css * refactor: 🎨 add test case * feat: support unplugin context (#1728) * feat: support plugin context * fix: napi context * chore: revert changes * chore: improve * feat: add error * feat: warn and error support object * feat: support emit_file * ci: fix test * chore: improve * chore: update test * chore: format * chore: don't support add watch file * feat: load and transform adapter, and add unplugin-replace example * chore: test unplugin-icons * chore: update pnpm-lock.yaml * docs: improve --------- Co-authored-by: xusd320 <xusd320@gmail.com> * fix: legacy octal escape is not permitted in strict mode (#1736) * fix: legacy octal escape is not permitted in strict mode * fix: e2e inline css * release: @umijs/mako@0.11.0 * chore: bundler-mako@0.11.0 * fix: pnpm lock * docs: 📝 changelog 2024.12.26 * Revert "feat: support unplugin context (#1728)" (#1737) This reverts commit 3dd6d9d. * release: @umijs/mako@0.11.1 * chore: bundler-mako@0.11.1 * feat: support unplugin context (#1741) * feat: support plugin context * fix: napi context * chore: revert changes * chore: improve * feat: add error * feat: warn and error support object * feat: support emit_file * ci: fix test * chore: improve * chore: update test * chore: format * chore: don't support add watch file * feat: load and transform adapter, and add unplugin-replace example * chore: test unplugin-icons * chore: update pnpm-lock.yaml * docs: improve --------- Co-authored-by: xusd320 <xusd320@gmail.com> * fix: #1007 (#1738) support BinaryExpression Co-authored-by: shikuan.sk <shikuan.sk@antgroup.com> * fix: win path problem with context module and require context (#1742) * chore(mako): add debug notice for local builds (#1743) * fix: normalize Windows paths in ModuleId constructors (#1744) * fix: normalize Windows paths in Compiler output path handling (#1745) * fix: typos * release: @umijs/mako@0.11.2 * chore: bundler-mako@0.11.2 * docs: update CHANGELOG.md * feat(create-mako): refactor create-mako (#1751) * chore: add issue and pull request templates for better contribution guidelines (#1753) * fix: ensure parent directories are created when writing to disk in MemoryChunkFileCache (#1755) * chore: release @umijs/tools * release: @umijs/mako@0.11.3 * chore: update the release introduction * ci: fix ci (#1758) * chore: upgrade @umijs/tools and do github release and changelog generate and translation by script * docs: changelog for 0.11.3 * chore: add check-ecosystem-usages script (#1759) * fix: analyze don't work in safari (#1761) * fix(mako): cli delay exit (#1762) * dep: @umijs/tools@0.1.23 * fix: load wasm (#1705) * fix: 修复load .wasm文件对importObject的处理 * fix: 删除没必要的输出 * fix: 修改生成的成员表达式js代码 * fix: 变量重命名 * fix: 修复代码lint报错 * test: 补充wasm_runtime测试用例 * chore: 补充import js方式的示例 * chore: 修改import js示例wasm产物格式 * chore: wasmparser依赖包在配置文件的位置 * chore: 删除多余的.wasm load逻辑 --------- Co-authored-by: xusd320 <xusd320@gmail.com> * fix: chunk groups' order when building mpa (#1763) * feat(copy): support advanced copy configuration with custom target paths (#1711) * feat(copy): support advanced copy configuration with custom target paths - Add CopyConfig enum to support both basic and advanced copy modes - Basic mode: maintains backward compatibility with string[] format - Advanced mode: supports {from: string, to: string} format for custom paths - Update copy plugin to handle both configuration formats - Ensure target directories are created automatically Example config: { 'copy': [ 'public', // basic mode { 'from': 'assets', 'to': 'static' } // advanced mode ] } * fix(copy): prevent path traversal in copy plugin Add path canonicalization and validation to ensure target paths remain within the destination directory * chore: Update `copy` config type in Mako bundler - Updated the type of the `copy` property in the `BuildParams` interface to support both `string` and `{ from: string; to: string }`. - Ensured the `copy` configuration is properly validated to handle both types. * docs: Update `copy` config type in documentation - Updated the `copy` property type in the configuration documentation to reflect the change from `string[]` to `(string | { from: string; to: string })[]`. - Clarified that the `copy` configuration can now accept both strings and objects with `from` and `to` properties. * test(copy): add e2e tests for copy plugin from/to pattern - Update config.copy test fixtures to cover from/to pattern - Add assertions for copied files in new location - Adjust copy plugin path validation * fix(copy): improve path validation and cleanup for copy plugin - Add directory cleanup when path validation fails - Use canonicalized paths for more reliable path validation - Add concatenateModules option type to BuildParams * fix: ci (#1768) * release: @umijs/mako@0.11.4 * chore: bump version * docs: 📝 changelog 2025.02.12 * chore: update changelog 2025.02.12 * fix: plugin context gc (#1769) * fix: mako已经支持了scss 但是没有支持module.scss文件 (#1770) Co-authored-by: shikuan.sk <shikuan.sk@antgroup.com> * feat: add module federation plugin (#1764) * feat: support module federation * feat: mf exposes to remote entries * chore: code styles * feat: mf container entry impl * fix: mf container entry * fix: mf runtime initOptions * feat: add containter references * feat: impl mf remote * feat: improve mf exposes * fix: mf exposes runtime factory * fix: mf plugin execution order * chore: update mf demo * feat: generate mf manifest in rust * fix: remote stats.json * refactor: code styles * chore: add some FIXME * refactor: mf plugin mods files * refactor: mf plugin mods files * chore: remove dead code * --wip-- [skip ci] * fix: remote stats.json * fix: typos * chore: simpify mf runtime codes fmt * refactor: mf containter plugin * feat: mf shared workaround * feat: mf shared workaround * fix: runtime template and remove some useless codes * fix: mf dev server * fix: mf shared config * feat: supports chunk group exclude * feat: mf patch code splitting * feat: mf shared manifest * feat: add config hash for mf shared module * chore: update mako typings * chore: code styles * chore: fix typo * chore: code styles * perf: improve performance * chore: code styles * chore: rename types * feat: add options to disable mf manifest * feat: entry config should be defined as BTreeMap * fix: mf shared consume and supports eager config * fix: mf shared eager * fix: not generate chunk for mf remote module * fix: typos * feat: add entry filename supports * chore: remove meaning less changes * fix: entry filename and mf config * release: @umijs/mako@0.11.4-canary.20250206.0 * fix: ignore shared dep when it is been external * Revert "release: @umijs/mako@0.11.4-canary.20250206.0" This reverts commit d3105d9. * release: @umijs/mako@0.11.4-canary.20250207.0 * fix: skip serialize mf manifest remoteEntry if none * fix: mf manifest remoteEntry address * Revert "release: @umijs/mako@0.11.4-canary.20250207.0" This reverts commit 6179982. * fix: typo * fix: mako mf manifest publicPath * fix: mf manifest panic * fix: mf typings * test: add e2e test for mf * fix: typo * chore: update README * fix: update mf bingding typings * fix: typings * fix: should not generate mf remotes runtime when remotes is empty * chore: remote wrong comment * feat: add chunk matcher for mf * fix: mf binding typings * chore: remove debug print statements * docs: update moduleFederation configuration docs * fix: mf config docs * chore: update CONTRIBUTING.md * release: @umijs/mako@0.11.5 * chore: update CHANGELOG.md and versions * feat: support to disable camel2DashComponentName of transformImport (#1773) * feat: support to disable camel2DashComponentName of transformImport * fix: typings * fix: 修复sass/less-loader的路径解析 (#1771) * fix: 支持webpack中sass-loader的路径解析 * chore: 调整目录 * chore: 移除注释等 * chore: 引入loader-runner * chore: sass-loader * chore: 修改loader返回空值处理 * test: 设置loader resolver的别名 * chore: update lock * fix: loader options * refactor: 提取插件代码 * fix: getResolve * fix: 修复runLoaders中的错误处理逻辑 * release: @umijs/mako@0.11.6 * fix: pnpm-lock * chore: update changelog for v0.11.6 * chore: update changelog for v0.11.6 * chore: update changelog for v0.11.6 * fix: watch less and sass dependencies (#1779) * chore: stash * chore: stash * feat: LessModuleGraph * feat: less-import-plugin * chore: 删除多余代码 * fix: 兼容url() * chore: plugin * feat: add beforeRebuild hook * ci: clippy format * fix: paths去重 * fix: rename _path * chore: rust层增加临时过滤文件方式 * chore: 提取createParallelLoader * refactor: before_rebuild hook (#1785) * refactor: before_rebuild hook -n * fix: typos * feat: postcss-loader (#1787) * feat: 支持postcss-loader * chore: 合并postcss到options传给render * chore: 更新.gitignore以排除less.postcss的node_modules目录 * feat: 添加PostCSS插件支持并更新相关类型定义 * refactor: 简化Less和Sass插件中的选项传递 * docs: 添加postcss支持的配置说明 * feat: 添加对PostCSS的支持，更新相关插件以集成postLoaders * feat: 更新Less和Sass插件以移除postLoaders，增强PostCSS支持 * test: 补充postcss测试用例 * fix: use transpiled hmr runtime (#1813) * fix: use transpiled hmr runtime (#1814) * release: @umijs/mako@0.11.7 * fix: package-lock.json * fix: use transpiled hmr runtime entry (#1815) * fix: disable parallel sassLoader because sassOptions.function cann't be shared cross workers (#1816) * release: @umijs/mako@0.11.8 * fix: package-lock.json * fix: package-lock.json * fix: typos * chore: update changelog for v0.11.8 * fix: less,sass,postcss loader panic (#1818) * release: @umijs/mako@0.11.9 * fix: package-lock.json * chore: update changelog for v0.11.9 * fix: worker threads panic on linux (#1823) * release: @umijs/mako@0.11.10 * fix: package-lock.json * chore: update changelog for v0.11.10 * fix: dev支持inline-source-map (#1859) Co-authored-by: dongqing.mdq <dongqing.mdq@antgroup.com> * release: @umijs/mako@0.11.11 * fix: package-lock.json * chore: update changelog for v0.11.11 * Update PULL_REQUEST_TEMPLATE.md * Update PULL_REQUEST_TEMPLATE.md * fix: less resolve alias (#1906) * docs: update README.md (#1907) * Update README.md * Apply suggestions from code review Co-authored-by: Peach <scdzwyxst@gmail.com> * Update README.md * Update README.md --------- Co-authored-by: Peach <scdzwyxst@gmail.com> * Update README.md * Update README.md * release: @umijs/mako@0.11.12 * feat: update pnpm log * chore: update changelog for v0.11.12 * fix: panic on docker linux (#1909) * doc: add openomy (#1910) * release: @umijs/mako@0.11.13 * chore: update changelog for v0.11.13 * chore: remove codecov * chore: update examples/multiple-entries-heavy * feat: support inline-source-map devtool option (#1965) Co-authored-by: hanzebang.hzb <hanzebang.hzb@antgroup.com> * chore: truncate old codes --------- Co-authored-by: pshu <pishu.spf@antfin.com> Co-authored-by: chencheng (云谦) <sorrycc@gmail.com> Co-authored-by: Jinbao1001 <nodewebli@gmail.com> Co-authored-by: money <hualigushi@163.com> Co-authored-by: eisonhower <why490078184@gmail.com> Co-authored-by: huanyu.why <huanyu.why@antgroup.com> Co-authored-by: PeachScript <scdzwyxst@gmail.com> Co-authored-by: Wu-kung <1434246346@qq.com> Co-authored-by: 聪小陈 <xiaohuoni@users.noreply.github.com> Co-authored-by: akitaSummer <akitasummer@outlook.com> Co-authored-by: Shi Kuan <shikuan1992@gmail.com> Co-authored-by: shikuan.sk <shikuan.sk@antgroup.com> Co-authored-by: yezao <75713784+yezaoshu@users.noreply.github.com> Co-authored-by: 御风 <18012261618@126.com> Co-authored-by: bqxbqx <132878537+BQXBQX@users.noreply.github.com> Co-authored-by: miaodongqing <dongqing_miao@163.com> Co-authored-by: dongqing.mdq <dongqing.mdq@antgroup.com> Co-authored-by: kiner-tang（星河） <1127031143@qq.com> Co-authored-by: hanzebang <46307343+hanzebang@users.noreply.github.com> Co-authored-by: hanzebang.hzb <hanzebang.hzb@antgroup.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
support rust native plugin
Summary by CodeRabbit
新功能
rustPlugins配置选项，允许用户在构建过程中集成 Rust 插件。rustPluginResolver，用于解析和加载 Rust 插件。RustPlugin结构体，扩展了实验性配置选项。文档
mako.config.default.json和 TypeScript 类型定义，以支持新的 Rust 插件配置。样式