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

Fix empty outputs behavior #347

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 4 commits into from
Dec 17, 2021
+29 −5
Merged

Fix empty outputs behavior #347

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
d641994
Fix empty outputs behavior
jaredpalmer Dec 17, 2021
6e3d223
Merge branch 'main' into fix/empty-outputs
jaredpalmer Dec 17, 2021
44a33da
Fix unmarshaling with pointers
jaredpalmer Dec 17, 2021
a962326
Properly unmarshal cache and dependsOn
jaredpalmer Dec 17, 2021
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
25 changes: 24 additions & 1 deletion cli/internal/fs/package_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,33 @@ func Camelcase(s string, v ...interface{}) string {

var requiredFields = []string{"Name", "Version"}

type PPipeline struct {
Outputs *[]string `json:"outputs"`
Cache *bool `json:"cache,omitempty"`
DependsOn []string `json:"dependsOn,omitempty"`
}

type Pipeline struct {
Outputs []string `json:"outputs,omitempty"`
Outputs []string `json:"-"`
Cache *bool `json:"cache,omitempty"`
DependsOn []string `json:"dependsOn,omitempty"`
PPipeline
}

func (c *Pipeline) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, &c.PPipeline); err != nil {
return err
}
// We actually need a nil value to be able to unmarshal the json
// because we interpret the omission of outputs to be different
// from an empty array. We can't use omitempty because it will
// always unmarshal into an empty array which is not what we want.
if c.PPipeline.Outputs != nil {
c.Outputs = *c.PPipeline.Outputs
}
c.Cache = c.PPipeline.Cache
c.DependsOn = c.PPipeline.DependsOn
return nil
}

// PackageJSON represents NodeJS package.json
Expand Down
9 changes: 5 additions & 4 deletions cli/internal/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,13 +414,14 @@ func (c *RunCommand) Run(args []string) int {
// override if we need to...
pipeline = altpipe
}

outputs := []string{fmt.Sprintf(".turbo/turbo-%v.log", task)}
if len(pipeline.Outputs) > 0 {
outputs = append(outputs, pipeline.Outputs...)
} else {
if pipeline.Outputs == nil {
outputs = append(outputs, "dist/**/*", "build/**/*")
} else {
outputs = append(outputs, pipeline.Outputs...)
}

targetLogger.Debug("task output globs", "outputs", outputs)
hashable := struct {
Hash string
Task string
Expand Down