chore: fix --mode cli args don't work for mako bin (#878)

umijs · Jan 18, 2024 · cb8ce77 · cb8ce77
1 parent 513828e
commit cb8ce77
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/crates/mako/src/main.rs b/crates/mako/src/main.rs
@@ -81,7 +81,15 @@ async fn main() -> Result<()> {
         .map_err(|_| anyhow!("Root directory {:?} not found", root))?;
 
     // config
-    let mut config = config::Config::new(&root, None, None)
+    let cli_args = format!(
+        r#"
+        {{
+            "mode": "{}"
+        }}
+        "#,
+        cli.mode
+    );
+    let mut config = config::Config::new(&root, None, Some(cli_args.as_str()))
         .map_err(|e| anyhow!(format!("Load config failed: {}", e)))?;
 
     config.mode = cli.mode;

diff --git a/crates/mako/src/plugins/bundless_compiler.rs b/crates/mako/src/plugins/bundless_compiler.rs
@@ -21,7 +21,7 @@ use mako_core::tracing::warn;
 
 use crate::ast::{js_ast_to_code, Ast};
 use crate::compiler::{Args, Context};
-use crate::config::{Config, Mode};
+use crate::config::Config;
 use crate::module::{ModuleAst, ModuleId};
 use crate::plugin::{Plugin, PluginTransformJsParam};
 use crate::transformers::transform_dep_replacer::{DepReplacer, DependenciesToReplace};
@@ -202,7 +202,6 @@ pub fn transform_js_generate(
     dep_map: &DependenciesToReplace,
     _is_entry: bool,
 ) {
-    let _is_dev = matches!(context.config.mode, Mode::Development);
     GLOBALS
         .set(&context.meta.script.globals, || {
             try_with_handler(

diff --git a/packages/bundler-okam/index.js b/packages/bundler-okam/index.js
@@ -48,8 +48,7 @@ exports.build = async function (opts) {
   checkConfig(opts);
 
   const okamConfig = await getOkamConfig(opts);
-  const mode = process.argv.includes('--dev') ? 'development' : 'production';
-  okamConfig.mode = mode;
+  okamConfig.mode = 'production';
   okamConfig.manifest = {};
   okamConfig.hash = !!opts.config.hash;
   if (okamConfig.hash) {