From cb8ce774ad7d2d3e303bc81485e75b323c95ba23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?chencheng=20=28=E4=BA=91=E8=B0=A6=29?= Date: Thu, 18 Jan 2024 10:39:56 +0800 Subject: [PATCH] chore: fix --mode cli args don't work for mako bin (#878) --- crates/mako/src/main.rs | 10 +++++++++- crates/mako/src/plugins/bundless_compiler.rs | 3 +-- packages/bundler-okam/index.js | 3 +-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/crates/mako/src/main.rs b/crates/mako/src/main.rs index fafd1ee7b..8d8d62a2d 100644 --- 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 index 35f71921f..7c7e3bd85 100644 --- 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 index 622842253..5e40293c8 100644 --- 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) {