diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-21 18:00:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 18:00:08 -0600 |
| commit | a90d0419d97db50cca034b9d30969f3d161a69b1 (patch) | |
| tree | 86c6a4182cda85171caf2f5c1553c054ed7b7e1f /config/webpack/configuration.js | |
| parent | 81b78fac542be867eedc7a0310e29de30b382770 (diff) | |
| parent | 48d79007f616ba03f663d29536927f6ab14e4b53 (diff) | |
Merge pull request #343 from glitch-soc/merge-upstream-20180121
Merge upstream
Diffstat (limited to 'config/webpack/configuration.js')
| -rw-r--r-- | config/webpack/configuration.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index f6b4d4c61..c58d8028e 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -73,7 +73,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 = { |