Skip to content

Yarn Berry: Private registry support #5831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavera merged 4 commits into from
Oct 7, 2022
Merged

Yarn Berry: Private registry support #5831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
418df27
Adding private registry support for yarn berry
pavera Sep 14, 2022
7dd4226
A bit of code cleanup, adding feature flag checks
pavera Oct 4, 2022
56faa95
attempt to reduce complexity.
pavera Oct 4, 2022
df667d6
Adding back inadvertently removed whitespace.
pavera Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions npm_and_yarn/lib/dependabot/npm_and_yarn/file_fetcher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ def yarn_version
return @yarn_version if defined?(@yarn_version)

package = JSON.parse(package_json.content)
if (pkgmanager = package.fetch("packageManager", nil))
get_yarn_version_from_path(pkgmanager)
if Experiments.enabled?(:yarn_berry) && (package_manager = package.fetch("packageManager", nil))
get_yarn_version_from_package_json(package_manager)
elsif yarn_lock
1
end
end

def get_yarn_version_from_path(path)
version_match = path.match(/yarn@(?<version>\d+.\d+.\d+)/)
def get_yarn_version_from_package_json(package_manager)
version_match = package_manager.match(/yarn@(?<version>\d+.\d+.\d+)/)
version_match&.named_captures&.fetch("version", nil)
end

Expand Down
11 changes: 9 additions & 2 deletions npm_and_yarn/lib/dependabot/npm_and_yarn/file_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,18 @@ def semver_version_for(name, requirement, manifest_name)
def source_for(name, requirement, manifest_name)
return git_source_for(requirement) if git_url?(requirement)

resolved_url = lockfile_parser.lockfile_details(
lockfile_details = lockfile_parser.lockfile_details(
dependency_name: name,
requirement: requirement,
manifest_name: manifest_name
)&.fetch("resolved", nil)
)
resolved_url = lockfile_details&.fetch("resolved", nil)

if Experiments.enabled?(:yarn_berry) && resolved_url.nil?
resolution = lockfile_details&.fetch("resolution", nil)
package_match = resolution&.match(/__archiveUrl=(?<package_url>.+)/)
resolved_url = CGI.unescape(package_match.named_captures.fetch("package_url", "")) if package_match
end

return unless resolved_url
return unless resolved_url.start_with?("http")
Expand Down