Skip to content

Commit d01d438

Browse files
author
Deploy Bot
committed
fix: resolve typecheck errors after merge
1 parent e101f8e commit d01d438

File tree

5 files changed

+16
-22
lines changed

5 files changed

+16
-22
lines changed

packages/cli-v3/src/cli/common.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export const CommonCommandOptions = z.object({
1414
logLevel: z.enum(["debug", "info", "log", "warn", "error", "none"]).default("log"),
1515
skipTelemetry: z.boolean().default(false),
1616
profile: z.string().default(readAuthConfigCurrentProfileName()),
17+
ignoreEngines: z.boolean().default(false),
1718
});
1819

1920
export type CommonCommandOptions = z.infer<typeof CommonCommandOptions>;
@@ -30,9 +31,9 @@ export function commonOptions(command: Command) {
3031
.option("--skip-telemetry", "Opt-out of sending telemetry");
3132
}
3233

33-
export class SkipLoggingError extends Error {}
34-
export class SkipCommandError extends Error {}
35-
export class OutroCommandError extends SkipCommandError {}
34+
export class SkipLoggingError extends Error { }
35+
export class SkipCommandError extends Error { }
36+
export class OutroCommandError extends SkipCommandError { }
3637

3738
export async function handleTelemetry(action: () => Promise<void>) {
3839
try {

packages/cli-v3/src/commands/login.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
138138
profile: options?.profile ?? "default",
139139
skipTelemetry: !span.isRecording(),
140140
logLevel: logger.loggerLevel,
141+
ignoreEngines: false,
141142
},
142143
true,
143144
opts.silent
@@ -148,8 +149,7 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
148149

149150
if (!opts.embedded) {
150151
outro(
151-
`Login failed using stored token. To fix, first logout using \`trigger.dev logout${
152-
options?.profile ? ` --profile ${options.profile}` : ""
152+
`Login failed using stored token. To fix, first logout using \`trigger.dev logout${options?.profile ? ` --profile ${options.profile}` : ""
153153
}\` and then try again.`
154154
);
155155

@@ -290,6 +290,7 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
290290
profile: options?.profile ?? "default",
291291
skipTelemetry: !span.isRecording(),
292292
logLevel: logger.loggerLevel,
293+
ignoreEngines: false,
293294
},
294295
opts.embedded
295296
);

packages/cli-v3/src/commands/update.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -258,23 +258,7 @@ export async function updateTriggerPackages(
258258
`Installing new package versions${packageManager ? ` with ${packageManager.name}` : ""}`
259259
);
260260

261-
const installArgs: string[] = [];
262-
263-
if (options.ignoreEngines && packageManager) {
264-
switch (packageManager.name) {
265-
case "npm":
266-
installArgs.push("--no-engine-strict");
267-
break;
268-
case "pnpm":
269-
installArgs.push("--config.engine-strict=false");
270-
break;
271-
case "yarn":
272-
installArgs.push("--ignore-engines");
273-
break;
274-
}
275-
}
276-
277-
await installDependencies({ cwd: projectPath, silent: true, args: installArgs });
261+
await installDependencies({ cwd: projectPath, silent: true });
278262
} catch (error) {
279263
installSpinner.stop(
280264
`Failed to install new package versions${packageManager ? ` with ${packageManager.name}` : ""

packages/cli-v3/src/entryPoints/dev-run-worker.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
6464
import { readFile } from "node:fs/promises";
6565
import { setInterval, setTimeout } from "node:timers/promises";
6666
import { installSourceMapSupport } from "../utilities/sourceMaps.js";
67+
import { env } from "std-env";
68+
import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
69+
import { VERSION } from "../version.js";
70+
import { promiseWithResolvers } from "@trigger.dev/core/utils";
6771

6872
installSourceMapSupport();
6973

packages/cli-v3/src/entryPoints/managed-run-worker.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
6464
import { readFile } from "node:fs/promises";
6565
import { setInterval, setTimeout } from "node:timers/promises";
6666
import { installSourceMapSupport } from "../utilities/sourceMaps.js";
67+
import { env } from "std-env";
68+
import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
69+
import { VERSION } from "../version.js";
70+
import { promiseWithResolvers } from "@trigger.dev/core/utils";
6771

6872
installSourceMapSupport();
6973

0 commit comments

Comments
 (0)