diff options
| author | ThibG <thib@sitedethib.com> | 2020-10-13 01:19:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 01:19:35 +0200 |
| commit | 4c45b43cb8a3d902c130729d36d559ec9de23d3e (patch) | |
| tree | ee915a79950dbad38d515a8870a30e40480bff5e /app/javascript/mastodon/features/ui/components | |
| parent | 53b22d247fb8500ea977774d727fe0d41950189c (diff) | |
Change how CDN_HOST is passed down to make assets build reproducible (#14381)
* Change how CDN_HOST is passed down to make assets build reproducible * Change webpacker/webpack configuration to dynamically load publicPath based on meta header * Fix embedded layout missing the cdn-host meta header
Diffstat (limited to 'app/javascript/mastodon/features/ui/components')
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/focal_point_modal.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/ui/components/focal_point_modal.js b/app/javascript/mastodon/features/ui/components/focal_point_modal.js index 926a495d1..e19f277d8 100644 --- a/app/javascript/mastodon/features/ui/components/focal_point_modal.js +++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.js @@ -20,6 +20,7 @@ import GIFV from 'mastodon/components/gifv'; import { me } from 'mastodon/initial_state'; import tesseractCorePath from 'tesseract.js-core/tesseract-core.wasm.js'; import tesseractWorkerPath from 'tesseract.js/dist/worker.min.js'; +import { assetHost } from 'mastodon/utils/config'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, @@ -50,8 +51,6 @@ const removeExtraLineBreaks = str => str.replace(/\n\n/g, '******') .replace(/\n/g, ' ') .replace(/\*\*\*\*\*\*/g, '\n\n'); -const assetHost = process.env.CDN_HOST || ''; - class ImageLoader extends React.PureComponent { static propTypes = { |