From 1125d61bdc4fb0f8221cb371ee91ac65f84abec8 Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Tue, 6 Aug 2024 13:29:47 +0100 Subject: [PATCH] Fix up some of the commands --- packages/cli-v3/src/commands/init.ts | 24 +++++++++---------- packages/cli-v3/src/commands/list-profiles.ts | 20 ++++------------ packages/cli-v3/src/telemetry/tracing.ts | 8 +++---- .../cli-v3/src/utilities/initialBanner.ts | 2 +- 4 files changed, 22 insertions(+), 32 deletions(-) diff --git a/packages/cli-v3/src/commands/init.ts b/packages/cli-v3/src/commands/init.ts index 7eb9616e3..dd83cc4ce 100644 --- a/packages/cli-v3/src/commands/init.ts +++ b/packages/cli-v3/src/commands/init.ts @@ -9,7 +9,7 @@ import { applyEdits, modify, findNodeAtLocation, parseTree, getNodeValue } from import { writeFile } from "node:fs/promises"; import { join, relative, resolve } from "node:path"; import { z } from "zod"; -import { CliApiClient } from "../apiClient"; +import { CliApiClient } from "../apiClient.js"; import { CommonCommandOptions, OutroCommandError, @@ -21,17 +21,17 @@ import { wrapCommandAction, } from "../cli/common.js"; import { readConfig } from "../utilities/configFiles.js"; -import { createFileFromTemplate } from "../utilities/createFileFromTemplate"; -import { createFile, pathExists, readFile } from "../utilities/fileSystem"; -import { PackageManager, getUserPackageManager } from "../utilities/getUserPackageManager"; +import { createFileFromTemplate } from "../utilities/createFileFromTemplate.js"; +import { createFile, pathExists, readFile } from "../utilities/fileSystem.js"; +import { PackageManager, getUserPackageManager } from "../utilities/getUserPackageManager.js"; import { printStandloneInitialBanner } from "../utilities/initialBanner.js"; -import { logger } from "../utilities/logger"; -import { cliRootPath } from "../utilities/resolveInternalFilePath"; -import { login } from "./login"; -import { spinner } from "../utilities/windows"; -import { CLOUD_API_URL } from "../consts"; -import * as packageJson from "../../package.json"; -import { cliLink, prettyError } from "../utilities/cliOutput"; +import { logger } from "../utilities/logger.js"; +import { cliRootPath } from "../utilities/resolveInternalFilePath.js"; +import { login } from "./login.js"; +import { spinner } from "../utilities/windows.js"; +import { CLOUD_API_URL } from "../consts.js"; +import { version } from "../../package.json"; +import { cliLink, prettyError } from "../utilities/cliOutput.js"; const InitCommandOptions = CommonCommandOptions.extend({ projectRef: z.string().optional(), @@ -56,7 +56,7 @@ export function configureInitCommand(program: Command) { .option( "-t, --tag ", "The version of the @trigger.dev/sdk package to install", - packageJson.version + version ) .option("--skip-package-install", "Skip installing the @trigger.dev/sdk package") .option("--override-config", "Override the existing config file if it exists") diff --git a/packages/cli-v3/src/commands/list-profiles.ts b/packages/cli-v3/src/commands/list-profiles.ts index 657b4dd8f..52422db85 100644 --- a/packages/cli-v3/src/commands/list-profiles.ts +++ b/packages/cli-v3/src/commands/list-profiles.ts @@ -1,21 +1,11 @@ +import { log, outro } from "@clack/prompts"; import { Command } from "commander"; -import { - deleteAuthConfigProfile, - readAuthConfigFile, - readAuthConfigProfile, - writeAuthConfigProfile, -} from "../utilities/configFiles.js"; -import { logger } from "../utilities/logger.js"; -import { - CommonCommandOptions, - commonOptions, - handleTelemetry, - wrapCommandAction, -} from "../cli/common.js"; -import { printInitialBanner } from "../utilities/initialBanner.js"; import { z } from "zod"; +import { CommonCommandOptions, handleTelemetry, wrapCommandAction } from "../cli/common.js"; import { chalkGrey } from "../utilities/cliOutput.js"; -import { log, outro, text } from "@clack/prompts"; +import { readAuthConfigFile } from "../utilities/configFiles.js"; +import { printInitialBanner } from "../utilities/initialBanner.js"; +import { logger } from "../utilities/logger.js"; const ListProfilesOptions = CommonCommandOptions; diff --git a/packages/cli-v3/src/telemetry/tracing.ts b/packages/cli-v3/src/telemetry/tracing.ts index 6af006334..552d467d4 100644 --- a/packages/cli-v3/src/telemetry/tracing.ts +++ b/packages/cli-v3/src/telemetry/tracing.ts @@ -4,12 +4,12 @@ import { Resource, detectResourcesSync, processDetectorSync } from "@opentelemet import { NodeTracerProvider, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-node"; import { FetchInstrumentation } from "@opentelemetry/instrumentation-fetch"; import { DiagConsoleLogger, DiagLogLevel, diag, trace } from "@opentelemetry/api"; -import * as packageJson from "../../package.json"; +import { version } from "../../package.json"; import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION, } from "@opentelemetry/semantic-conventions"; -import { logger } from "../utilities/logger"; +import { logger } from "../utilities/logger.js"; function initializeTracing(): NodeTracerProvider | undefined { if ( @@ -30,7 +30,7 @@ function initializeTracing(): NodeTracerProvider | undefined { }).merge( new Resource({ [SEMRESATTRS_SERVICE_NAME]: "trigger.dev cli v3", - [SEMRESATTRS_SERVICE_VERSION]: packageJson.version, + [SEMRESATTRS_SERVICE_VERSION]: version, }) ); @@ -70,5 +70,5 @@ function initializeTracing(): NodeTracerProvider | undefined { export const provider = initializeTracing(); export function getTracer() { - return trace.getTracer("trigger.dev cli v3", packageJson.version); + return trace.getTracer("trigger.dev cli v3", version); } diff --git a/packages/cli-v3/src/utilities/initialBanner.ts b/packages/cli-v3/src/utilities/initialBanner.ts index 93e9b3d86..a5db3419a 100644 --- a/packages/cli-v3/src/utilities/initialBanner.ts +++ b/packages/cli-v3/src/utilities/initialBanner.ts @@ -5,7 +5,7 @@ import pkg from "../../package.json"; import { chalkGrey, chalkRun, chalkTask, chalkWorker, green, logo } from "./cliOutput.js"; import { getVersion } from "./getVersion.js"; import { logger } from "./logger.js"; -import { spinner } from "./windows"; +import { spinner } from "./windows.js"; export async function printInitialBanner(performUpdateCheck = true) { const cliVersion = getVersion();