diff --git a/README.md b/README.md index e59cbd23f..6da0fbca7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@

-# tea/cli 0.35.4 +# tea/cli 0.35.5 `tea` puts the whole open source ecosystem at your fingertips: diff --git a/deno.jsonc b/deno.jsonc index ac6ac9622..06a3f191f 100644 --- a/deno.jsonc +++ b/deno.jsonc @@ -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/", diff --git a/src/hooks/useConfig.ts b/src/hooks/useConfig.ts index 7b6a197aa..8ba00a783 100644 --- a/src/hooks/useConfig.ts +++ b/src/hooks/useConfig.ts @@ -127,9 +127,13 @@ function getVerbosity(env: Record, 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 } diff --git a/src/hooks/useVirtualEnv.ts b/src/hooks/useVirtualEnv.ts index 9151753bb..cc91af03f 100644 --- a/src/hooks/useVirtualEnv.ts +++ b/src/hooks/useVirtualEnv.ts @@ -221,6 +221,12 @@ export default async function(cwd: Path): Promise { 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())) } diff --git a/src/prefab/install.ts b/src/prefab/install.ts index 1f7e973d0..f2b14b57b 100644 --- a/src/prefab/install.ts +++ b/src/prefab/install.ts @@ -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")) {