feat: supports umd export

crates/binding/src/lib.rs

@@ -126,7 +126,7 @@ pub struct BuildParams {
     autoCSSModules?: boolean;
     ignoreCSSParserErrors?: boolean;
     dynamicImportToRequire?: boolean;
-    umd?: false | string;
+    umd?: false | string | { name: string, export?: string[] };
     cjs?: boolean;
     writeToDisk?: boolean;
     transformImport?: { libraryName: string; libraryDirectory?: string; style?: boolean | string }[];

crates/mako/src/config/output.rs

@@ -5,6 +5,7 @@ use clap::ValueEnum;
 use serde::{Deserialize, Serialize};
 use swc_core::ecma::ast::EsVersion;
 
+use super::Umd;
 use crate::create_deserialize_fn;
 use crate::utils::get_pkg_name;
 
@@ -49,8 +50,11 @@ impl fmt::Display for CrossOriginLoading {
     }
 }
 
-pub fn get_default_chunk_loading_global(umd: Option<String>, root: &Path) -> String {
-    let unique_name = umd.unwrap_or_else(|| get_pkg_name(root).unwrap_or("global".to_string()));
+pub fn get_default_chunk_loading_global(umd: Option<Umd>, root: &Path) -> String {
+    let unique_name = umd.map_or_else(
+        || get_pkg_name(root).unwrap_or("global".to_string()),
+        |umd| umd.name.clone(),
+    );
 
     format!("makoChunk_{}", unique_name)
 }

crates/mako/src/config/umd.rs

@@ -1,7 +1,30 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-use crate::create_deserialize_fn;
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
+pub struct Umd {
+    pub name: String,
+    #[serde(default)]
+    pub export: Vec<String>,
+}
 
-pub type Umd = String;
-
-create_deserialize_fn!(deserialize_umd, Umd);
+pub fn deserialize_umd<'de, D>(deserializer: D) -> Result<Option<Umd>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let value: serde_json::Value = serde_json::Value::deserialize(deserializer)?;
+    match value {
+        serde_json::Value::Object(obj) => Ok(Some(
+            serde_json::from_value::<Umd>(serde_json::Value::Object(obj))
+                .map_err(serde::de::Error::custom)?,
+        )),
+        serde_json::Value::String(name) => Ok(Some(Umd {
+            name,
+            ..Default::default()
+        })),
+        _ => Err(serde::de::Error::custom(format!(
+            "invalid `{}` value: {}",
+            stringify!(deserialize_umd).replace("deserialize_", ""),
+            value
+        ))),
+    }
+}

crates/mako/src/generate/chunk_pot/util.rs

@@ -95,14 +95,21 @@ pub(crate) fn empty_module_fn_expr() -> FnExpr {
 }
 
 pub(crate) fn runtime_code(context: &Arc<Context>) -> Result<String> {
-    let umd = context.config.umd.clone();
+    let umd = context.config.umd.as_ref().map(|umd| umd.name.clone());
+    let umd_export = context.config.umd.as_ref().map_or(vec![], |umd| {
+        umd.export
+            .iter()
+            .map(|e| format!("[{}]", serde_json::to_string(e).unwrap()))
+            .collect()
+    });
     let chunk_graph = context.chunk_graph.read().unwrap();
     let has_dynamic_chunks = chunk_graph.get_all_chunks().len() > 1;
     let has_hmr = context.args.watch;
     let app_runtime = AppRuntimeTemplate {
         has_dynamic_chunks,
         has_hmr,
         umd,
+        umd_export,
         is_browser: matches!(context.config.platform, crate::config::Platform::Browser),
         cjs: context.config.cjs,
         chunk_loading_global: serde_json::to_string(&context.config.output.chunk_loading_global)

crates/mako/src/generate/runtime.rs

@@ -6,6 +6,7 @@ pub struct AppRuntimeTemplate {
     pub has_dynamic_chunks: bool,
     pub has_hmr: bool,
     pub umd: Option<String>,
+    pub umd_export: Vec<String>,
     pub cjs: bool,
     pub pkg_name: Option<String>,
     pub chunk_loading_global: String,

crates/mako/templates/app_runtime.stpl

@@ -431,7 +431,7 @@ root.makoModuleHotUpdate = runtime._makoModuleHotUpdate;
   else if (typeof exports === 'object') exports['<%= umd.clone().unwrap() %>'] = factory();
   else root['<%= umd.clone().unwrap() %>'] = factory();
 })(typeof self !== 'undefined' ? self : this, function () {
-  return runtime.exports;
+  return runtime.exports<% if umd_export.is_empty() { %><% } else { %><%-umd_export.join("")%><% } %>;
 });
 <% } %>
 

docs/config.md

@@ -820,7 +820,7 @@ e.g.
 
 ### umd
 
-- Type: `false | string`
+- Type: `false | string | { name: string, export?: string [] }`
 - Default: `false`
 
 Whether to output umd format.

docs/config.zh-CN.md

@@ -815,7 +815,7 @@ babel-plugin-import 的简化版本，仅支持三个配置项：libraryName，l
 
 ### umd
 
-- 类型：`false | string`
+- 类型：`false | string | { name: string, export?: string[] }`
 - 默认值：`false`
 
 是否输出 umd 格式。

e2e/fixtures/config.umd_export/expect.js

@@ -0,0 +1,3 @@
+const assert = require("assert");
+
+assert(require("./dist/index.js") === "foo", "umd export should work")

e2e/fixtures/config.umd_export/mako.config.json

@@ -0,0 +1 @@
+{ "umd": { "name": "foooo", "export": ["default", "x"] } }

e2e/fixtures/config.umd_export/src/index.ts

@@ -0,0 +1 @@
+export default { x: 'foo'};

packages/mako/binding.d.ts

@@ -190,7 +190,7 @@ export interface BuildParams {
     autoCSSModules?: boolean;
     ignoreCSSParserErrors?: boolean;
     dynamicImportToRequire?: boolean;
-    umd?: false | string;
+    umd?: false | string | { name: string; export?: string[] };
     cjs?: boolean;
     writeToDisk?: boolean;
     transformImport?: {