about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-01-21 13:22:31 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-01-21 13:22:31 +0100
commitd613dda91d1f1595f73a967eb01c41b07cddacbe (patch)
tree964f637d2290f4b9405a9c3f49a8db44aec52b93
parent112b1fa265f650c01eef2578e286214e3d82dcac (diff)
Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)
Since 872a0d5bd801c998d911f7da582a60d2f714a710, assets URL are absolute and
not relative. Unfortunately, the domain used to build such URLs is the wrong
one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.
-rw-r--r--config/webpack/configuration.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 26747e76b..07af743f7 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -27,7 +27,7 @@ function formatPublicPath(host = '', path = '') {
 
 const output = {
   path: resolve('public', settings.public_output_path),
-  publicPath: formatPublicPath(env.ASSET_HOST || env.LOCAL_DOMAIN, settings.public_output_path),
+  publicPath: formatPublicPath(env.ASSET_HOST || env.WEB_DOMAIN || env.LOCAL_DOMAIN, settings.public_output_path),
 };
 
 module.exports = {