Skip to content

Fixes #612

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
mxcl merged 4 commits into from
Jun 12, 2023
Merged

Fixes #612

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
363aade
don’t show empty installing list
mxcl Jun 12, 2023
30e9e17
bump libtea for useMoustaches fix
mxcl Jun 12, 2023
43261f9
Add yarn to virtual env based on files
mxcl Jun 12, 2023
0932cbe
If stderr is not a tty, be silent by default
mxcl Jun 12, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</p>


# tea/cli 0.35.4
# tea/cli 0.35.5

`tea` puts the whole open source ecosystem at your fingertips:

Expand Down
4 changes: 2 additions & 2 deletions deno.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"imports": {
"is-what": "https://deno.land/x/is_what@v4.1.8/src/index.ts",
"jsonc": "https://deno.land/x/jsonc_parser@v0.0.1/mod.ts",
"tea": "https://raw.github.com/teaxyz/lib/v0.4.2/mod.ts",
"tea/": "https://raw.github.com/teaxyz/lib/v0.4.2/src/",
"tea": "https://raw.github.com/teaxyz/lib/v0.5.0/mod.ts",
"tea/": "https://raw.github.com/teaxyz/lib/v0.5.0/src/",
"outdent": "https://deno.land/x/outdent@v0.8.0/mod.ts",
"cliffy/": "https://deno.land/x/cliffy@v0.25.7/",
"deno/": "https://deno.land/std@0.187.0/",
Expand Down
6 changes: 5 additions & 1 deletion src/hooks/useConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,13 @@ function getVerbosity(env: Record<string, string>, sequences_ok: boolean): Verbo
const verbosity = flatmap(VERBOSE, parseInt)
if (isNumber(verbosity)) {
return verbosity
} else if (parseBool(CI) || !sequences_ok) {
} else if (parseBool(CI)) {
// prevents dumping 100s of lines of download progress
return Verbosity.quiet
} else if (!Deno.isatty(Deno.stderr.rid)) {
return Verbosity.silent
} else if (!sequences_ok) {
return Verbosity.quiet
} else {
return Verbosity.normal
}
Expand Down
6 changes: 6 additions & 0 deletions src/hooks/useVirtualEnv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,12 @@ export default async function(cwd: Path): Promise<VirtualEnv> {
srcroot = f!.parent()
}
}
if (_if(".yarnrc")) {
pkgs.push({ project: "classic.yarnpkg.com", constraint })
}
if (_if(".yarnrc.yml")) {
pkgs.push({ project: "yarnpkg.com", constraint })
}
if (_if("tea.yml", "tea.yaml")) {
insert(refineFrontMatter(await f!.readYAML()))
}
Expand Down
8 changes: 4 additions & 4 deletions src/prefab/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ export default async function(pkgs: PackageSpecification[], update: boolean) {
if (json) {
logJSON({ status: "resolved", pkgs: pending.map(utils.pkg.str) })
} else {
console.debug({hydrating: pkgs})
if (verbosity <= Verbosity.quiet) {
logger.replace(`${teal("installing")} ${pending.map(utils.pkg.str).join(", ")}`)
} else {
if (verbosity > Verbosity.quiet) {
logger.clear()
} else if (pending.length) {
logger.replace(`${teal("installing")} ${pending.map(utils.pkg.str).join(", ")}`)
}
console.debug({hydrating: pkgs})
}

if (!dryrun && env.TEA_MAGIC?.split(':').includes("prompt")) {
Expand Down