Fix up some of the commands

This commit is contained in:
Eric Allam
2024-08-06 13:29:47 +01:00
committed by Eric Allam
parent 7caba3a02f
commit 1125d61bdc
4 changed files with 22 additions and 32 deletions
+12 -12
View File
@@ -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 <package 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")
+5 -15
View File
@@ -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;
+4 -4
View File
@@ -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);
}
@@ -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();