From a043014f723abfd4c77bf74833839cb47c266db4 Mon Sep 17 00:00:00 2001 From: Andy Royle Date: Fri, 15 Dec 2023 15:47:40 +0000 Subject: [PATCH] @uppy/companion: merge config before validating --- packages/@uppy/companion/src/companion.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@uppy/companion/src/companion.js b/packages/@uppy/companion/src/companion.js index 683eeb3d1d..5ff3b5c8fa 100644 --- a/packages/@uppy/companion/src/companion.js +++ b/packages/@uppy/companion/src/companion.js @@ -68,10 +68,10 @@ module.exports.setLoggerProcessName = setLoggerProcessName module.exports.app = (optionsArg = {}) => { setLoggerProcessName(optionsArg) - validateConfig(optionsArg) - const options = merge({}, defaultOptions, optionsArg) + validateConfig(options) + const providers = providerManager.getDefaultProviders() const { customProviders } = options