Merge branch 'dev-qol' into 'develop'

Several fixes to make life of contributors a tiny bit easier.

See merge request pleroma/pleroma-fe!409

2 files changed, 16 insertions, 1 deletions

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 0d1cabd5..07337595 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -42,8 +42,17 @@ const afterStoreSetup = ({ store, i18n }) => {
           return {}
         })
         .then((staticConfig) => {
+          const overrides = window.___pleromafe_dev_overrides || {}
+          const env = window.___pleromafe_mode.NODE_ENV
+
           // This takes static config and overrides properties that are present in apiConfig
-          var config = Object.assign({}, staticConfig, apiConfig)
+          let config = {}
+          if (overrides.staticConfigPreference && env === 'development') {
+            console.warn('OVERRIDING API CONFIG WITH STATIC CONFIG')
+            config = Object.assign({}, apiConfig, staticConfig)
+          } else {
+            config = Object.assign({}, staticConfig, apiConfig)
+          }
 
           var theme = (config.theme)
           var background = (config.background)
diff --git a/src/main.js b/src/main.js
index 23ea854b..bf92e78e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -95,3 +95,9 @@ createPersistedState(persistedStateOptions).then((persistedState) => {
 
   afterStoreSetup({ store, i18n })
 })
+
+// These are inlined by webpack's DefinePlugin
+/* eslint-disable */
+window.___pleromafe_mode = process.env
+window.___pleromafe_commit_hash = COMMIT_HASH
+window.___pleromafe_dev_overrides = DEV_OVERRIDES