asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: resolve provider path before requiring it (#9601)

Browse Source
This commit is contained in:
Harminder Virk
2024-10-16 14:17:55 +05:30
committed by GitHub
parent 3388764af4
commit 20428dac71
2 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/core/modules-sdk/src/loaders/register-modules.ts
View File

@@ -67,7 +67,9 @@ function getCustomModuleResolution(
const originalPath = normalizeImportPathWithSource(
(isString(moduleConfig) ? moduleConfig : moduleConfig.resolve) as string
)
const resolutionPath = require.resolve(originalPath)
const resolutionPath = require.resolve(originalPath, {
paths: [process.cwd()],
})
const conf = isObject(moduleConfig)
? moduleConfig
@@ -142,7 +144,9 @@ function getInternalModuleResolution(
const originalPath = normalizeImportPathWithSource(
(isString(moduleConfig) ? moduleConfig : moduleConfig.resolve) as string
)
resolutionPath = require.resolve(originalPath)
resolutionPath = require.resolve(originalPath, {
paths: [process.cwd()],
})
}
const moduleDeclaration = isObj ? moduleConfig : {}

96
packages/core/modules-sdk/src/loaders/utils/load-internal.ts
View File

@@ -143,7 +143,11 @@ async function loadInternalProvider(
...resolution.definition,
key: provider.id,
},
resolutionPath: isString(provider.resolve) ? provider.resolve : false,
resolutionPath: isString(provider.resolve)
? require.resolve(provider.resolve, {
paths: [process.cwd()],
})
: false,
},
logger,
migrationOnly,
@@ -368,50 +372,56 @@ export async function loadModuleMigrations(
revertMigration?: MigrationFunction
generateMigration?: MigrationFunction
}> {
const mainLoadedModule = await resolveModuleExports({
resolution: { ...resolution, moduleExports },
})
const loadedServices = [mainLoadedModule] as (
| ResolvedModule
| ResolvedModuleProvider
)[]
if (Array.isArray(resolution?.options?.providers)) {
for (const provider of (resolution.options as any).providers) {
const providerRes = provider.resolve as ModuleProviderExports
const canLoadProvider =
providerRes && (isString(providerRes) || !providerRes?.services)
if (!canLoadProvider) {
continue
}
const loadedProvider = await resolveModuleExports({
resolution: {
...resolution,
moduleExports: !isString(providerRes) ? providerRes : undefined,
definition: {
...resolution.definition,
key: provider.id,
},
resolutionPath: isString(provider.resolve) ? provider.resolve : false,
},
})
loadedServices.push(loadedProvider as ResolvedModuleProvider)
}
}
if ("error" in mainLoadedModule) {
throw mainLoadedModule.error
}
const runMigrationsFn: ((...args) => Promise<any>)[] = []
const revertMigrationFn: ((...args) => Promise<any>)[] = []
const generateMigrationFn: ((...args) => Promise<any>)[] = []
try {
const mainLoadedModule = await resolveModuleExports({
resolution: { ...resolution, moduleExports },
})
if ("error" in mainLoadedModule) {
throw mainLoadedModule.error
}
const loadedServices = [mainLoadedModule] as (
| ResolvedModule
| ResolvedModuleProvider
)[]
if (Array.isArray(resolution?.options?.providers)) {
for (const provider of (resolution.options as any).providers) {
const providerRes = provider.resolve as ModuleProviderExports
const canLoadProvider =
providerRes && (isString(providerRes) || !providerRes?.services)
if (!canLoadProvider) {
continue
}
const loadedProvider = await resolveModuleExports({
resolution: {
...resolution,
moduleExports: !isString(providerRes) ? providerRes : undefined,
definition: {
...resolution.definition,
key: provider.id,
},
resolutionPath: isString(provider.resolve)
? provider.resolve
: false,
},
})
if ("error" in loadedProvider) {
throw loadedProvider.error
}
loadedServices.push(loadedProvider as ResolvedModuleProvider)
}
}
const migrationScripts: any[] = []
for (const loadedModule of loadedServices) {
let runMigrationsCustom = loadedModule.runMigrations
@@ -476,8 +486,10 @@ export async function loadModuleMigrations(
revertMigration,
generateMigration,
}
} catch {
return {}
} catch (e) {
throw new Error(
`Unable to resolve the migration scripts for the module ${resolution.definition.key}\n${e.message}\n${e.stack}`
)
}
}