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

Fix syml/yaml lockfile indentation in turbo prune #574

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 3 commits into from
Jan 19, 2022
Merged

Fix syml/yaml lockfile indentation in turbo prune #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adac91a
Fix syml/yaml lockfile indentation in turbo prune
jaredpalmer Jan 19, 2022
db00e98
Try setting binary path in gh action
jaredpalmer Jan 19, 2022
d87edf7
Set binary path in .yarnrc in check-examples
jaredpalmer Jan 19, 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
9 changes: 7 additions & 2 deletions cli/internal/prune/prune.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package prune

import (
"bufio"
"bytes"
"fmt"
"io/ioutil"
"log"
Expand Down Expand Up @@ -234,12 +235,16 @@ func (c *PruneCommand) Run(args []string) int {
}
}

next, err := yaml.Marshal(lockfile)
var b bytes.Buffer
yamlEncoder := yaml.NewEncoder(&b)
yamlEncoder.SetIndent(2) // this is what you're looking for
yamlEncoder.Encode(lockfile)

if err != nil {
c.logError(c.Config.Logger, "", fmt.Errorf("failed to materialize sub-lockfile. This can happen if your lockfile contains merge conflicts or is somehow corrupted. Please report this if it occurs: %w", err))
return 1
}
err = ioutil.WriteFile(filepath.Join(pruneOptions.cwd, "out", "yarn.lock"), next, fs.DirPermissions)
err = ioutil.WriteFile(filepath.Join(pruneOptions.cwd, "out", "yarn.lock"), b.Bytes(), fs.DirPermissions)
if err != nil {
c.logError(c.Config.Logger, "", fmt.Errorf("failed to write sub-lockfile: %w", err))
return 1
Expand Down
6 changes: 5 additions & 1 deletion scripts/run-examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ if [ -f ".eslintrc.js" ]; then
mv .eslintrc.js .eslintrc.js.bak
fi

echo "'env:\n\tTURBO_BINARY_PATH: $TURBO_BINARY_PATH'" > examples/.yarnrc;

function cleanup {
rm -rf node_modules
rm -rf apps/*/node_modules
Expand Down Expand Up @@ -140,4 +142,6 @@ if [[ ! -z $(git status -s | grep -v package.json) ]];then
echo "Detected changes"
git status
exit 1
fi
fi

rm -rf examples/.yarnrc;