diff --git a/src/api/npm.ts b/src/api/npm.ts index 0aa699f3..76f755aa 100644 --- a/src/api/npm.ts +++ b/src/api/npm.ts @@ -14,24 +14,6 @@ interface PackageJson { type?: string } -let workflowLog = - (color: "green" | "yellow" | "red" | "blue" | "magenta" | "cyan" | "white") => - (...messages: any[]) => { - if (process.env.KIT_CONTEXT === "workflow") { - // if any of the message items are not a string, convert them to a string - for (let message of messages) { - if (typeof message !== "string") { - message = JSON.stringify(message) - } - global.echo(global.chalk`{${color} ${message}}`) - } - } - } - -let wlog = workflowLog("green") -let wwarn = workflowLog("yellow") -let werror = workflowLog("red") - let findMain = async (packageJsonPath: string, packageJson: PackageJson) => { try { let kPath = (...pathParts: string[]) => @@ -80,10 +62,7 @@ let findPackageJson = "package.json" ) - wlog(`packageJsonPath`, packageJsonPath) - if (!(await global.isFile(packageJsonPath))) { - wlog(`Could not find package.json at ${packageJsonPath}`) return false } @@ -91,17 +70,12 @@ let findPackageJson = await global.readFile(packageJsonPath, "utf-8") ) - wlog(`pkgPackageJson`, pkgPackageJson) - - let mainModule = await findMain(packageJsonPath, pkgPackageJson) - - wlog(`mainModule`, mainModule) + let mainModule = await findMain(packageJsonPath, pkgPackageJson) return mainModule || false } let kenvImport = async (packageName: string) => { - wlog(`Importing ${packageName}...`) packageName = adjustPackageName(packageName) try { @@ -112,11 +86,8 @@ let kenvImport = async (packageName: string) => { let findMainFromPackageJson = findPackageJson(packageName) - wlog(`Finding main`, { findMainFromPackageJson }) - let mainModule = await findMainFromPackageJson("") - wlog(`mainModule`, { mainModule }) if (mainModule) { if (process.env.KIT_CONTEXT === "workflow") { log(`mainModule:`, mainModule) diff --git a/src/cli/install.ts b/src/cli/install.ts index bfd4dd50..4068528e 100644 --- a/src/cli/install.ts +++ b/src/cli/install.ts @@ -4,25 +4,6 @@ import { } from "@johnlindquist/kit-internal/date-fns" import { KIT_FIRST_PATH } from "../core/utils.js" -let workflowLog = - (color: "green" | "yellow" | "red" | "blue" | "magenta" | "cyan" | "white") => - (...messages: any[]) => { - if (process.env.KIT_CONTEXT === "workflow") { - // if any of the message items are not a string, convert them to a string - for (let message of messages) { - if (typeof message !== "string") { - message = JSON.stringify(message) - } - global.echo(global.chalk`{${color} ${message}}`) - } - } - } - - -let wlog = workflowLog("green") -let wwarn = workflowLog("yellow") -let werror = workflowLog("red") - let install = async (packageNames) => { let cwd = kenvPath() @@ -47,9 +28,6 @@ let install = async (packageNames) => { let packages = packageNames.join(" ") let command = `${toolPath} ${toolArgs} -D ${packages}`.trim() - wlog(`Running: ${command}`) - wlog(`In: ${cwd}`) - return await term({ name: "pnpm install", command, @@ -104,12 +82,6 @@ let packages = await arg( let installNames = [...packages.split(" ")] if (process?.send) global.setChoices([]) - -wlog(`Installing:`, { - installNames, - args, - argOpts -}) await install([...installNames, ...args, ...argOpts]) export { packages } diff --git a/src/target/terminal.ts b/src/target/terminal.ts index 133c0d05..d0cd5c5a 100644 --- a/src/target/terminal.ts +++ b/src/target/terminal.ts @@ -217,30 +217,10 @@ let terminalInstall = async (packageName) => { global.echo( global.chalk`Installing {yellow ${packageName}} into ${kenvPath()} and continuing...` ) - - const files = await global.globby("**/*", { - cwd: kenvPath() - }) - global.echo(files?.length + " files found") - for (let file of files) { - global.echo(`before: ${file}`) - let contents = await readFile(kenvPath(file), "utf8") - global.echo(contents) - } + try { args.push(packageName) await import("../cli/install.js") - - global.echo(global.chalk`Installed {red ${packageName}} into ${kenvPath()} and continuing...`) - const files = await global.globby("**/*", { - cwd: kenvPath() - }) - global.echo(files?.length + " files found") - for (let file of files) { - global.echo(`after: ${file}`) - let contents = await readFile(kenvPath(file), "utf8") - global.echo(contents) - } } catch (error) { global.echo(global.chalk`{red ${error}}`) global.exit(1)