dependabot-npm_and_yarn 0.154.3 → 0.154.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cacfa5ef8864e8780a5845a2564794c1adf10547c04f122ca718db29368205e6
4
- data.tar.gz: b83e7feb74634bc5e28c2f7718eb5b24e95b2abad642d3c39f624e46053a51e8
3
+ metadata.gz: ee906342bdb5d0aefcf1787a905edc4695599d1b0ae6b6a107b262f9c10804d2
4
+ data.tar.gz: 1cbce2f27ef4ad2bad6ac330b6a76d7d587bcb292014d6700108142143fe654b
5
5
  SHA512:
6
- metadata.gz: 6e6b1cde7c1137ffa40a37f303efa46dba58690bdff84f9148a2e886dc91524480ceec5af0d70cff9f28c4ea4d550e5288bb73549c4a20bfb6bf79ee1b424a16
7
- data.tar.gz: ddcad487b4e8fdfb37b9737d3685c25aa7dba5e7db8470f90935b9071ee9eb342b473261c8a59763a5fd675a21c01bf0b6b86ca98699511416239617ab380790
6
+ metadata.gz: c7cd1fd9841cecc6001e138b52349e242cb8471fe7ddfb2eb3b8ae070ba456646e549bca5c0a7ffe328431a988023cf36cd823abec0696ee6fe59d0a3800a487
7
+ data.tar.gz: 84b1ddbc2c096cac50491289492421ea18feb60d23422325e211b9d8307ad0b09d12040989c91e6d36e9207ef6bf7ec467487c95840362678aea157c920ab6d6
@@ -2,6 +2,7 @@
2
2
 
3
3
  require "excon"
4
4
  require "dependabot/npm_and_yarn/update_checker"
5
+ require "dependabot/update_checkers/version_filters"
5
6
  require "dependabot/npm_and_yarn/update_checker/registry_finder"
6
7
  require "dependabot/npm_and_yarn/version"
7
8
  require "dependabot/npm_and_yarn/requirement"
@@ -58,15 +59,17 @@ module Dependabot
58
59
  def lowest_security_fix_version
59
60
  return unless valid_npm_details?
60
61
 
61
- versions_array =
62
+ secure_versions =
62
63
  if specified_dist_tag_requirement?
63
64
  [version_from_dist_tags].compact
64
65
  else possible_versions(filter_ignored: false)
65
66
  end
66
67
 
67
- secure_versions = filter_vulnerable_versions(versions_array)
68
+ secure_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(secure_versions,
69
+ security_advisories)
68
70
  secure_versions = filter_ignored_versions(secure_versions)
69
71
  secure_versions = filter_lower_versions(secure_versions)
72
+
70
73
  secure_versions.reverse.find { |version| !yanked?(version) }
71
74
  rescue Excon::Error::Socket, Excon::Error::Timeout
72
75
  raise if dependency_registry == "registry.npmjs.org"
@@ -125,18 +128,6 @@ module Dependabot
125
128
  select { |v| reqs.all? { |r| r.any? { |o| o.satisfied_by?(v) } } }
126
129
  end
127
130
 
128
- def filter_vulnerable_versions(versions_array)
129
- updated_versions_array = versions_array
130
-
131
- security_advisories.each do |advisory|
132
- updated_versions_array =
133
- updated_versions_array.
134
- reject { |v| advisory.vulnerable?(v) }
135
- end
136
-
137
- updated_versions_array
138
- end
139
-
140
131
  def filter_lower_versions(versions_array)
141
132
  return versions_array unless dependency.version && version_class.correct?(dependency.version)
142
133
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dependabot-npm_and_yarn
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.154.3
4
+ version: 0.154.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-21 00:00:00.000000000 Z
11
+ date: 2021-06-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.154.3
19
+ version: 0.154.4
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.154.3
26
+ version: 0.154.4
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement