cleanup + test

cli/task_runner.rs

@@ -204,7 +204,7 @@ impl ShellCommand for NpmCommand {
     mut context: ShellCommandContext,
   ) -> LocalBoxFuture<'static, ExecuteResult> {
     if context.args.first().map(|s| s.as_str()) == Some("run")
-      && context.args.len() > 2
+      && context.args.len() >= 2
       // for now, don't run any npm scripts that have a flag because
       // we don't handle stuff like `--workspaces` properly
       && !context.args.iter().any(|s| s.starts_with('-'))
@@ -375,11 +375,6 @@ impl ShellCommand for NpmPackageBinCommand {
       },
     ];
 
-    context.state.apply_env_var(
-      "npm_config_user_agent",
-      &crate::npm::get_npm_config_user_agent(),
-    );
-
     args.extend(context.args);
     let executable_command = deno_task_shell::ExecutableCommand::new(
       "deno".to_string(),

cli/tools/run/mod.rs

@@ -30,6 +30,16 @@ To grant permissions, set them before the script argument. For example:
   }
 }
 
+fn set_npm_user_agent() {
+  static ONCE: std::sync::Once = std::sync::Once::new();
+  ONCE.call_once(|| {
+    std::env::set_var(
+      "npm_config_user_agent",
+      crate::npm::get_npm_config_user_agent(),
+    );
+  });
+}
+
 pub async fn run_script(
   mode: WorkerExecutionMode,
   flags: Arc<Flags>,
@@ -58,6 +68,10 @@ pub async fn run_script(
 
   let main_module = cli_options.resolve_main_module()?;
 
+  if main_module.scheme() == "npm" {
+    set_npm_user_agent();
+  }
+
   maybe_npm_install(&factory).await?;
 
   let worker_factory = factory.create_cli_main_worker_factory().await?;
@@ -119,6 +133,10 @@ async fn run_with_watch(
         let cli_options = factory.cli_options()?;
         let main_module = cli_options.resolve_main_module()?;
 
+        if main_module.scheme() == "npm" {
+          set_npm_user_agent();
+        }
+
         maybe_npm_install(&factory).await?;
 
         let _ = watcher_communicator.watch_paths(cli_options.watch_paths());

cli/worker.rs

@@ -491,10 +491,6 @@ impl CliMainWorkerFactory {
     custom_extensions: Vec<Extension>,
     stdio: deno_runtime::deno_io::Stdio,
   ) -> Result<CliMainWorker, AnyError> {
-    std::env::set_var(
-      "npm_config_user_agent",
-      crate::npm::get_npm_config_user_agent(),
-    );
     let shared = &self.shared;
     let ModuleLoaderAndSourceMapGetter { module_loader } = shared
       .module_loader_factory

tests/registry/npm/@denotest/print-npm-user-agent/1.0.0/index.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+console.log(`npm_config_user_agent: ${process.env["npm_config_user_agent"]}`);

tests/registry/npm/@denotest/print-npm-user-agent/1.0.0/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@denotest/print-npm-user-agent",
+  "version": "1.0.0",
+  "bin": {
+    "print-npm-user-agent": "index.js"
+  }
+}

tests/specs/npm/user_agent_env_var/__test__.jsonc

@@ -0,0 +1,51 @@
+{
+  "tempDir": true,
+  "tests": {
+    "run_npm_package": {
+      "steps": [
+        {
+          "args": "install",
+          "output": "[WILDCARD]"
+        },
+        {
+          "args": "run -A npm:@denotest/print-npm-user-agent",
+          "output": "run.out"
+        }
+      ]
+    },
+    "npx": {
+      "steps": [
+        {
+          "args": "install",
+          "output": "[WILDCARD]"
+        },
+        {
+          "if": "unix",
+          "args": "task run-with-npx",
+          "output": "npx.out"
+        }
+      ]
+    },
+    "bin_command": {
+      "steps": [
+        { "args": "install", "output": "[WILDCARD]" },
+        {
+          "args": "task run-via-bin",
+          "output": "Task run-via-bin print-npm-user-agent\nnpm_config_user_agent: deno/[WILDCARD] npm/? deno/[WILDCARD] [WILDCARD] [WILDCARD]\n"
+        }
+      ]
+    },
+    "npm_run": {
+      "steps": [
+        {
+          "args": "install",
+          "output": "[WILDCARD]"
+        },
+        {
+          "args": "task run-via-other-task",
+          "output": "npm_run.out"
+        }
+      ]
+    }
+  }
+}

tests/specs/npm/user_agent_env_var/bin_command.out

@@ -0,0 +1 @@
+npm_config_user_agent: deno/[WILDCARD] npm/? deno/[WILDCARD] [WILDCARD] [WILDCARD]

tests/specs/npm/user_agent_env_var/deno.jsonc

@@ -0,0 +1,3 @@
+{
+  "nodeModulesDir": "auto"
+}

tests/specs/npm/user_agent_env_var/npm_run.out

@@ -0,0 +1,3 @@
+Task run-via-other-task npm run run-via-bin
+Task run-via-bin print-npm-user-agent
+npm_config_user_agent: deno/[WILDCARD] npm/? deno/[WILDCARD] [WILDCARD] [WILDCARD]

tests/specs/npm/user_agent_env_var/npx.out

@@ -0,0 +1,2 @@
+Task run-with-npx npx print-npm-user-agent
+npm_config_user_agent: deno/[WILDCARD] npm/? deno/[WILDCARD] [WILDCARD] [WILDCARD]

tests/specs/npm/user_agent_env_var/package.json

@@ -0,0 +1,10 @@
+{
+  "scripts": {
+    "run-with-npx": "npx print-npm-user-agent",
+    "run-via-other-task": "npm run run-via-bin",
+    "run-via-bin": "print-npm-user-agent"
+  },
+  "dependencies": {
+    "@denotest/print-npm-user-agent": "1.0.0"
+  }
+}

tests/specs/npm/user_agent_env_var/run.out

@@ -0,0 +1 @@
+npm_config_user_agent: deno/[WILDCARD] npm/? deno/[WILDCARD] [WILDCARD] [WILDCARD]

tests/specs/npm/user_agent_env_var/test.mjs

@@ -0,0 +1 @@
+console.log(process.env.npm_config_user_agent);