From e911c6aebfe7f5efba177a75d96a963967b15238 Mon Sep 17 00:00:00 2001
From: Adrien de Peretti <adrien.deperetti@gmail.com>
Date: Wed, 16 Oct 2024 19:20:56 +0200
Subject: [PATCH] fix(modules-sdk): Add missing paths to require.resolve in
 load resources (#9608)

FIXES FRMW-2747

**What**

Add missing `paths` options
---
 .../modules-sdk/src/loaders/__tests__/module-loader.ts    | 8 ++++----
 .../core/modules-sdk/src/loaders/utils/load-internal.ts   | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/core/modules-sdk/src/loaders/__tests__/module-loader.ts b/packages/core/modules-sdk/src/loaders/__tests__/module-loader.ts
index 0181197586..8ac573edc2 100644
--- a/packages/core/modules-sdk/src/loaders/__tests__/module-loader.ts
+++ b/packages/core/modules-sdk/src/loaders/__tests__/module-loader.ts
@@ -50,7 +50,7 @@ describe("modules loader", () => {
   it("should register the service ", async () => {
     const moduleResolutions: Record<string, ModuleResolution> = {
       testService: {
-        resolutionPath: "@modules/default",
+        resolutionPath: require.resolve("../__mocks__/@modules/default"),
         definition: {
           key: "testService",
           defaultPackage: "testService",
@@ -90,7 +90,7 @@ describe("modules loader", () => {
   it("should run the defined loaders and logs the errors if something fails", async () => {
     const moduleResolutions: Record<string, ModuleResolution> = {
       testService: {
-        resolutionPath: "@modules/brokenloader",
+        resolutionPath: require.resolve("../__mocks__/@modules/brokenloader"),
         definition: {
           key: "testService",
           defaultPackage: "testService",
@@ -115,7 +115,7 @@ describe("modules loader", () => {
   it("should log the errors if no service is defined", async () => {
     const moduleResolutions: Record<string, ModuleResolution> = {
       testService: {
-        resolutionPath: "@modules/no-service",
+        resolutionPath: require.resolve("../__mocks__/@modules/no-service"),
         definition: {
           key: "testService",
           defaultPackage: "testService",
@@ -142,7 +142,7 @@ describe("modules loader", () => {
   it("should throw an error if no service is defined and the module is required", async () => {
     const moduleResolutions: Record<string, ModuleResolution> = {
       testService: {
-        resolutionPath: "@modules/no-service",
+        resolutionPath: require.resolve("../__mocks__/@modules/no-service"),
         definition: {
           key: "testService",
           defaultPackage: "testService",
diff --git a/packages/core/modules-sdk/src/loaders/utils/load-internal.ts b/packages/core/modules-sdk/src/loaders/utils/load-internal.ts
index dd804b9d1b..2f5ff62bf8 100644
--- a/packages/core/modules-sdk/src/loaders/utils/load-internal.ts
+++ b/packages/core/modules-sdk/src/loaders/utils/load-internal.ts
@@ -542,7 +542,9 @@ export async function loadResources({
   loadedModuleLoaders ??= []
 
   const modulePath = discoveryPath
-  let normalizedPath = dirname(require.resolve(modulePath))
+  let normalizedPath = dirname(
+    require.resolve(modulePath, { paths: [process.cwd()] })
+  )
   normalizedPath = resolve(normalizedPath)
 
   try {