dependabot-npm_and_yarn 0.319.1 → 0.320.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d73a564255c059d9eb35b03d5628f88bffabdd2b9f1fc59ea11fe73f1ee8b0c3
-  data.tar.gz: 3538d93dbc952b9773f9bfa9e8a3e8c9038d94f794d624a18d94ab0d92e9a03f
+  metadata.gz: 2b2c6f3862ecd36711defe92e03ef9285a84a01ac96fb33251e3e440acd33cef
+  data.tar.gz: 9a80eef7de9376bf571b00a1603c52d95e64ad7c3f493d0720113dbb43c525a6
 SHA512:
-  metadata.gz: 5d9d78d8b94bdbd6ce40b5cae073dfa065163a126a6239fa3d879c375f2e923654431b9da0f4d62362f6cec703d412a982eca49ef652b9fbc1d3cdc88c9f144e
-  data.tar.gz: 76681332af9e4306942f6002bdaa6ff50fa3652e62e271a9b47043e3bc4e7c65c75d10b39e035b4a357185c3a15d24dd6f0f51b7378a6aa71ca3ca72e9c16b0a
+  metadata.gz: 0b730addc3df2974a8fe0a6ab23bf648bcc31bf61d3384defad79f308cde03d3bdc061ba390f49b2de4316ee02ff123939ddef4be37abc3c62999b83d1637be9
+  data.tar.gz: 24d35bfba57c04f6a7e8858379dd1847d8cd4b3d987d691ebbcb2dc9ad4c3d4fef095881dc62c666c3ea17744582313fbd178f9e7ce3b70d40967f703f58f5ea

data/lib/dependabot/npm_and_yarn/helpers.rb

@@ -271,15 +271,35 @@ module Dependabot
       sig { params(command: String, fingerprint: T.nilable(String)).returns(String) }
       def self.run_npm_command(command, fingerprint: command)
         if Dependabot::Experiments.enabled?(:enable_corepack_for_npm_and_yarn)
-          package_manager_run_command(NpmPackageManager::NAME, command, fingerprint: fingerprint)
+          package_manager_run_command(
+            NpmPackageManager::NAME,
+            command,
+            fingerprint: fingerprint,
+            output_observer: ->(output) { command_observer(output) }
+          )
         else
           Dependabot::SharedHelpers.run_shell_command(
             "npm #{command}",
-            fingerprint: "npm #{fingerprint}"
+            fingerprint: "npm #{fingerprint}",
+            output_observer: ->(output) { command_observer(output) }
           )
         end
       end
 
+      sig do
+        params(output: String)
+          .returns(T::Hash[Symbol, T.untyped])
+      end
+      def self.command_observer(output)
+        # Observe the output for specific error
+        return {} unless output.include?("npm ERR! ERESOLVE")
+
+        {
+          gracefully_stop: true, # value must be a String
+          reason: "NPM Resolution Error"
+        }
+      end
+
       sig { returns(T.nilable(String)) }
       def self.node_version
         version = run_node_command("-v", fingerprint: "-v").strip
@@ -486,20 +506,30 @@ module Dependabot
         params(
           name: String,
           command: String,
-          fingerprint: T.nilable(String)
+          fingerprint: T.nilable(String),
+          output_observer: CommandHelpers::OutputObserver
         ).returns(String)
       end
-      def self.package_manager_run_command(name, command, fingerprint: nil)
+      def self.package_manager_run_command(
+        name,
+        command,
+        fingerprint: nil,
+        output_observer: nil
+      )
         return run_bun_command(command, fingerprint: fingerprint) if name == BunPackageManager::NAME
 
         full_command = "corepack #{name} #{command}"
-
-        result = Dependabot::SharedHelpers.run_shell_command(
-          full_command,
-          fingerprint: "corepack #{name} #{fingerprint || command}"
-        ).strip
-
-        result
+        fingerprint =  "corepack #{name} #{fingerprint || command}"
+
+        if output_observer
+          return Dependabot::SharedHelpers.run_shell_command(
+            full_command,
+            fingerprint: fingerprint,
+            output_observer: output_observer
+          ).strip
+        else
+          Dependabot::SharedHelpers.run_shell_command(full_command, fingerprint: fingerprint)
+        end.strip
       rescue StandardError => e
         Dependabot.logger.error("Error running package manager command: #{full_command}, Error: #{e.message}")
         if e.message.match?(/Response Code.*:.*404.*\(Not Found\)/) &&

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-npm_and_yarn
 version: !ruby/object:Gem::Version
-  version: 0.319.1
+  version: 0.320.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.319.1
+        version: 0.320.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.319.1
+        version: 0.320.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -356,7 +356,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.319.1
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.320.0
 rdoc_options: []
 require_paths:
 - lib