diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-06-29 05:57:35 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-06-29 06:26:16 +0300 |
| commit | 3137b886b84e2c3670b305a8194a3532afe541be (patch) | |
| tree | 60a567b30ca001e9658076d534c90dfc4f17f9c3 /app/assets/javascripts/webpack.js | |
| parent | 5b43aa955737f002be3d197c9f7b4d3374d0ad69 (diff) | |
configure webpack publicPath dynamically to account for CDN or relative path settings
Diffstat (limited to 'app/assets/javascripts/webpack.js')
| -rw-r--r-- | app/assets/javascripts/webpack.js | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/javascripts/webpack.js b/app/assets/javascripts/webpack.js index 37420dcafa0..9a9cf395fb8 100644 --- a/app/assets/javascripts/webpack.js +++ b/app/assets/javascripts/webpack.js @@ -1,13 +1,9 @@ /** * This is the first script loaded by webpack's runtime. It is used to manually configure - * config.output.publicPath to account for relative_url_root settings which cannot be baked-in - * to our webpack bundles. + * config.output.publicPath to account for relative_url_root or CDN settings which cannot be + * baked-in to our webpack bundles. */ -if (gon && gon.relative_url_root) { - // this assumes config.output.publicPath is an absolute path - const basePath = gon.relative_url_root.replace(/\/$/, ''); - - // eslint-disable-next-line camelcase, no-undef - __webpack_public_path__ = basePath + __webpack_public_path__; +if (gon && gon.webpack_public_path) { + __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line } |