dependabot-npm_and_yarn 0.95.64 → 0.95.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bfa623cc1ef2166ddea928040c4e4e06b3460a07bc935d6d1adaed475214ffd
-  data.tar.gz: c5bd5c1c38d3a1f21fcb280e3d27bf15f2023bb2a2650275d96c79d0418fc8df
+  metadata.gz: 2b48a49bfb7d209c2c8f830da70a73158903bf98be5242391974053c71943291
+  data.tar.gz: 07f30fe079f55f0a1ac2356699e938ee9b74018a94f42134b8b2c39e62aebcbd
 SHA512:
-  metadata.gz: 243e02473803b9e6c032a746a78b2b8930af4c89a17edca50f40144cb90640a115e815e4fd502f22f12d2a2df7a8efbcb9b8d8679f187b2b428731b65e4cb806
-  data.tar.gz: 5a65a73b2de606d1d5ee849fe15d5905848167c8b7a0485710f6b5db00f01f4d1886bef8c013e7b32487aa705d9f96cdb01ac59bc14c36678a09862980870c04
+  metadata.gz: 3a8aad3da4b0609fab00c8708e34b90f8a57606064cc0dfe4c59655ab6838fd2c2a9ddecf69f7688cfe36c604e4578f49d0879d69b3630d7b0b8e2b0b287eebd
+  data.tar.gz: 297b96a5b3c6eb69a7e77f26f618173d4d174d6516f5d930d74aaf9b51d35ffcff54f06cce3aba50d3943b62522c177f4b1e1fedcab3af04360f2e44e46c49e9

data/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb

@@ -96,7 +96,7 @@ module Dependabot
 
             updates << { dependency: dep, version: updated_version }
           end
-          updates
+          updates.uniq
         end
 
         private
@@ -170,8 +170,10 @@ module Dependabot
 
           @old_peer_dependency_errors_checked = true
 
+          version = version_for_dependency(dependency)
+
           @old_peer_dependency_errors =
-            fetch_peer_dependency_errors(version: dependency.version)
+            fetch_peer_dependency_errors(version: version)
         end
 
         def fetch_peer_dependency_errors(version:)
@@ -217,17 +219,13 @@ module Dependabot
         end
 
         def error_details_from_captures(captures)
-          # Note "requiring_dep_version" is used to create a unique list of
-          # issues when the requirement name/version is the same
           {
             requirement_name:
               captures.fetch("required_dep").sub(/@[^@]+$/, ""),
             requirement_version:
               captures.fetch("required_dep").split("@").last,
             requiring_dep_name:
-              captures.fetch("requiring_dep").sub(/@[^@]+$/, ""),
-            requiring_dep_version:
-              captures.fetch("requiring_dep").split("@").last
+              captures.fetch("requiring_dep").sub(/@[^@]+$/, "")
           }
         end
 
@@ -241,21 +239,12 @@ module Dependabot
           return [] if relevant_unmet_peer_dependencies.empty?
 
           # Prune out any pre-existing warnings
-          issues = relevant_unmet_peer_dependencies.reject do |issue|
+          relevant_unmet_peer_dependencies.reject do |issue|
             old_unmet_peer_dependencies.any? do |old_issue|
               old_issue.slice(:requirement_name, :requiring_dep_name) ==
                 issue.slice(:requirement_name, :requiring_dep_name)
             end
           end
-
-          # If we find duplicate errors it probably means we have double run the
-          # checker on the same files and want to hear about it
-          if issues.length != issues.uniq.length
-            duplicate = issues.find { |i| issues.count(i) > 1 }
-            raise "Duplicate peer dep error: #{duplicate[:requiring_dep_name]}"
-          end
-
-          issues
         end
 
         def satisfying_versions
@@ -297,7 +286,7 @@ module Dependabot
           latest_version_finder(dep).
             possible_versions_with_details.
             find do |version, details|
-              next false unless version > version_class.new(dep.version)
+              next false unless version > version_for_dependency(dep)
               next true unless details["peerDependencies"]
 
               details["peerDependencies"].all? do |peer_dep_name, req|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-npm_and_yarn
 version: !ruby/object:Gem::Version
-  version: 0.95.64
+  version: 0.95.65
 platform: ruby
 authors:
 - Dependabot
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.64
+        version: 0.95.65
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.95.64
+        version: 0.95.65
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement