dependabot-npm_and_yarn 0.125.0 → 0.125.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f93a700a12bf8acc719d2716900e4fc5c17b5227ba84a6c6761b4736426d8a0
-  data.tar.gz: 27df298a59ebf2d6c975b8e6370d21f70bc580fa74bd4134f31a060b152e61d7
+  metadata.gz: 65dfd24b6ebd21aecc0ca0e3b729df18dbba9a06e0e45634b3c8b162710c567e
+  data.tar.gz: a44ac914df569143c14632f921b89c7da81f64b53a194f8113ab6822f6c923a2
 SHA512:
-  metadata.gz: 416f6346d2784cce5a0e3d3d8422831b4654db8a7c23678d54599f16cd430ddfc50ad863c7eae1d3715d6bbb2e743d416f218b6b30cda14fb3ba285aca14c98d
-  data.tar.gz: 73dc809d8ef956b018c6973a91b922e8b487aca2d3a2cdde11894d51f94b7a3fc07889035e11c7543ecbafc775ad870652be0e61f01abd0a00449cd93b978915
+  metadata.gz: 6f0521114bc5e902ff20bb60721128b99bd7082966186f1e787810cea0d76e45ae6df35ece0158a06bb99843daf304eb02f74233230209d98fd7bbf08bf894cd
+  data.tar.gz: 2c24652f44989903e0cdf20a9d7a319387eba7095d467b4377e21c0c805789b355b567681f7bad0b4938d8f2c46940b8593bb2c33f5590a5eae0b6b9e9d2619b

data/lib/dependabot/npm_and_yarn/file_fetcher.rb

@@ -123,9 +123,7 @@ module Dependabot
           filename = path
           # NPM/Yarn support loading path dependencies from tarballs:
           # https://docs.npmjs.com/cli/pack.html
-          unless filename.end_with?(".tgz")
-            filename = File.join(filename, "package.json")
-          end
+          filename = File.join(filename, "package.json") unless filename.end_with?(".tgz")
           cleaned_name = Pathname.new(filename).cleanpath.to_path
           next if fetched_files.map(&:name).include?(cleaned_name)
 
@@ -185,9 +183,7 @@ module Dependabot
         resolution_objects = parsed_manifest.values_at("resolutions").compact
         manifest_objects = dependency_objects + resolution_objects
 
-        unless manifest_objects.all? { |o| o.is_a?(Hash) }
-          raise Dependabot::DependencyFileNotParseable, file.path
-        end
+        raise Dependabot::DependencyFileNotParseable, file.path unless manifest_objects.all? { |o| o.is_a?(Hash) }
 
         resolution_deps = resolution_objects.flat_map(&:to_a).
                           map do |path, value|

data/lib/dependabot/npm_and_yarn/file_updater/npm_lockfile_updater.rb

@@ -328,9 +328,7 @@ module Dependabot
 
         def resolvable_before_update?(lockfile)
           @resolvable_before_update ||= {}
-          if @resolvable_before_update.key?(lockfile.name)
-            return @resolvable_before_update[lockfile.name]
-          end
+          return @resolvable_before_update[lockfile.name] if @resolvable_before_update.key?(lockfile.name)
 
           @resolvable_before_update[lockfile.name] =
             begin

data/lib/dependabot/npm_and_yarn/file_updater/npmrc_builder.rb

@@ -50,9 +50,7 @@ module Dependabot
               next false if CENTRAL_REGISTRIES.include?(cred["registry"])
 
               # If all the URLs include this registry, it's global
-              if dependency_urls.all? { |url| url.include?(cred["registry"]) }
-                next true
-              end
+              next true if dependency_urls.all? { |url| url.include?(cred["registry"]) }
 
               # If any unscoped URLs include this registry, it's global
               dependency_urls.
@@ -120,9 +118,7 @@ module Dependabot
             match(/^\s*registry\s+"(?<registry>[^"]+)"/)&.
             named_captures&.fetch("registry")
 
-          if yarnrc_global_registry
-            return "registry = #{yarnrc_global_registry}\n"
-          end
+          return "registry = #{yarnrc_global_registry}\n" if yarnrc_global_registry
 
           build_npmrc_content_from_lockfile
         end

data/lib/dependabot/npm_and_yarn/file_updater/yarn_lockfile_updater.rb

@@ -23,9 +23,7 @@ module Dependabot
 
         def updated_yarn_lock_content(yarn_lock)
           @updated_yarn_lock_content ||= {}
-          if @updated_yarn_lock_content[yarn_lock.name]
-            return @updated_yarn_lock_content[yarn_lock.name]
-          end
+          return @updated_yarn_lock_content[yarn_lock.name] if @updated_yarn_lock_content[yarn_lock.name]
 
           new_content = updated_yarn_lock(yarn_lock)
 
@@ -235,16 +233,12 @@ module Dependabot
             raise Dependabot::GitDependenciesNotReachable, dependency_url
           end
 
-          if error_message.match?(TIMEOUT_FETCHING_PACKAGE)
-            handle_timeout(error_message, yarn_lock)
-          end
+          handle_timeout(error_message, yarn_lock) if error_message.match?(TIMEOUT_FETCHING_PACKAGE)
 
           if error_message.start_with?("Couldn't find any versions") ||
              error_message.include?(": Not found")
 
-            unless resolvable_before_update?(yarn_lock)
-              raise_resolvability_error(error_message, yarn_lock)
-            end
+            raise_resolvability_error(error_message, yarn_lock) unless resolvable_before_update?(yarn_lock)
 
             # Dependabot has probably messed something up with the update and we
             # want to hear about it
@@ -259,9 +253,7 @@ module Dependabot
 
         def resolvable_before_update?(yarn_lock)
           @resolvable_before_update ||= {}
-          if @resolvable_before_update.key?(yarn_lock.name)
-            return @resolvable_before_update[yarn_lock.name]
-          end
+          return @resolvable_before_update[yarn_lock.name] if @resolvable_before_update.key?(yarn_lock.name)
 
           @resolvable_before_update[yarn_lock.name] =
             begin
@@ -392,9 +384,7 @@ module Dependabot
             'https://\1/'
           )
 
-          if remove_integrity_lines?
-            updated_content = remove_integrity_lines(updated_content)
-          end
+          updated_content = remove_integrity_lines(updated_content) if remove_integrity_lines?
 
           updated_content
         end

data/lib/dependabot/npm_and_yarn/metadata_finder.rb

@@ -14,9 +14,7 @@ module Dependabot
       def homepage_url
         # Attempt to use version_listing first, as fetching the entire listing
         # array can be slow (if it's large)
-        if latest_version_listing["homepage"]
-          return latest_version_listing["homepage"]
-        end
+        return latest_version_listing["homepage"] if latest_version_listing["homepage"]
 
         listing = all_version_listings.find { |_, l| l["homepage"] }
         listing&.last&.fetch("homepage", nil) || super
@@ -136,9 +134,7 @@ module Dependabot
         # Special case DefinitelyTyped, which has predictable URLs.
         # This can be removed once this PR is merged:
         # https://github.com/Microsoft/types-publisher/pull/578
-        if source_from_url.repo == "DefinitelyTyped/DefinitelyTyped"
-          return dependency.name.gsub(/^@/, "")
-        end
+        return dependency.name.gsub(/^@/, "") if source_from_url.repo == "DefinitelyTyped/DefinitelyTyped"
 
         # Only return a directory if it is explicitly specified
         return unless details.is_a?(Hash)
@@ -160,9 +156,7 @@ module Dependabot
           **SharedHelpers.excon_defaults(headers: registry_auth_headers)
         )
 
-        if response.status == 200
-          return @latest_version_listing = JSON.parse(response.body)
-        end
+        return @latest_version_listing = JSON.parse(response.body) if response.status == 200
 
         @latest_version_listing = {}
       rescue JSON::ParserError, Excon::Error::Timeout

data/lib/dependabot/npm_and_yarn/requirement.rb

@@ -17,9 +17,7 @@ module Dependabot
       PATTERN = /\A#{PATTERN_RAW}\z/.freeze
 
       def self.parse(obj)
-        if obj.is_a?(Gem::Version)
-          return ["=", NpmAndYarn::Version.new(obj.to_s)]
-        end
+        return ["=", NpmAndYarn::Version.new(obj.to_s)] if obj.is_a?(Gem::Version)
 
         unless (matches = PATTERN.match(obj.to_s))
           msg = "Illformed requirement [#{obj.inspect}]"
@@ -88,9 +86,7 @@ module Dependabot
         upper_bound_range =
           if upper_bound_parts.length < 3
             # When upper bound is a partial version treat these as an X-range
-            if upper_bound_parts[-1].to_i.positive?
-              upper_bound_parts[-1] = upper_bound_parts[-1].to_i + 1
-            end
+            upper_bound_parts[-1] = upper_bound_parts[-1].to_i + 1 if upper_bound_parts[-1].to_i.positive?
             upper_bound_parts.fill("0", upper_bound_parts.length...3)
             "< #{upper_bound_parts.join('.')}.a"
           else

data/lib/dependabot/npm_and_yarn/update_checker.rb

@@ -54,9 +54,7 @@ module Dependabot
       def latest_resolvable_version_with_no_unlock
         return latest_resolvable_version unless dependency.top_level?
 
-        if git_dependency?
-          return latest_resolvable_version_with_no_unlock_for_git_dependency
-        end
+        return latest_resolvable_version_with_no_unlock_for_git_dependency if git_dependency?
 
         latest_version_finder.latest_version_with_no_unlock
       end
@@ -89,9 +87,7 @@ module Dependabot
 
       def requirements_update_strategy
         # If passed in as an option (in the base class) honour that option
-        if @requirements_update_strategy
-          return @requirements_update_strategy.to_sym
-        end
+        return @requirements_update_strategy.to_sym if @requirements_update_strategy
 
         # Otherwise, widen ranges for libraries and bump versions for apps
         library? ? :widen_ranges : :bump_versions
@@ -188,9 +184,7 @@ module Dependabot
       def git_branch_or_ref_in_latest_release?
         return false unless latest_released_version
 
-        if defined?(@git_branch_or_ref_in_latest_release)
-          return @git_branch_or_ref_in_latest_release
-        end
+        return @git_branch_or_ref_in_latest_release if defined?(@git_branch_or_ref_in_latest_release)
 
         @git_branch_or_ref_in_latest_release ||=
           git_commit_checker.branch_or_ref_in_release?(latest_released_version)
@@ -261,9 +255,7 @@ module Dependabot
 
         # Otherwise, if the gem isn't pinned, the latest version is just the
         # latest commit for the specified branch.
-        unless git_commit_checker.pinned?
-          return { sha: git_commit_checker.head_commit_for_current_branch }
-        end
+        return { sha: git_commit_checker.head_commit_for_current_branch } unless git_commit_checker.pinned?
 
         # If the dependency is pinned to a tag that doesn't look like a
         # version then there's nothing we can do.

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

@@ -111,9 +111,7 @@ module Dependabot
             ignore_reqs.any? { |r| r.satisfied_by?(v) }
           end
 
-          if @raise_on_ignored && filtered.empty? && versions_array.any?
-            raise AllVersionsIgnored
-          end
+          raise AllVersionsIgnored if @raise_on_ignored && filtered.empty? && versions_array.any?
 
           filtered
         end
@@ -261,9 +259,7 @@ module Dependabot
         def version_endpoint_working?
           return true if dependency_registry == "registry.npmjs.org"
 
-          if defined?(@version_endpoint_working)
-            return @version_endpoint_working
-          end
+          return @version_endpoint_working if defined?(@version_endpoint_working)
 
           @version_endpoint_working =
             begin

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

@@ -216,9 +216,7 @@ module Dependabot
 
           # If there are multiple source types, or multiple source URLs, then
           # it's unclear how we should proceed
-          if sources.map { |s| [s[:type], s[:url]] }.uniq.count > 1
-            raise "Multiple sources! #{sources.join(', ')}"
-          end
+          raise "Multiple sources! #{sources.join(', ')}" if sources.map { |s| [s[:type], s[:url]] }.uniq.count > 1
 
           # Otherwise we just take the URL of the first private registry
           sources.find { |s| s[:type] == "private_registry" }&.fetch(:url)

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

@@ -60,9 +60,7 @@ module Dependabot
           return latest_allowable_version if git_dependency?(dependency)
           return if part_of_tightly_locked_monorepo?
 
-          unless relevant_unmet_peer_dependencies.any?
-            return latest_allowable_version
-          end
+          return latest_allowable_version unless relevant_unmet_peer_dependencies.any?
 
           satisfying_versions.first
         end
@@ -79,9 +77,7 @@ module Dependabot
 
         def dependency_updates_from_full_unlock
           return if git_dependency?(dependency)
-          if part_of_tightly_locked_monorepo?
-            return updated_monorepo_dependencies
-          end
+          return updated_monorepo_dependencies if part_of_tightly_locked_monorepo?
           return if newly_broken_peer_reqs_from_dep.any?
 
           updates = [{
@@ -219,9 +215,7 @@ module Dependabot
         end
 
         def old_peer_dependency_errors
-          if @old_peer_dependency_errors_checked
-            return @old_peer_dependency_errors
-          end
+          return @old_peer_dependency_errors if @old_peer_dependency_errors_checked
 
           @old_peer_dependency_errors_checked = true
 
@@ -534,9 +528,7 @@ module Dependabot
         end
 
         def version_for_dependency(dep)
-          if dep.version && version_class.correct?(dep.version)
-            return version_class.new(dep.version)
-          end
+          return version_class.new(dep.version) if dep.version && version_class.correct?(dep.version)
 
           dep.requirements.map { |r| r[:requirement] }.compact.
             reject { |req_string| req_string.start_with?("<") }.

data/lib/dependabot/npm_and_yarn/version.rb

@@ -29,9 +29,7 @@ module Dependabot
         @version_string = version.to_s
         version = version.gsub(/^v/, "") if version.is_a?(String)
 
-        if version.to_s.include?("+")
-          version, @build_info = version.to_s.split("+")
-        end
+        version, @build_info = version.to_s.split("+") if version.to_s.include?("+")
 
         super
       end

metadata

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