这是indexloc提供的服务，不要输入任何密码
Skip to content

Fixed crash and added error message if packageManager field is invalid. #680

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
merged 2 commits into from
Feb 8, 2022
Merged

Fixed crash and added error message if packageManager field is invalid. #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1945a89
fixed crash and added error message if packageManager field is invalid
grigorii-zander Feb 5, 2022
79ffe5e
Merge branch 'main' into main
jaredpalmer Feb 8, 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
23 changes: 17 additions & 6 deletions cli/internal/backends/nodejs/nodejs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ var NodejsYarnBackend = api.LanguageBackend{
},
Detect: func(cwd string, pkg *fs.PackageJSON, backend *api.LanguageBackend) (bool, error) {
if pkg.PackageManager != "" {
packageManager, version := util.GetPackageManagerAndVersion(pkg.PackageManager)
packageManager, version, err := util.GetPackageManagerAndVersion(pkg.PackageManager)

if err != nil {
return false, err
}

if packageManager != "yarn" {
return false, nil
Expand Down Expand Up @@ -95,8 +99,11 @@ var NodejsBerryBackend = api.LanguageBackend{
},
Detect: func(cwd string, pkg *fs.PackageJSON, backend *api.LanguageBackend) (bool, error) {
if pkg.PackageManager != "" {
packageManager, version := util.GetPackageManagerAndVersion(pkg.PackageManager)
packageManager, version, err := util.GetPackageManagerAndVersion(pkg.PackageManager)

if err != nil {
return false, err
}
if packageManager != "yarn" {
return false, nil
}
Expand Down Expand Up @@ -178,8 +185,10 @@ var NodejsPnpmBackend = api.LanguageBackend{
},
Detect: func(cwd string, pkg *fs.PackageJSON, backend *api.LanguageBackend) (bool, error) {
if pkg.PackageManager != "" {
packageManager, _ := util.GetPackageManagerAndVersion(pkg.PackageManager)

packageManager, _, err := util.GetPackageManagerAndVersion(pkg.PackageManager)
if err != nil {
return false, err
}
if packageManager == "pnpm" {
return true, nil
}
Expand Down Expand Up @@ -221,8 +230,10 @@ var NodejsNpmBackend = api.LanguageBackend{
},
Detect: func(cwd string, pkg *fs.PackageJSON, backend *api.LanguageBackend) (bool, error) {
if pkg.PackageManager != "" {
packageManager, _ := util.GetPackageManagerAndVersion(pkg.PackageManager)

packageManager, _, err := util.GetPackageManagerAndVersion(pkg.PackageManager)
if err != nil {
return false, err
}
if packageManager == "npm" {
return true, nil
}
Expand Down
6 changes: 3 additions & 3 deletions cli/internal/fs/package_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import (
// TurboConfigJSON is the root turborepo configuration
type TurboConfigJSON struct {
// Base Git branch
Base string `json:"baseBranch,omitempty"`
Base string `json:"baseBranch,omitempty"`
// Global root filesystem dependencies
GlobalDependencies []string `json:"globalDependencies,omitempty"`
TurboCacheOptions string `json:"cacheOptions,omitempty"`
Outputs []string `json:"outputs,omitempty"`
// RemoteCacheUrl is the Remote Cache API URL
RemoteCacheUrl string `json:"remoteCacheUrl,omitempty"`
RemoteCacheUrl string `json:"remoteCacheUrl,omitempty"`
// Pipeline is a map of Turbo pipeline entries which define the task graph
// and cache behavior on a per task or per package-task basis.
Pipeline map[string]Pipeline
Pipeline map[string]Pipeline
}

func ReadTurboConfigJSON(path string) (*TurboConfigJSON, error) {
Expand Down
10 changes: 7 additions & 3 deletions cli/internal/util/backends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,13 @@ func IsNMLinker(cwd string) (bool, error) {
return yarnRC.NodeLinker == "node-modules", nil
}

func GetPackageManagerAndVersion(packageManager string) (string, string) {
re := regexp.MustCompile(`(npm|pnpm|yarn)@(\d+)\.\d+\.\d+(-.+)?`)
func GetPackageManagerAndVersion(packageManager string) (string, string, error) {
pattern := `(npm|pnpm|yarn)@(\d+)\.\d+\.\d+(-.+)?`
re := regexp.MustCompile(pattern)
match := re.FindString(packageManager)
if len(match) == 0 {
return "", "", fmt.Errorf("could not parse packageManager field in package.json, expected: %s, received: %s", pattern, packageManager)
}

return strings.Split(match, "@")[0], strings.Split(match, "@")[1]
return strings.Split(match, "@")[0], strings.Split(match, "@")[1], nil
}