companion: Support running standalone with custom options (#2428)

* Support running standalone with custom options * Move server.js logic into index.js
transloadit · Aug 31, 2020 · a4693ed · a4693ed
1 parent 9c8ff48
commit a4693ed
Show file tree

Hide file tree

Showing 2 changed files with 194 additions and 184 deletions.
diff --git a/packages/@uppy/companion/src/standalone/helper.js b/packages/@uppy/companion/src/standalone/helper.js
@@ -13,8 +13,8 @@ const { version } = require('../../package.json')
  *
  * @returns {object}
  */
-exports.getCompanionOptions = () => {
-  return merge({}, getConfigFromEnv(), getConfigFromFile())
+exports.getCompanionOptions = (options = {}) => {
+  return merge({}, getConfigFromEnv(), getConfigFromFile(), options)
 }
 
 /**