From c7598b22ff8dfed0771cb97aa66b304f16b28b7b Mon Sep 17 00:00:00 2001 From: Wenzhe Wang Date: Mon, 6 Nov 2023 09:00:36 +0800 Subject: [PATCH] chore(cli): move import_plugin into enable_plugins (#1158) --- crates/oxc_cli/src/command.rs | 8 ++++---- crates/oxc_cli/src/lint/mod.rs | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/oxc_cli/src/command.rs b/crates/oxc_cli/src/command.rs index 3e601814a..38cb6ff44 100644 --- a/crates/oxc_cli/src/command.rs +++ b/crates/oxc_cli/src/command.rs @@ -66,6 +66,10 @@ pub struct MiscOptions { /// Enable Plugins #[derive(Debug, Clone, Bpaf)] pub struct EnablePlugins { + /// Enable the experimental import plugin and detect ESM problems + #[bpaf(switch, hide_usage)] + pub import_plugin: bool, + /// Enable the Jest plugin and detect test problems #[bpaf(switch, hide_usage)] pub jest_plugin: bool, @@ -80,10 +84,6 @@ pub struct LintOptions { #[bpaf(external(lint_filter), map(LintFilter::into_tuple), many)] pub filter: Vec<(AllowWarnDeny, String)>, - /// Use the experimental import plugin and detect ESM problems - #[bpaf(switch, hide_usage)] - pub import_plugin: bool, - #[bpaf(external)] pub enable_plugins: EnablePlugins, diff --git a/crates/oxc_cli/src/lint/mod.rs b/crates/oxc_cli/src/lint/mod.rs index e8a3e2bfc..2b65dcf72 100644 --- a/crates/oxc_cli/src/lint/mod.rs +++ b/crates/oxc_cli/src/lint/mod.rs @@ -29,7 +29,6 @@ impl Runner for LintRunner { let CliLintOptions { paths, filter, - import_plugin, warning_options, ignore_options, fix_options, @@ -58,7 +57,7 @@ impl Runner for LintRunner { .with_filter(filter) .with_fix(fix_options.fix) .with_timing(misc_options.timing) - .with_import_plugin(import_plugin) + .with_import_plugin(enable_plugins.import_plugin) .with_jest_plugin(enable_plugins.jest_plugin) .with_jsx_a11y_plugin(enable_plugins.jsx_a11y_plugin); let lint_service = LintService::new(cwd, &paths, lint_options);