From 02e0707797f2488399a30b22deeecd28f4f566de Mon Sep 17 00:00:00 2001 From: npenin Date: Sat, 10 Aug 2024 17:18:28 +0200 Subject: [PATCH] fix: automate after upgrade --- packages/automate/src/akala.mts | 2 +- packages/automate/src/workflow-commands/process.ts | 2 +- packages/automate/src/workflow-commands/use.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/automate/src/akala.mts b/packages/automate/src/akala.mts index 9865f76162..e662f7e688 100644 --- a/packages/automate/src/akala.mts +++ b/packages/automate/src/akala.mts @@ -30,7 +30,7 @@ export default function (config, cli: NamespaceMiddleware) context.logger.level = LogLevels[levelEntry[0]]; } } - const container: workflow.container & Container = await use.call(context, null, 'workflow', require.resolve('../../workflow.json')); + const container: workflow.container & Container = await use.call(context, null, 'workflow', new URL('../../workflow.json', import.meta.url)); var loader: Container; if (context.options.loader) diff --git a/packages/automate/src/workflow-commands/process.ts b/packages/automate/src/workflow-commands/process.ts index 1650f5fa3f..d73a17c5ea 100644 --- a/packages/automate/src/workflow-commands/process.ts +++ b/packages/automate/src/workflow-commands/process.ts @@ -22,7 +22,7 @@ export function UsesMiddleware(container: Container): MiddlewareRunner< { return new MiddlewareRunner('uses', (context: CliContext<{ file: string }>, step) => { - return use.call(context, container, step.with?.name, path.join(path.dirname(context.options.file), step.uses)); + return use.call(context, container as any, step.with?.name as string, path.join(path.dirname(context.options.file), step.uses)); }); } diff --git a/packages/automate/src/workflow-commands/use.ts b/packages/automate/src/workflow-commands/use.ts index a02b2e61ca..5a35e1cf90 100644 --- a/packages/automate/src/workflow-commands/use.ts +++ b/packages/automate/src/workflow-commands/use.ts @@ -3,14 +3,15 @@ import { Container, Processors } from "@akala/commands"; import { isAbsolute, basename } from 'path' import { pathToFileURL, fileURLToPath } from 'url' -export default async function use(this: CliContext, self: Container, name: string, pathToCommands: string) +export default async function use(this: CliContext, self: Container, name: string, pathToCommands: string | URL) { if (!name) var container = self; else var container = new Container(name, this); - if (pathToCommands.startsWith('./') || isAbsolute(pathToCommands)) + if (pathToCommands instanceof URL || pathToCommands.startsWith('./') || isAbsolute(pathToCommands)) { + pathToCommands = fileURLToPath(pathToCommands); if (basename(pathToCommands) == 'package.json') await Processors.FileSystem.discoverCommands(pathToCommands.substring(0, pathToCommands.length - 'package.json'.length), container); else