From 7cced6006a9a6f9108009e9f3e191e9f3ba1b168 Mon Sep 17 00:00:00 2001 From: Adrien de Peretti Date: Wed, 14 Dec 2022 19:35:16 +0100 Subject: [PATCH] fix(medusa-core-utils): getConfigFile typings (#2783) * fix: getConfigFile typeings * Create brave-apes-carry.md Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com> --- .changeset/brave-apes-carry.md | 6 ++++++ packages/medusa-core-utils/src/get-config-file.ts | 11 +++++------ packages/medusa/src/loaders/config.ts | 7 ++----- 3 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 .changeset/brave-apes-carry.md diff --git a/.changeset/brave-apes-carry.md b/.changeset/brave-apes-carry.md new file mode 100644 index 0000000000..fcf9936606 --- /dev/null +++ b/.changeset/brave-apes-carry.md @@ -0,0 +1,6 @@ +--- +"medusa-core-utils": patch +"@medusajs/medusa": patch +--- + +fix: getConfigFile typings diff --git a/packages/medusa-core-utils/src/get-config-file.ts b/packages/medusa-core-utils/src/get-config-file.ts index 02fd418ce4..3b0aa198a1 100644 --- a/packages/medusa-core-utils/src/get-config-file.ts +++ b/packages/medusa-core-utils/src/get-config-file.ts @@ -9,21 +9,20 @@ import { join } from "path" function getConfigFile( rootDir: string, configName: string -): { configModule: TConfig; configFilePath: string } | { error: any } { +): { configModule: TConfig; configFilePath: string, error?: any } { const configPath = join(rootDir, configName) let configFilePath = `` let configModule + let err try { configFilePath = require.resolve(configPath) configModule = require(configFilePath) - } catch (err) { - return { - error: err, - } + } catch (e) { + err = e } - return { configModule, configFilePath } + return { configModule, configFilePath, error: err } } export default getConfigFile diff --git a/packages/medusa/src/loaders/config.ts b/packages/medusa/src/loaders/config.ts index 36352de6a3..ad9f2c5f9f 100644 --- a/packages/medusa/src/loaders/config.ts +++ b/packages/medusa/src/loaders/config.ts @@ -20,13 +20,10 @@ export const handleConfigError = (error: Error): void => { } export default (rootDirectory: string): ConfigModule => { - const { configModule, error } = getConfigFile( + const { configModule, error } = getConfigFile( rootDirectory, `medusa-config` - ) as { - configModule: ConfigModule - error: Error | null - } + ) if (error) { handleConfigError(error)