-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
911bcb4
commit 654de3d
Showing
2 changed files
with
18 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,31 +23,24 @@ def setup(name) | |
# i.e. if { engines : "pnpm" : "6" } and { packageManager: "[email protected]" }, | ||
# we go for the specificity mentioned in packageManager (6.0.2) | ||
|
||
if Dependabot::Experiments.enabled?(:enable_pnpm_yarn_dynamic_engine) | ||
unless @package_manager&.start_with?("#{name}@") || (@package_manager&.==name.to_s) || @package_manager.nil? | ||
return | ||
end | ||
|
||
unless @package_manager&.start_with?("#{name}@") || (@package_manager&.==name.to_s) || @package_manager.nil? | ||
return | ||
end | ||
if @engines && @package_manager.nil? | ||
# if "packageManager" doesn't exists in manifest file, | ||
# we check if we can extract "engines" information | ||
version = check_engine_version(name) | ||
|
||
if @engines && @package_manager.nil? | ||
# if "packageManager" doesn't exists in manifest file, | ||
# we check if we can extract "engines" information | ||
Dependabot.logger.info("No \"packageManager\" info found for \"#{name}\"") | ||
version = check_engine_version(name) | ||
|
||
elsif @package_manager&.==name.to_s | ||
# if "packageManager" is found but no version is specified (i.e. [email protected]), | ||
# we check if we can get "engines" info to override default version | ||
Dependabot.logger.info("Found \"packageManager\" : \"#{@package_manager}\"") | ||
version = check_engine_version(name) if @engines | ||
|
||
elsif @package_manager&.start_with?("#{name}@") | ||
# if "packageManager" info has version specification i.e. [email protected] | ||
# we go with the version in "packageManager" | ||
Dependabot.logger.info("Found \"packageManager\" : \"#{@package_manager}\". Skipped checking \"engines\".") | ||
end | ||
else | ||
return unless @package_manager.nil? || @package_manager&.start_with?("#{name}@") | ||
elsif @package_manager&.==name.to_s | ||
# if "packageManager" is found but no version is specified (i.e. [email protected]), | ||
# we check if we can get "engines" info to override default version | ||
version = check_engine_version(name) if @engines | ||
|
||
elsif @package_manager&.start_with?("#{name}@") | ||
# if "packageManager" info has version specification i.e. [email protected] | ||
# we go with the version in "packageManager" | ||
Dependabot.logger.info("Found \"packageManager\" : \"#{@package_manager}\". Skipped checking \"engines\".") | ||
end | ||
|
||
version ||= requested_version(name) | ||
|
@@ -103,7 +96,6 @@ def guessed_version(name) | |
lockfile = @lockfiles[name.to_sym] | ||
return unless lockfile | ||
|
||
Dependabot.logger.info("Estimating version") | ||
Helpers.send(:"#{name}_version_numeric", lockfile) | ||
end | ||
|
||
|
@@ -112,10 +104,7 @@ def check_engine_version(name) | |
version_selector = VersionSelector.new | ||
engine_versions = version_selector.setup(@package_json, name) | ||
|
||
if engine_versions.empty? | ||
Dependabot.logger.info("No relevant (engines) info for \"#{name}\"") | ||
return | ||
end | ||
return if engine_versions.empty? | ||
|
||
version = engine_versions[name] | ||
Dependabot.logger.info("Returned (engines) info \"#{name}\" : \"#{version}\"") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters