From 94bcd9931d6709170b78a92e7372bbd0de44ae03 Mon Sep 17 00:00:00 2001 From: Florian Vogt Date: Wed, 29 Mar 2023 16:34:58 +0200 Subject: [PATCH] [FIX] Taskrunner: pass new taskutil options to determineRequiredDependencies hook --- lib/build/TaskRunner.js | 14 ++++++++------ test/lib/build/TaskRunner.js | 8 +++++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/build/TaskRunner.js b/lib/build/TaskRunner.js index fb3ddb0b0..cd9a251e2 100644 --- a/lib/build/TaskRunner.js +++ b/lib/build/TaskRunner.js @@ -302,13 +302,15 @@ class TaskRunner { taskUtilInterface.getProject.bind(taskUtilInterface); dependencyDeterminationParams.getDependencies = taskUtilInterface.getDependencies.bind(taskUtilInterface); - dependencyDeterminationParams.options = { - projectName: project.getName(), - projectNamespace: project.getNamespace(), - configuration: taskDef.configuration, - taskName: newTaskName - }; } + + dependencyDeterminationParams.options = { + projectName: project.getName(), + projectNamespace: project.getNamespace(), + configuration: taskDef.configuration, + taskName: newTaskName + }; + requiredDependencies = await requiredDependenciesCallback(dependencyDeterminationParams); if (!(requiredDependencies instanceof Set)) { throw new Error( diff --git a/test/lib/build/TaskRunner.js b/test/lib/build/TaskRunner.js index 9430d985f..e215957a9 100644 --- a/test/lib/build/TaskRunner.js +++ b/test/lib/build/TaskRunner.js @@ -776,7 +776,13 @@ test("Custom task with legacy spec version and requiredDependenciesCallback", as t.is(requiredDependenciesCallbackStub.callCount, 1, "requiredDependenciesCallback got called once"); t.deepEqual(requiredDependenciesCallbackStub.getCall(0).args[0], { - availableDependencies: new Set(["dep.a", "dep.b"]) + availableDependencies: new Set(["dep.a", "dep.b"]), + options: { + projectName: "project.b", + projectNamespace: "project/b", + configuration: "configuration", + taskName: "myTask" + } }, "requiredDependenciesCallback got called with expected arguments"); const createDependencyReaderStub = sinon.stub(taskRunner, "_createDependenciesReader").resolves("dependencies");