Pass args after -- to the executable during run and serve

packages/cli/src/build/builder.rs

@@ -417,6 +417,7 @@ impl AppBuilder {
         }
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub(crate) async fn open(
         &mut self,
         devserver_ip: SocketAddr,
@@ -425,6 +426,7 @@ impl AppBuilder {
         open_browser: bool,
         always_on_top: bool,
         build_id: BuildId,
+        args: &[String],
     ) -> Result<()> {
         let krate = &self.build;
 
@@ -501,7 +503,7 @@ impl AppBuilder {
             | Platform::MacOS
             | Platform::Windows
             | Platform::Linux
-            | Platform::Liveview => self.open_with_main_exe(envs)?,
+            | Platform::Liveview => self.open_with_main_exe(envs, args)?,
         };
 
         self.builds_opened += 1;
@@ -732,12 +734,13 @@ impl AppBuilder {
     /// paths right now, but they will when we start to enable things like swift integration.
     ///
     /// Server/liveview/desktop are all basically the same, though
-    fn open_with_main_exe(&mut self, envs: Vec<(&str, String)>) -> Result<()> {
+    fn open_with_main_exe(&mut self, envs: Vec<(&str, String)>, args: &[String]) -> Result<()> {
         let main_exe = self.app_exe();
 
         tracing::debug!("Opening app with main exe: {main_exe:?}");
 
         let mut child = Command::new(main_exe)
+            .args(args)
             .envs(envs)
             .env_remove("CARGO_MANIFEST_DIR") // running under `dx` shouldn't expose cargo-only :
             .stderr(Stdio::piped())

packages/cli/src/cli/serve.rs

@@ -50,10 +50,6 @@ pub(crate) struct ServeArgs {
     #[clap(long)]
     pub(crate) cross_origin_policy: bool,
 
-    /// Additional arguments to pass to the executable
-    #[clap(long)]
-    pub(crate) args: Vec<String>,
-
     /// Sets the interval in seconds that the CLI will poll for file changes on WSL.
     #[clap(long, default_missing_value = "2")]
     pub(crate) wsl_file_poll_interval: Option<u16>,
@@ -78,6 +74,10 @@ pub(crate) struct ServeArgs {
 
     #[clap(flatten)]
     pub(crate) targets: BuildArgs,
+
+    /// Additional arguments to pass to the executable
+    #[clap(last = true)]
+    pub(crate) args: Vec<String>,
 }
 
 impl ServeArgs {

packages/cli/src/serve/runner.rs

@@ -73,6 +73,9 @@ pub(crate) struct AppServer {
     pub(crate) proxied_port: Option<u16>,
     pub(crate) cross_origin_policy: bool,
 
+    // The arguments that should be forwarded to the app when it is opened
+    pub(crate) open_args: Vec<String>,
+
     // Additional plugin-type tools
     pub(crate) tw_watcher: tokio::task::JoinHandle<Result<()>>,
 }
@@ -151,6 +154,8 @@ impl AppServer {
             .map(|server| AppBuilder::start(&server, build_mode))
             .transpose()?;
 
+        let open_args = args.args;
+
         let tw_watcher = TailwindCli::serve(
             client.build.package_manifest_dir(),
             client.build.config.application.tailwind_input.clone(),
@@ -187,6 +192,7 @@ impl AppServer {
             cross_origin_policy,
             fullstack,
             tw_watcher,
+            open_args,
         };
 
         // Only register the hot-reload stuff if we're watching the filesystem
@@ -546,6 +552,7 @@ impl AppServer {
                     false,
                     false,
                     BuildId::SERVER,
+                    &self.open_args,
                 )
                 .await?;
         }
@@ -560,6 +567,7 @@ impl AppServer {
                 open_browser,
                 self.always_on_top,
                 BuildId::CLIENT,
+                &self.open_args,
             )
             .await?;